diff --git a/.github/workflows/helm-checks.yaml b/.github/workflows/helm-checks.yaml
index 43c0e35..8734d8a 100644
--- a/.github/workflows/helm-checks.yaml
+++ b/.github/workflows/helm-checks.yaml
@@ -183,13 +183,21 @@ jobs:
         helm dep up charts/tx-data-provider
         helm dep up charts/umbrella
         helm install umbrella charts/umbrella --namespace data-exchange --create-namespace --debug --timeout 10m \
-        -f charts/values-test-data-exchange.yaml -f charts/values-test-iam-init-container.yaml \
+        -f charts/values-test-data-exchange.yaml 
+        helm uninstall umbrella --namespace data-exchange
+
+    - name: Install chart for data exchange with iatp-mock (umbrella)
+      run: |
+        helm dep up charts/tx-data-provider
+        helm dep up charts/umbrella
+        helm install umbrella charts/umbrella --namespace data-exchange --create-namespace --debug --timeout 10m \
+        -f charts/values-test-data-exchange-iatp-mock.yaml -f charts/values-test-iam-init-container.yaml \
         --set iatpmock.image.repository=kind-registry:5000/iatp-mock --set iatpmock.image.tag=testing
         helm uninstall umbrella --namespace data-exchange
 
     - name: Install chart for shared services one (umbrella)
       run: |
-        helm install umbrella charts/umbrella -f charts/values-test-shared-services-1.yaml -f charts/values-test-iam-init-container.yaml --namespace shared-services --create-namespace --debug --timeout 10m --set iatpmock.image.repository=kind-registry:5000/iatp-mock --set iatpmock.image.tag=testing
+        helm install umbrella charts/umbrella -f charts/values-test-shared-services-1.yaml -f charts/values-test-iam-init-container.yaml --namespace shared-services --create-namespace --debug --timeout 10m
         helm uninstall umbrella --namespace shared-services
 
     - name: Install chart for shared services two (umbrella)
diff --git a/charts/umbrella/Chart.yaml b/charts/umbrella/Chart.yaml
index 3073bb2..edfb27a 100644
--- a/charts/umbrella/Chart.yaml
+++ b/charts/umbrella/Chart.yaml
@@ -28,8 +28,7 @@ sources:
   - https://github.com/eclipse-tractusx/tractus-x-umbrella
 
 type: application
-
-version: 1.1.1
+version: 2.0.0
 
 # when adding or updating versions of dependencies, also update list under README.md#Install
 dependencies:
@@ -37,7 +36,7 @@ dependencies:
   - condition: portal.enabled
     name: portal
     repository: https://eclipse-tractusx.github.io/charts/dev
-    version: 2.0.0
+    version: 2.2.0
   # cx-iam
   - condition: centralidp.enabled
     name: centralidp
@@ -110,3 +109,8 @@ dependencies:
     version: 0.1.0
     repository: file://charts/iatpmock
     condition: iatpmock.enabled
+    # ssi-dim-wallet-stub
+  - name: ssi-dim-wallet-stub
+    repository: https://eclipse-tractusx.github.io/charts/dev
+    version: 0.1.2
+    condition: ssi-dim-wallet-stub.enabled
diff --git a/charts/umbrella/README.md b/charts/umbrella/README.md
index ea95f5f..385661f 100644
--- a/charts/umbrella/README.md
+++ b/charts/umbrella/README.md
@@ -256,6 +256,7 @@ Collection of hosts to be added to the `/etc/hosts` (Linux and Mac) or the `C:\W
 192.168.49.2    iatpmock.tx.test
 192.168.49.2    business-partners.tx.test
 192.168.49.2    pgadmin4.tx.test
+192.168.49.2    ssi-dim-wallet-stub.tx.test
 ```
 
 Replace `192.168.49.2` with your `minikube ip` if it differs.
@@ -287,6 +288,7 @@ The currently available components are following:
 - [bdrs](https://github.com/eclipse-tractusx/bpn-did-resolution-service/tree/0.0.4) (**in memory** - no persistance possible)
 - [iatp-mock](https://github.com/eclipse-tractusx/tractus-x-umbrella/tree/main/charts/umbrella/charts/iatpmock/Chart.yaml)
 - [bpdm](https://github.com/eclipse-tractusx/bpdm/tree/release/6.0.x)
+- [ssi-dim-wallet-stub](https://github.com/eclipse-tractusx/ssi-dim-wallet-stub/releases/tag/ssi-dim-wallet-stub-0.1.2)
 
 > :warning: **Note**
 >
@@ -449,6 +451,12 @@ dataconsumerTwo:
 helm upgrade -f values-adopter-data-exchange.yaml umbrella . --namespace umbrella
 ```
 
+*iatp-mock Version*
+
+```bash
+helm install -f values-adopter-data-exchange-iatp-mock.yaml umbrella . --namespace umbrella --create-namespace
+```
+
 **Portal Subset**
 
 ```bash
@@ -587,6 +595,7 @@ Currently enabled ingresses:
 - http://bdrs-server.tx.test
 - http://iatpmock.tx.test
 - http://pgadmin4.tx.test
+- http://ssi-dim-wallet-stub.tx.test
 
 ### Database Access
 
diff --git a/charts/umbrella/values-adopter-data-exchange-iatp-mock.yaml b/charts/umbrella/values-adopter-data-exchange-iatp-mock.yaml
new file mode 100644
index 0000000..8c6223a
--- /dev/null
+++ b/charts/umbrella/values-adopter-data-exchange-iatp-mock.yaml
@@ -0,0 +1,244 @@
+# #############################################################################
+# Copyright (c) 2024 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
+# #############################################################################
+---
+
+centralidp:
+  enabled: true
+
+iatpmock:
+  enabled: true
+  ingress:
+    enabled: true
+    hosts:
+      - host: iatpmock.tx.test
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+
+bdrs-server-memory:
+  enabled: true
+  seeding:
+    bpnList:
+      - bpn: "BPNL00000003B3NX"
+        did: "did:web:mock-util-service/BPNL00000003B3NX"
+      - bpn: "BPNL00000003CSGV"
+        did: "did:web:mock-util-service/BPNL00000003CSGV"
+      - bpn: "BPNL00000003B6LU"
+        did: "did:web:mock-util-service/BPNL00000003B6LU"
+      - bpn: "BPNL00000003AXS3"
+        did: "did:web:mock-util-service/BPNL00000003AXS3"
+      - bpn: "BPNL00000003AZQP"
+        did: "did:web:mock-util-service/BPNL00000003AZQP"
+      - bpn: "BPNL00000003AWSS"
+        did: "did:web:mock-util-service/BPNL00000003AWSS"
+      - bpn: "BPNL00000003AYRE"
+        did: "did:web:mock-util-service/BPNL00000003AYRE"
+      - bpn: "BPNL00000003AVTH"
+        did: "did:web:mock-util-service/BPNL00000003AVTH"
+      - bpn: "BPNL00000000BJTL"
+        did: "did:web:mock-util-service/BPNL00000000BJTL"
+      - bpn: "BPNL00000003CML1"
+        did: "did:web:mock-util-service/BPNL00000003CML1"
+      - bpn: "BPNL00000003B2OM"
+        did: "did:web:mock-util-service/BPNL00000003B2OM"
+      - bpn: "BPNL00000003B0Q0"
+        did: "did:web:mock-util-service/BPNL00000003B0Q0"
+      - bpn: "BPNL00000003B5MJ"
+        did: "did:web:mock-util-service/BPNL00000003B5MJ"
+      - bpn: "BPNS0000000008ZZ"
+        did: "did:web:mock-util-service/BPNS0000000008ZZ"
+      - bpn: "BPNL00000003CNKC"
+        did: "did:web:mock-util-service/BPNL00000003CNKC"
+      - bpn: "BPNS00000008BDFH"
+        did: "did:web:mock-util-service/BPNS00000008BDFH"
+
+  hostname: &hostname bdrs-server.tx.test
+  server:
+    trustedIssuers:
+      - did:web:mock-util-service/trusted-issuer
+    ingresses:
+      - enabled: true
+        hostname: *hostname
+        endpoints:
+          - directory
+          - management
+        tls:
+          enabled: false
+
+dataconsumerOne:
+  enabled: true
+  secrets:
+    edc-wallet-secret: UbfW4CR1xH4OskkovqJ2JzcwnQIrG7oj
+  tractusx-connector:
+    participant:
+      id: BPNL00000003AZQP
+    iatp:
+      id: did:web:mock-util-service/BPNL00000003AZQP
+      trustedIssuers:
+        - did:web:mock-util-service/trusted-issuer
+      sts:
+        dim:
+          url: http://mock-util-service/sts
+        oauth:
+          token_url: http://centralidp.tx.test/auth/realms/CX-Central/protocol/openid-connect/token
+          client:
+            id: satest01
+    controlplane:
+      env:
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
+      endpoints:
+        management:
+          authKey: TEST1
+      ingresses:
+        - enabled: true
+          hostname: "dataconsumer-1-controlplane.tx.test"
+          endpoints:
+            - default
+            - protocol
+            - management
+          tls:
+            enabled: false
+    dataplane:
+      env:
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
+      ingresses:
+        - enabled: true
+          hostname: "dataconsumer-1-dataplane.tx.test"
+          endpoints:
+            - default
+            - public
+          tls:
+            enabled: false
+    # -- uncomment the following for persistence
+    # postgresql:
+    #   primary:
+    #     persistence:
+    #       enabled: true
+
+tx-data-provider:
+  seedTestdata: true
+  enabled: true
+  secrets:
+    edc-wallet-secret: pyFUZP2L9UCSVJUScHcN3ZEgy2PGyEpg
+  tractusx-connector:
+    participant:
+      id: BPNL00000003AYRE
+    iatp:
+      id: did:web:mock-util-service/BPNL00000003AYRE
+      trustedIssuers:
+        - did:web:mock-util-service/trusted-issuer
+      sts:
+        dim:
+          url: http://mock-util-service/sts
+        oauth:
+          token_url: http://centralidp.tx.test/auth/realms/CX-Central/protocol/openid-connect/token
+          client:
+            id: satest02
+    controlplane:
+      env:
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
+      endpoints:
+        management:
+          authKey: TEST2
+      ingresses:
+        - enabled: true
+          hostname: "dataprovider-controlplane.tx.test"
+          endpoints:
+            - default
+            - protocol
+            - management
+          tls:
+            enabled: false
+    dataplane:
+      env:
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
+      ingresses:
+        - enabled: true
+          hostname: "dataprovider-dataplane.tx.test"
+          endpoints:
+            - default
+            - public
+          tls:
+            enabled: false
+  # -- uncomment the following for persistence
+    # postgresql:
+    #   primary:
+    #     persistence:
+    #       enabled: true
+  # digital-twin-registry:
+  #   postgresql:
+  #     primary:
+  #       persistence:
+  #         enabled: true
+
+dataconsumerTwo:
+  enabled: false
+  secrets:
+    edc-wallet-secret: tPwy4exxH1sXBRQouobSA2nNVaaPuwCs
+  tractusx-connector:
+    participant:
+      id: BPNL00000003AVTH
+    iatp:
+      id: did:web:mock-util-service/BPNL00000003AVTH
+      trustedIssuers:
+        - did:web:mock-util-service/trusted-issuer
+      sts:
+        dim:
+          url: http://mock-util-service/sts
+        oauth:
+          token_url: http://centralidp.tx.test/auth/realms/CX-Central/protocol/openid-connect/token
+          client:
+            id: satest03
+    controlplane:
+      env:
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
+      endpoints:
+        management:
+          authKey: TEST3
+      ingresses:
+        - enabled: true
+          hostname: "dataconsumer-2-controlplane.tx.test"
+          endpoints:
+            - default
+            - protocol
+            - management
+          tls:
+            enabled: false
+    dataplane:
+      env:
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
+      ingresses:
+        - enabled: true
+          hostname: "dataconsumer-2-dataplane.tx.test"
+          endpoints:
+            - default
+            - public
+          tls:
+            enabled: false
+    # -- uncomment the following for persistence
+    # postgresql:
+    #   primary:
+    #     persistence:
+    #       enabled: true
+
+pgadmin4:
+  enabled: true
+  # -- uncomment the following for persistence
+  # persistentVolume:
+  #   enabled: true
diff --git a/charts/umbrella/values-adopter-data-exchange.yaml b/charts/umbrella/values-adopter-data-exchange.yaml
index 7d19c2d..f54a3c2 100644
--- a/charts/umbrella/values-adopter-data-exchange.yaml
+++ b/charts/umbrella/values-adopter-data-exchange.yaml
@@ -19,88 +19,13 @@
 ---
 
 centralidp:
-  enabled: true
-  keycloak:
-    ingress:
-      enabled: true
-      ingressClassName: "nginx"
-      hostname: "centralidp.tx.test"
-      annotations:
-        nginx.ingress.kubernetes.io/cors-allow-credentials: "true"
-        nginx.ingress.kubernetes.io/cors-allow-methods: "PUT, GET, POST, OPTIONS"
-        nginx.ingress.kubernetes.io/cors-allow-origin: "http://centralidp.tx.test"
-        nginx.ingress.kubernetes.io/enable-cors: "true"
-        nginx.ingress.kubernetes.io/proxy-buffer-size: "128k"
-        nginx.ingress.kubernetes.io/proxy-buffering: "on"
-        nginx.ingress.kubernetes.io/proxy-buffers-number: "20"
-        nginx.ingress.kubernetes.io/use-regex: "true"
-      tls: false
-    # -- uncomment the following for persistence
-    # postgresql:
-    #   primary:
-    #     persistence:
-    #       enabled: true
-
-iatpmock:
-  enabled: true
-  ingress:
-    enabled: true
-    hosts:
-      - host: iatpmock.tx.test
-        paths:
-          - path: /
-            pathType: ImplementationSpecific
+  enabled: false
 
 bdrs-server-memory:
   enabled: true
-  hostname: &hostname bdrs-server.tx.test
-  server:
-    ingresses:
-      - enabled: true
-        hostname: *hostname
-        endpoints:
-          - directory
-          - management
-        tls:
-          enabled: false
 
 dataconsumerOne:
   enabled: true
-  secrets:
-    edc-miw-keycloak-secret: UbfW4CR1xH4OskkovqJ2JzcwnQIrG7oj
-  tractusx-connector:
-    participant:
-      id: BPNL00000003AZQP
-    iatp:
-      id: did:web:mock-util-service/BPNL00000003AZQP
-      trustedIssuers:
-        - did:web:mock-util-service/trusted-issuer
-      sts:
-        oauth:
-          client:
-            id: satest01
-    controlplane:
-      endpoints:
-        management:
-          authKey: TEST1
-      ingresses:
-        - enabled: true
-          hostname: "dataconsumer-1-controlplane.tx.test"
-          endpoints:
-            - default
-            - protocol
-            - management
-          tls:
-            enabled: false
-    dataplane:
-      ingresses:
-        - enabled: true
-          hostname: "dataconsumer-1-dataplane.tx.test"
-          endpoints:
-            - default
-            - public
-          tls:
-            enabled: false
     # -- uncomment the following for persistence
     # postgresql:
     #   primary:
@@ -110,41 +35,6 @@ dataconsumerOne:
 tx-data-provider:
   seedTestdata: true
   enabled: true
-  secrets:
-    edc-miw-keycloak-secret: pyFUZP2L9UCSVJUScHcN3ZEgy2PGyEpg
-  tractusx-connector:
-    participant:
-      id: BPNL00000003AYRE
-    iatp:
-      id: did:web:mock-util-service/BPNL00000003AYRE
-      trustedIssuers:
-        - did:web:mock-util-service/trusted-issuer
-      sts:
-        oauth:
-          client:
-            id: satest02
-    controlplane:
-      endpoints:
-        management:
-          authKey: TEST2
-      ingresses:
-        - enabled: true
-          hostname: "dataprovider-controlplane.tx.test"
-          endpoints:
-            - default
-            - protocol
-            - management
-          tls:
-            enabled: false
-    dataplane:
-      ingresses:
-        - enabled: true
-          hostname: "dataprovider-dataplane.tx.test"
-          endpoints:
-            - default
-            - public
-          tls:
-            enabled: false
   # -- uncomment the following for persistence
     # postgresql:
     #   primary:
@@ -158,41 +48,6 @@ tx-data-provider:
 
 dataconsumerTwo:
   enabled: false
-  secrets:
-    edc-miw-keycloak-secret: tPwy4exxH1sXBRQouobSA2nNVaaPuwCs
-  tractusx-connector:
-    participant:
-      id: BPNL00000003AVTH
-    iatp:
-      id: did:web:mock-util-service/BPNL00000003AVTH
-      trustedIssuers:
-        - did:web:mock-util-service/trusted-issuer
-      sts:
-        oauth:
-          client:
-            id: satest03
-    controlplane:
-      endpoints:
-        management:
-          authKey: TEST3
-      ingresses:
-        - enabled: true
-          hostname: "dataconsumer-2-controlplane.tx.test"
-          endpoints:
-            - default
-            - protocol
-            - management
-          tls:
-            enabled: false
-    dataplane:
-      ingresses:
-        - enabled: true
-          hostname: "dataconsumer-2-dataplane.tx.test"
-          endpoints:
-            - default
-            - public
-          tls:
-            enabled: false
     # -- uncomment the following for persistence
     # postgresql:
     #   primary:
@@ -204,3 +59,9 @@ pgadmin4:
   # -- uncomment the following for persistence
   # persistentVolume:
   #   enabled: true
+
+ssi-credential-issuer:
+  enabled: false
+
+ssi-dim-wallet-stub:
+  enabled: true
diff --git a/charts/umbrella/values-adopter-portal.yaml b/charts/umbrella/values-adopter-portal.yaml
index aa17bc1..030380e 100644
--- a/charts/umbrella/values-adopter-portal.yaml
+++ b/charts/umbrella/values-adopter-portal.yaml
@@ -52,6 +52,7 @@ pgadmin4:
 
 # Interfaces are disabled by default (other than IAM)
 
+# Set 'enabled' to true if onboarding is required
 bpdm:
   enabled: false
 
@@ -64,8 +65,10 @@ bpndiscovery:
 discoveryfinder:
   enabled: false
 
-iatpmock:
+# Set 'enabled' to true if onboarding is required
+ssi-credential-issuer:
   enabled: false
 
-ssi-credential-issuer:
+# Set 'enabled' to true if onboarding is required
+ssi-dim-wallet-stub:
   enabled: false
diff --git a/charts/umbrella/values.yaml b/charts/umbrella/values.yaml
index 283d64d..1daaca3 100644
--- a/charts/umbrella/values.yaml
+++ b/charts/umbrella/values.yaml
@@ -42,7 +42,11 @@ portal:
     poolApiPath: "/pool/v6"
     portalGateAddress: "http://business-partners.tx.test"
     portalGateApiPath: "/gate/v6"
-  custodianAddress: "http://managed-identity-wallets.tx.test"
+  custodianAddress: "http://ssi-dim-wallet-stub.tx.test"
+  dimWrapper:
+    baseAddress: "http://ssi-dim-wallet-stub.tx.test"
+    apiPath: "/api/dim"
+  decentralIdentityManagementAuthAddress: "http://ssi-dim-wallet-stub.tx.test/api/sts"
   sdfactoryAddress: "http://sdfactory.tx.test"
   clearinghouseAddress: "http://validation.tx.test"
   clearinghouseTokenAddress: "http://keycloak.tx.test/realms/example/protocol/openid-connect/token"
@@ -111,7 +115,7 @@ portal:
         encryptionConfigs:
           index0:
             encryptionKey: "deb8261ec7b89c344f1c5ef5a11606e305f14e0d231b1357d90ad0180c5081d3"
-      issuerdid: "did:web:managed-identity-wallets.tx.test:BPNL00000003CRHK"
+      issuerdid: "did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003CRHK"
       swaggerEnabled: true
     appmarketplace:
       logging:
@@ -128,6 +132,7 @@ portal:
         default: "Debug"
       swaggerEnabled: true
     processesworker:
+      clearinghouseConnectDisabled: true
       logging:
         default: "Debug"
         processesLibrary: "Debug"
@@ -155,8 +160,11 @@ portal:
         clientId: "sa-cl2-03"
         clientSecret: "changeme"
       dim:
-        clientId: "dim-client-id"
-        clientSecret: ""
+        clientId: "sa-cl2-05"
+        clientSecret: "changeme"
+        grantType: "client_credentials"
+        scope: "openid"
+        baseAddress: "http://ssi-dim-wallet-stub.tx.test"
         universalResolverAddress: "https://dev.uniresolver.io/"
         encryptionConfigs:
           index0:
@@ -688,11 +696,11 @@ iatpmock:
   nameOverride: mock-util-service
   fullnameOverride: mock-util-service
   # -- see README ## Precondition for IATP Mock
-  image:
-    # override with locally built image if needed, default "tractusx/iatp-mock"
-    repository: ""
-    # override tag if needed, default "testing"
-    tag: ""
+  # image:
+  #   # override with locally built image if needed, default "tractusx/iatp-mock"
+  #   repository: ""
+  #   # override tag if needed, default "testing"
+  #   tag: ""
   ingress:
     enabled: true
     hosts:
@@ -704,8 +712,8 @@ iatpmock:
 ssi-credential-issuer:
   enabled: false
   portalBackendAddress: "http://portal-backend.tx.test"
-  walletAddress: "http://iatpmock.tx.test"
-  walletTokenAddress: "https://iatpmock-token-address.tx.test/oauth/token"
+  walletAddress: "http://ssi-dim-wallet-stub.tx.test"
+  walletTokenAddress: "http://ssi-dim-wallet-stub.tx.test/oauth/token"
   issuer:
     swaggerEnabled: true
     logging:
@@ -718,9 +726,9 @@ ssi-credential-issuer:
       # -- Client-secret for portal client-id. Secret-key 'portal-client-secret'.
       clientSecret: "changeme"
     credential:
-      issuerDid: "did:web:managed-identity-wallets.tx.test:BPNL00000003CRHK"
+      issuerDid: "did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003CRHK"
       issuerBpn: "BPNL00000003CRHK"
-      # statusListUrl: "https://example.org/statuslist"
+      statusListUrl: "http://ssi-dim-wallet-stub.tx.test/status-list/BPNL00000003CRHK/8a6c7486-1e1f-4555-bdd2-1a178182651e"
       encryptionConfigIndex: 0
       encryptionConfigs:
         index0:
@@ -769,6 +777,8 @@ ssi-credential-issuer:
   centralidp:
     # -- Provide centralidp base address (CX IAM), without trailing '/auth'.
     address: "http://centralidp.tx.test"
+    jwtBearerOptions:
+      requireHttpsMetadata: "false"
   ingress:
     enabled: true
     className: "nginx"
@@ -985,26 +995,26 @@ dataconsumerOne:
   seedTestdata: false
   nameOverride: dataconsumer-1
   secrets:
-    edc-wallet-secret: UbfW4CR1xH4OskkovqJ2JzcwnQIrG7oj
+    edc-wallet-secret: changeme
   tractusx-connector:
     nameOverride: dataconsumer-1-edc
     participant:
       id: BPNL00000003AZQP
     iatp:
-      id: did:web:mock-util-service/BPNL00000003AZQP
+      id: did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003AZQP
       trustedIssuers:
-        - did:web:mock-util-service/trusted-issuer
+        - did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003CRHK
       sts:
         dim:
-          url: http://mock-util-service/sts
+          url: http://ssi-dim-wallet-stub.tx.test/api/sts
         oauth:
-          token_url: http://centralidp.tx.test/auth/realms/CX-Central/protocol/openid-connect/token
+          token_url: http://ssi-dim-wallet-stub.tx.test/oauth/token
           client:
-            id: satest01
+            id: BPNL00000003AZQP
             secret_alias: edc-wallet-secret
     controlplane:
       env:
-        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://ssi-dim-wallet-stub.tx.test/api
         EDC_IAM_DID_WEB_USE_HTTPS: false
       bdrs:
         server:
@@ -1024,7 +1034,7 @@ dataconsumerOne:
             enabled: false
     dataplane:
       env:
-        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://ssi-dim-wallet-stub.tx.test/api
         EDC_IAM_DID_WEB_USE_HTTPS: false
       ingresses:
         - enabled: true
@@ -1077,26 +1087,26 @@ tx-data-provider:
   dataplaneUrl: http://{{ .Release.Name }}-dataprovider-edc-dataplane:8081
   nameOverride: dataprovider
   secrets:
-    edc-wallet-secret: pyFUZP2L9UCSVJUScHcN3ZEgy2PGyEpg
+    edc-wallet-secret: changeme
   tractusx-connector:
     nameOverride: dataprovider-edc
     participant:
       id: BPNL00000003AYRE
     iatp:
-      id: did:web:mock-util-service/BPNL00000003AYRE
+      id: did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003AYRE
       trustedIssuers:
-        - did:web:mock-util-service/trusted-issuer
+        - did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003CRHK
       sts:
         dim:
-          url: http://mock-util-service/sts
+          url: http://ssi-dim-wallet-stub.tx.test/api/sts
         oauth:
-          token_url: http://centralidp.tx.test/auth/realms/CX-Central/protocol/openid-connect/token
+          token_url: http://ssi-dim-wallet-stub.tx.test/oauth/token
           client:
-            id: satest02
+            id: BPNL00000003AYRE
             secret_alias: edc-wallet-secret
     controlplane:
       env:
-        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://ssi-dim-wallet-stub.tx.test/api
         EDC_IAM_DID_WEB_USE_HTTPS: false
       bdrs:
         server:
@@ -1116,7 +1126,7 @@ tx-data-provider:
             enabled: false
     dataplane:
       env:
-        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://ssi-dim-wallet-stub.tx.test/api
         EDC_IAM_DID_WEB_USE_HTTPS: false
       ingresses:
         - enabled: true
@@ -1208,26 +1218,26 @@ dataconsumerTwo:
   seedTestdata: false
   nameOverride: dataconsumer-2
   secrets:
-    edc-wallet-secret: tPwy4exxH1sXBRQouobSA2nNVaaPuwCs
+    edc-wallet-secret: changeme
   tractusx-connector:
     nameOverride: dataconsumer-2-edc
     participant:
       id: BPNL00000003AVTH
     iatp:
-      id: did:web:mock-util-service/BPNL00000003AVTH
+      id: did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003AVTH
       trustedIssuers:
-        - did:web:mock-util-service/trusted-issuer
+        - did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003CRHK
       sts:
         dim:
-          url: http://mock-util-service/sts
+          url: http://ssi-dim-wallet-stub.tx.test/api/sts
         oauth:
-          token_url: http://centralidp.tx.test/auth/realms/CX-Central/protocol/openid-connect/token
+          token_url: http://ssi-dim-wallet-stub.tx.test/oauth/token
           client:
-            id: satest03
+            id: BPNL00000003AVTH
             secret_alias: edc-wallet-secret
     controlplane:
       env:
-        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://ssi-dim-wallet-stub.tx.test/api
         EDC_IAM_DID_WEB_USE_HTTPS: false
       bdrs:
         server:
@@ -1247,7 +1257,7 @@ dataconsumerTwo:
             enabled: false
     dataplane:
       env:
-        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://ssi-dim-wallet-stub.tx.test/api
         EDC_IAM_DID_WEB_USE_HTTPS: false
       ingresses:
         - enabled: true
@@ -1314,45 +1324,46 @@ bdrs-server-memory:
     url: "http://bdrs-server:8081"
     enabled: true
     bpnList:
+      - bpn: "BPNL00000003CRHK"
+        did: "did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003CRHK"
       - bpn: "BPNL00000003B3NX"
-        did: "did:web:mock-util-service/BPNL00000003B3NX"
+        did: "did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003B3NX"
       - bpn: "BPNL00000003CSGV"
-        did: "did:web:mock-util-service/BPNL00000003CSGV"
+        did: "did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003CSGV"
       - bpn: "BPNL00000003B6LU"
-        did: "did:web:mock-util-service/BPNL00000003B6LU"
+        did: "did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003B6LU"
       - bpn: "BPNL00000003AXS3"
-        did: "did:web:mock-util-service/BPNL00000003AXS3"
+        did: "did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003AXS3"
       - bpn: "BPNL00000003AZQP"
-        did: "did:web:mock-util-service/BPNL00000003AZQP"
+        did: "did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003AZQP"
       - bpn: "BPNL00000003AWSS"
-        did: "did:web:mock-util-service/BPNL00000003AWSS"
+        did: "did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003AWSS"
       - bpn: "BPNL00000003AYRE"
-        did: "did:web:mock-util-service/BPNL00000003AYRE"
+        did: "did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003AYRE"
       - bpn: "BPNL00000003AVTH"
-        did: "did:web:mock-util-service/BPNL00000003AVTH"
+        did: "did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003AVTH"
       - bpn: "BPNL00000000BJTL"
-        did: "did:web:mock-util-service/BPNL00000000BJTL"
+        did: "did:web:ssi-dim-wallet-stub.tx.test:BPNL00000000BJTL"
       - bpn: "BPNL00000003CML1"
-        did: "did:web:mock-util-service/BPNL00000003CML1"
+        did: "did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003CML1"
       - bpn: "BPNL00000003B2OM"
-        did: "did:web:mock-util-service/BPNL00000003B2OM"
+        did: "did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003B2OM"
       - bpn: "BPNL00000003B0Q0"
-        did: "did:web:mock-util-service/BPNL00000003B0Q0"
+        did: "did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003B0Q0"
       - bpn: "BPNL00000003B5MJ"
-        did: "did:web:mock-util-service/BPNL00000003B5MJ"
+        did: "did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003B5MJ"
       - bpn: "BPNS0000000008ZZ"
-        did: "did:web:mock-util-service/BPNS0000000008ZZ"
+        did: "did:web:ssi-dim-wallet-stub.tx.test:BPNS0000000008ZZ"
       - bpn: "BPNL00000003CNKC"
-        did: "did:web:mock-util-service/BPNL00000003CNKC"
+        did: "did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003CNKC"
       - bpn: "BPNS00000008BDFH"
-        did: "did:web:mock-util-service/BPNS00000008BDFH"
+        did: "did:web:ssi-dim-wallet-stub.tx.test:BPNS00000008BDFH"
 
   server:
     trustedIssuers:
-      - did:web:mock-util-service/trusted-issuer
+      - did:web:ssi-dim-wallet-stub.tx.test:BPNL00000003CRHK
     env:
       EDC_IAM_DID_WEB_USE_HTTPS: false
-
     endpoints:
       management:
         authKey: TEST
@@ -1365,3 +1376,46 @@ bdrs-server-memory:
         className: "nginx"
         tls:
           enabled: false
+
+ssi-dim-wallet-stub:
+  enabled: false
+  wallet:
+    replicaCount: 1
+    host: ssi-dim-wallet-stub.tx.test
+    nameSpace: "umbrella"
+    appName: "ssi-dim-wallet-stub"
+    configName: "ssi-dim-wallet-config"
+    serviceName: "ssi-dim-wallet-service"
+    secretName: "ssi-dim-wallet-secret"
+    ingressName: "ssi-dim-wallet-ingress"
+    ingress:
+      enabled: true
+      tls: false
+      urlPrefix: /
+      className: nginx
+      annotations: {}
+    swagger:
+      ui:
+        status: true
+      apiDoc:
+        status: true
+    logLevel: "debug"
+    environment: "default"
+    baseWalletBpn: "BPNL00000003CRHK"
+    didHost: "ssi-dim-wallet-stub.tx.test"
+    stubUrl: "http://ssi-dim-wallet-stub.tx.test"
+    statusListVcId: "8a6c7486-1e1f-4555-bdd2-1a178182651e"
+    tokenExpiryTime: "5"
+    portal:
+      waitTime: "60"
+      host: "http://portal-backend.tx.test"
+      clientId: "sa-cl2-05"
+      clientSecret: "changeme"
+    keycloak:
+      realm: "CX-Central"
+      authServerUrl: "http://centralidp.tx.test/auth"
+    service:
+      type: ClusterIP
+      port: 8080
+  keycloak:
+    enabled: false
diff --git a/charts/values-test-data-exchange-iatp-mock.yaml b/charts/values-test-data-exchange-iatp-mock.yaml
new file mode 100644
index 0000000..5331095
--- /dev/null
+++ b/charts/values-test-data-exchange-iatp-mock.yaml
@@ -0,0 +1,131 @@
+###############################################################
+# Copyright (c) 2024 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
+###############################################################
+
+centralidp:
+  enabled: true
+  realmSeeding:
+    initContainer:
+      image:
+        name: kind-registry:5000/init-container:testing
+        pullPolicy: Always
+
+iatpmock:
+  enabled: true
+
+bdrs-server-memory:
+  enabled: true
+  seeding:
+    bpnList:
+      - bpn: "BPNL00000003B3NX"
+        did: "did:web:mock-util-service/BPNL00000003B3NX"
+      - bpn: "BPNL00000003CSGV"
+        did: "did:web:mock-util-service/BPNL00000003CSGV"
+      - bpn: "BPNL00000003B6LU"
+        did: "did:web:mock-util-service/BPNL00000003B6LU"
+      - bpn: "BPNL00000003AXS3"
+        did: "did:web:mock-util-service/BPNL00000003AXS3"
+      - bpn: "BPNL00000003AZQP"
+        did: "did:web:mock-util-service/BPNL00000003AZQP"
+      - bpn: "BPNL00000003AWSS"
+        did: "did:web:mock-util-service/BPNL00000003AWSS"
+      - bpn: "BPNL00000003AYRE"
+        did: "did:web:mock-util-service/BPNL00000003AYRE"
+      - bpn: "BPNL00000003AVTH"
+        did: "did:web:mock-util-service/BPNL00000003AVTH"
+      - bpn: "BPNL00000000BJTL"
+        did: "did:web:mock-util-service/BPNL00000000BJTL"
+      - bpn: "BPNL00000003CML1"
+        did: "did:web:mock-util-service/BPNL00000003CML1"
+      - bpn: "BPNL00000003B2OM"
+        did: "did:web:mock-util-service/BPNL00000003B2OM"
+      - bpn: "BPNL00000003B0Q0"
+        did: "did:web:mock-util-service/BPNL00000003B0Q0"
+      - bpn: "BPNL00000003B5MJ"
+        did: "did:web:mock-util-service/BPNL00000003B5MJ"
+      - bpn: "BPNS0000000008ZZ"
+        did: "did:web:mock-util-service/BPNS0000000008ZZ"
+      - bpn: "BPNL00000003CNKC"
+        did: "did:web:mock-util-service/BPNL00000003CNKC"
+      - bpn: "BPNS00000008BDFH"
+        did: "did:web:mock-util-service/BPNS00000008BDFH"
+
+  hostname: &hostname bdrs-server.tx.test
+  server:
+    trustedIssuers:
+      - did:web:mock-util-service/trusted-issuer
+    ingresses:
+      - enabled: true
+        hostname: *hostname
+        endpoints:
+          - directory
+          - management
+        tls:
+          enabled: false
+
+dataconsumerOne:
+  enabled: true
+  secrets:
+    edc-wallet-secret: UbfW4CR1xH4OskkovqJ2JzcwnQIrG7oj
+  tractusx-connector:
+    iatp:
+      id: did:web:mock-util-service/BPNL00000003AZQP
+      trustedIssuers:
+        - did:web:mock-util-service/trusted-issuer
+      sts:
+        dim:
+          url: http://mock-util-service/sts
+        oauth:
+          token_url: http://umbrella-centralidp:80/auth/realms/CX-Central/protocol/openid-connect/token
+          client:
+            id: satest01
+    controlplane:
+      env:
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
+      bdrs:
+        server:
+          url: http://bdrs-server:8082/api/directory
+    dataplane:
+      env:
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
+
+tx-data-provider:
+  enabled: true
+  secrets:
+    edc-wallet-secret: pyFUZP2L9UCSVJUScHcN3ZEgy2PGyEpg
+  tractusx-connector:
+    iatp:
+      id: did:web:mock-util-service/BPNL00000003AYRE
+      trustedIssuers:
+        - did:web:mock-util-service/trusted-issuer
+      sts:
+        dim:
+          url: http://mock-util-service/sts
+        oauth:
+          token_url: http://umbrella-centralidp:80/auth/realms/CX-Central/protocol/openid-connect/token
+          client:
+            id: satest02
+    controlplane:
+      env:
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
+      bdrs:
+        server:
+          url: http://bdrs-server:8082/api/directory
+    dataplane:
+      env:
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
diff --git a/charts/values-test-data-exchange.yaml b/charts/values-test-data-exchange.yaml
index 876f720..358fdcc 100644
--- a/charts/values-test-data-exchange.yaml
+++ b/charts/values-test-data-exchange.yaml
@@ -17,40 +17,73 @@
 # SPDX-License-Identifier: Apache-2.0
 ###############################################################
 
-centralidp:
-  enabled: true
-  realmSeeding:
-    initContainer:
-      image:
-        name: kind-registry:5000/init-container:testing
-        pullPolicy: Always
-
-iatpmock:
+ssi-dim-wallet-stub:
   enabled: true
+  wallet:
+    nameSpace: "data-exchange"
+    didHost: "ssi-dim-wallet-service"
+    stubUrl: "http://ssi-dim-wallet-service"
+    service:
+      type: ClusterIP
+      port: 80
 
 bdrs-server-memory:
   enabled: true
+  seeding:
+    url: "http://bdrs-server:8081"
+    enabled: true
+    bpnList:
+      - bpn: "BPNL00000003CRHK"
+        did: "did:web:ssi-dim-wallet-service:BPNL00000003CRHK"
+      - bpn: "BPNL00000003AZQP"
+        did: "did:web:ssi-dim-wallet-service:BPNL00000003AZQP"
+      - bpn: "BPNL00000003AYRE"
+        did: "did:web:ssi-dim-wallet-service:BPNL00000003AYRE"
+
+  server:
+    trustedIssuers:
+      - did:web:ssi-dim-wallet-service:BPNL00000003CRHK
 
 dataconsumerOne:
   enabled: true
   tractusx-connector:
     iatp:
+      id: did:web:ssi-dim-wallet-service:BPNL00000003AZQP
+      trustedIssuers:
+        - did:web:ssi-dim-wallet-service:BPNL00000003CRHK
       sts:
+        dim:
+          url: http://ssi-dim-wallet-service/api/sts
         oauth:
-          token_url: http://umbrella-centralidp:80/auth/realms/CX-Central/protocol/openid-connect/token
+          token_url: http://ssi-dim-wallet-service/oauth/token
     controlplane:
+      env:
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://ssi-dim-wallet-stub/api
       bdrs:
         server:
           url: http://bdrs-server:8082/api/directory
+    dataplane:
+      env:
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://ssi-dim-wallet-service/api
 
 tx-data-provider:
   enabled: true
   tractusx-connector:
     iatp:
+      id: did:web:ssi-dim-wallet-service:BPNL00000003AYRE
+      trustedIssuers:
+        - did:web:ssi-dim-wallet-service:BPNL00000003CRHK
       sts:
+        dim:
+          url: http://ssi-dim-wallet-service/api/sts
         oauth:
-          token_url: http://umbrella-centralidp:80/auth/realms/CX-Central/protocol/openid-connect/token
+          token_url: http://ssi-dim-wallet-service/oauth/token
     controlplane:
+      env:
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://ssi-dim-wallet-service/api
       bdrs:
         server:
           url: http://bdrs-server:8082/api/directory
+    dataplane:
+      env:
+        TX_IAM_IATP_CREDENTIALSERVICE_URL: http://ssi-dim-wallet-service/api
diff --git a/charts/values-test-shared-services-1.yaml b/charts/values-test-shared-services-1.yaml
index b5851bb..fe4f645 100644
--- a/charts/values-test-shared-services-1.yaml
+++ b/charts/values-test-shared-services-1.yaml
@@ -34,8 +34,15 @@ sharedidp:
 selfdescription:
   enabled: true
 
-iatpmock:
+ssi-dim-wallet-stub:
   enabled: true
+  wallet:
+    nameSpace: "shared-services"
+    didHost: "ssi-dim-wallet-service"
+    stubUrl: "http://ssi-dim-wallet-service"
+    service:
+      type: ClusterIP
+      port: 80
 
 bdrs-server-memory:
   enabled: true