diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 9fac115..890737b 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/.github/workflows/chart-test.yml b/.github/workflows/chart-test.yml
index 0cd3afc..8f77f0a 100644
--- a/.github/workflows/chart-test.yml
+++ b/.github/workflows/chart-test.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index e4f73a0..53f18ef 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml
index e9bcafe..aa7075d 100644
--- a/.github/workflows/kics.yml
+++ b/.github/workflows/kics.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/.github/workflows/lint-pull-request.yml b/.github/workflows/lint-pull-request.yml
index 698f4c6..ad3f841 100644
--- a/.github/workflows/lint-pull-request.yml
+++ b/.github/workflows/lint-pull-request.yml
@@ -1,4 +1,5 @@
 # #############################################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/.github/workflows/migrations-docker.yml b/.github/workflows/migrations-docker.yml
index 4e5995e..28fb894 100644
--- a/.github/workflows/migrations-docker.yml
+++ b/.github/workflows/migrations-docker.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/.github/workflows/owasp-zap.yml b/.github/workflows/owasp-zap.yml
index f5fbd77..93da3ec 100644
--- a/.github/workflows/owasp-zap.yml
+++ b/.github/workflows/owasp-zap.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/.github/workflows/processes-worker-docker.yml b/.github/workflows/processes-worker-docker.yml
index 8e09036..fefbd90 100644
--- a/.github/workflows/processes-worker-docker.yml
+++ b/.github/workflows/processes-worker-docker.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index 64ea5c7..17242f3 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2447ad4..c0a7029 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/.github/workflows/service-docker.yml b/.github/workflows/service-docker.yml
index 7e67fbb..a7447de 100644
--- a/.github/workflows/service-docker.yml
+++ b/.github/workflows/service-docker.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index cbf19de..006c5e4 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index 08b479d..1afe25a 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/.github/workflows/unit.tests-formatting.yml b/.github/workflows/unit.tests-formatting.yml
index 9354c1a..47ecbd1 100644
--- a/.github/workflows/unit.tests-formatting.yml
+++ b/.github/workflows/unit.tests-formatting.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/.reuse/dep5 b/.reuse/dep5
index 9430b3f..d129294 100644
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -24,6 +24,6 @@ Disclaimer: The code in this project may include calls to APIs ("API Calls") of
  you any rights to use or access any SAP External Product, or provide any third
  parties the right to use of access any SAP External Product, through API Calls.
 
-Files: *
+Files: *.sln *.csproj *.json *.md *.gotmpl *.helmignore .editorconfig .gitignore DEPENDENCIES
 Copyright:  2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors
 License: Apache-2.0
\ No newline at end of file
diff --git a/charts/chart-testing-config.yaml b/charts/chart-testing-config.yaml
index dd8de8d..a56be06 100644
--- a/charts/chart-testing-config.yaml
+++ b/charts/chart-testing-config.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/charts/dim/Chart.yaml b/charts/dim/Chart.yaml
index 666fa95..0d248eb 100644
--- a/charts/dim/Chart.yaml
+++ b/charts/dim/Chart.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
@@ -20,8 +21,8 @@
 apiVersion: v2
 name: dim
 type: application
-version: 1.0.0
-appVersion: 1.0.0
+version: 1.1.0
+appVersion: 1.1.0
 description: Helm chart for DIM Middle Layer
 home: https://github.com/catenax-ng/dim-repo
 dependencies:
diff --git a/charts/dim/README.md b/charts/dim/README.md
index 3c0c278..8e08d02 100644
--- a/charts/dim/README.md
+++ b/charts/dim/README.md
@@ -27,7 +27,7 @@ To use the helm chart as a dependency:
 dependencies:
   - name: dim
     repository: https://sap.github.io/ssi-dim-middle-layer
-    version: 1.0.0
+    version: 1.1.0
 ```
 
 ## Requirements
diff --git a/charts/dim/templates/_helpers.tpl b/charts/dim/templates/_helpers.tpl
index b5d5f75..a00c598 100644
--- a/charts/dim/templates/_helpers.tpl
+++ b/charts/dim/templates/_helpers.tpl
@@ -1,5 +1,6 @@
 {{- /*
-* Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
+* Copyright (c) 2024 BMW Group AG
+ * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 *
 * See the NOTICE file(s) distributed with this work for additional
 * information regarding copyright ownership.
diff --git a/charts/dim/templates/configmap-postgres-init.yaml b/charts/dim/templates/configmap-postgres-init.yaml
index 4ddda95..daeb36d 100644
--- a/charts/dim/templates/configmap-postgres-init.yaml
+++ b/charts/dim/templates/configmap-postgres-init.yaml
@@ -1,5 +1,6 @@
 {{- /*
-* Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
+* Copyright (c) 2024 BMW Group AG
+ * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 *
 * See the NOTICE file(s) distributed with this work for additional
 * information regarding copyright ownership.
diff --git a/charts/dim/templates/cronjob-processes.yaml b/charts/dim/templates/cronjob-processes.yaml
index bb01dd7..64f2588 100644
--- a/charts/dim/templates/cronjob-processes.yaml
+++ b/charts/dim/templates/cronjob-processes.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/charts/dim/templates/deployment.yaml b/charts/dim/templates/deployment.yaml
index aa7792d..de8d07e 100644
--- a/charts/dim/templates/deployment.yaml
+++ b/charts/dim/templates/deployment.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/charts/dim/templates/ingress.yaml b/charts/dim/templates/ingress.yaml
index 488b27a..ea775fd 100644
--- a/charts/dim/templates/ingress.yaml
+++ b/charts/dim/templates/ingress.yaml
@@ -1,5 +1,6 @@
 {{- /*
-* Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
+* Copyright (c) 2024 BMW Group AG
+ * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 *
 * See the NOTICE file(s) distributed with this work for additional
 * information regarding copyright ownership.
diff --git a/charts/dim/templates/job-migrations.yaml b/charts/dim/templates/job-migrations.yaml
index f8ed646..45295c6 100644
--- a/charts/dim/templates/job-migrations.yaml
+++ b/charts/dim/templates/job-migrations.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/charts/dim/templates/secret-external-db.yaml b/charts/dim/templates/secret-external-db.yaml
index 5795e2c..12f81be 100644
--- a/charts/dim/templates/secret-external-db.yaml
+++ b/charts/dim/templates/secret-external-db.yaml
@@ -1,5 +1,6 @@
 {{- /*
-* Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
+* Copyright (c) 2024 BMW Group AG
+ * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 *
 * See the NOTICE file(s) distributed with this work for additional
 * information regarding copyright ownership.
diff --git a/charts/dim/templates/secret-postgres.yaml b/charts/dim/templates/secret-postgres.yaml
index cd8b00d..0984da3 100644
--- a/charts/dim/templates/secret-postgres.yaml
+++ b/charts/dim/templates/secret-postgres.yaml
@@ -1,5 +1,6 @@
 {{- /*
-* Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
+* Copyright (c) 2024 BMW Group AG
+ * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 *
 * See the NOTICE file(s) distributed with this work for additional
 * information regarding copyright ownership.
diff --git a/charts/dim/templates/secret.yaml b/charts/dim/templates/secret.yaml
index 6b51653..e6cad08 100644
--- a/charts/dim/templates/secret.yaml
+++ b/charts/dim/templates/secret.yaml
@@ -1,5 +1,6 @@
 {{- /*
-* Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
+* Copyright (c) 2024 BMW Group AG
+ * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 *
 * See the NOTICE file(s) distributed with this work for additional
 * information regarding copyright ownership.
diff --git a/charts/dim/templates/service.yaml b/charts/dim/templates/service.yaml
index 2eca167..8906892 100644
--- a/charts/dim/templates/service.yaml
+++ b/charts/dim/templates/service.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/charts/dim/values.yaml b/charts/dim/values.yaml
index b085b63..bec58bf 100644
--- a/charts/dim/values.yaml
+++ b/charts/dim/values.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/consortia/argocd-app-templates/appsetup-dev.yaml b/consortia/argocd-app-templates/appsetup-dev.yaml
index 24996e3..56d22ad 100644
--- a/consortia/argocd-app-templates/appsetup-dev.yaml
+++ b/consortia/argocd-app-templates/appsetup-dev.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/consortia/argocd-app-templates/appsetup-int.yaml b/consortia/argocd-app-templates/appsetup-int.yaml
index a22bc56..81e9343 100644
--- a/consortia/argocd-app-templates/appsetup-int.yaml
+++ b/consortia/argocd-app-templates/appsetup-int.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
@@ -28,7 +29,7 @@ spec:
   source:
     path: charts/dim
     repoURL: 'https://github.com/sap/dim-client.git'
-    targetRevision: dim-1.0.0
+    targetRevision: dim-1.1.0
     plugin:
       env:
         - name: AVP_SECRET
diff --git a/consortia/environments/values-dev.yaml b/consortia/environments/values-dev.yaml
index e314eb2..56b8b40 100644
--- a/consortia/environments/values-dev.yaml
+++ b/consortia/environments/values-dev.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/consortia/environments/values-int.yaml b/consortia/environments/values-int.yaml
index 0c7249b..ec724d5 100644
--- a/consortia/environments/values-int.yaml
+++ b/consortia/environments/values-int.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
@@ -76,7 +77,7 @@ processesworker:
     clientSecret: "<path:portal/data/dim/int/callback#clientSecret>"
     tokenAddress: "http://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token"
     # -- Url to the cf service api
-    baseAddress: "https://portal-backend.dev.demo.catena-x.net"
+    baseAddress: "https://portal-backend.int.demo.catena-x.net"
   technicalUserCreation:
     encryptionConfigs:
       index0:
diff --git a/docker/Dockerfile-dim-migrations b/docker/Dockerfile-dim-migrations
index 7d3b68a..84f9fec 100644
--- a/docker/Dockerfile-dim-migrations
+++ b/docker/Dockerfile-dim-migrations
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/docker/Dockerfile-dim-processes-worker b/docker/Dockerfile-dim-processes-worker
index 30db907..5de31ad 100644
--- a/docker/Dockerfile-dim-processes-worker
+++ b/docker/Dockerfile-dim-processes-worker
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/docker/Dockerfile-dim-service b/docker/Dockerfile-dim-service
index bd0bb37..960da98 100644
--- a/docker/Dockerfile-dim-service
+++ b/docker/Dockerfile-dim-service
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 0ad9c13..d14275d 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,4 +1,5 @@
 <!--
+- Copyright (c) 2024 BMW Group AG
 - Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 -
 - See the NOTICE file(s) distributed with this work for additional
@@ -19,7 +20,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.0.0</VersionPrefix>
+    <VersionPrefix>1.1.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/clients/Dim.Clients/Api/Cf/AddSpaceRoleToUserRequest.cs b/src/clients/Dim.Clients/Api/Cf/AddSpaceRoleToUserRequest.cs
index 251a6e6..b165b63 100644
--- a/src/clients/Dim.Clients/Api/Cf/AddSpaceRoleToUserRequest.cs
+++ b/src/clients/Dim.Clients/Api/Cf/AddSpaceRoleToUserRequest.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Cf/CfClient.cs b/src/clients/Dim.Clients/Api/Cf/CfClient.cs
index 0659cbb..9b34567 100644
--- a/src/clients/Dim.Clients/Api/Cf/CfClient.cs
+++ b/src/clients/Dim.Clients/Api/Cf/CfClient.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -25,6 +26,7 @@
 using Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions;
 using System.Net.Http.Json;
 using System.Text.Json;
+using System.Web;
 
 namespace Dim.Clients.Api.Cf;
 
@@ -71,7 +73,7 @@ public async Task<Guid> CreateCloudFoundrySpace(string tenantName, CancellationT
 
     private static async Task<Guid> GetEnvironmentId(string tenantName, CancellationToken cancellationToken, HttpClient client)
     {
-        var environmentsResponse = await client.GetAsync("/v3/organizations", cancellationToken)
+        var environmentsResponse = await client.GetAsync($"/v3/organizations?names={HttpUtility.UrlEncode(tenantName)}", cancellationToken)
             .CatchingIntoServiceExceptionFor("get-organizations", HttpAsyncResponseMessageExtension.RecoverOptions.INFRASTRUCTURE);
         var environments = await environmentsResponse.Content
             .ReadFromJsonAsync<GetEnvironmentsResponse>(JsonSerializerExtensions.Options, cancellationToken)
@@ -136,7 +138,7 @@ public async Task<Guid> GetSpace(string tenantName, CancellationToken cancellati
     {
         var spaceName = $"{tenantName}-space";
         var client = await _basicAuthTokenService.GetBasicAuthorizedLegacyClient<CfClient>(_settings, cancellationToken).ConfigureAwait(false);
-        var result = await client.GetAsync("/v3/spaces", cancellationToken)
+        var result = await client.GetAsync($"/v3/spaces?names={HttpUtility.UrlEncode(spaceName)}", cancellationToken)
             .CatchingIntoServiceExceptionFor("get-space", HttpAsyncResponseMessageExtension.RecoverOptions.ALLWAYS).ConfigureAwait(false);
         try
         {
@@ -180,8 +182,9 @@ await client.PostAsJsonAsync("/v3/service_instances", data, JsonSerializerExtens
 
     private async Task<Guid> GetServiceInstances(string tenantName, Guid? spaceId, CancellationToken cancellationToken)
     {
+        var name = $"{tenantName}-dim-instance";
         var client = await _basicAuthTokenService.GetBasicAuthorizedLegacyClient<CfClient>(_settings, cancellationToken).ConfigureAwait(false);
-        var result = await client.GetAsync("/v3/service_instances", cancellationToken)
+        var result = await client.GetAsync($"/v3/service_instances?names={HttpUtility.UrlEncode(name)}", cancellationToken)
             .CatchingIntoServiceExceptionFor("get-si", HttpAsyncResponseMessageExtension.RecoverOptions.INFRASTRUCTURE).ConfigureAwait(false);
         try
         {
@@ -193,7 +196,6 @@ private async Task<Guid> GetServiceInstances(string tenantName, Guid? spaceId, C
                 throw new ServiceException("Response must not be null");
             }
 
-            var name = $"{tenantName}-dim-instance";
             var resources = response.Resources.Where(x => x.Name == name && x.Type == "managed" && (spaceId == null || x.Relationships.Space.Data.Id == spaceId.Value) && x.LastOperation.State == "succeeded");
             if (resources.Count() != 1)
             {
@@ -226,7 +228,7 @@ public async Task<Guid> GetServiceBinding(string tenantName, Guid spaceId, strin
     {
         var client = await _basicAuthTokenService.GetBasicAuthorizedLegacyClient<CfClient>(_settings, cancellationToken).ConfigureAwait(false);
         var serviceInstanceId = await GetServiceInstances(tenantName, spaceId, cancellationToken).ConfigureAwait(false);
-        var result = await client.GetAsync($"/v3/service_credential_bindings?names={bindingName}", cancellationToken)
+        var result = await client.GetAsync($"/v3/service_credential_bindings?names={HttpUtility.UrlEncode(bindingName)}", cancellationToken)
             .CatchingIntoServiceExceptionFor("get-credential-binding", HttpAsyncResponseMessageExtension.RecoverOptions.INFRASTRUCTURE).ConfigureAwait(false);
         try
         {
diff --git a/src/clients/Dim.Clients/Api/Cf/CreateCfeRequest.cs b/src/clients/Dim.Clients/Api/Cf/CreateCfeRequest.cs
index fc09c52..d832e4e 100644
--- a/src/clients/Dim.Clients/Api/Cf/CreateCfeRequest.cs
+++ b/src/clients/Dim.Clients/Api/Cf/CreateCfeRequest.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Cf/DependencyInjection/CfClientServiceExtensions.cs b/src/clients/Dim.Clients/Api/Cf/DependencyInjection/CfClientServiceExtensions.cs
index b7fb130..dba6419 100644
--- a/src/clients/Dim.Clients/Api/Cf/DependencyInjection/CfClientServiceExtensions.cs
+++ b/src/clients/Dim.Clients/Api/Cf/DependencyInjection/CfClientServiceExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Cf/DependencyInjection/CfSettings.cs b/src/clients/Dim.Clients/Api/Cf/DependencyInjection/CfSettings.cs
index 3f80d30..ebe728d 100644
--- a/src/clients/Dim.Clients/Api/Cf/DependencyInjection/CfSettings.cs
+++ b/src/clients/Dim.Clients/Api/Cf/DependencyInjection/CfSettings.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Cf/ICfClient.cs b/src/clients/Dim.Clients/Api/Cf/ICfClient.cs
index f3315fc..2a08224 100644
--- a/src/clients/Dim.Clients/Api/Cf/ICfClient.cs
+++ b/src/clients/Dim.Clients/Api/Cf/ICfClient.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Cf/ServicePlanResponse.cs b/src/clients/Dim.Clients/Api/Cf/ServicePlanResponse.cs
index 8a6d80d..956834b 100644
--- a/src/clients/Dim.Clients/Api/Cf/ServicePlanResponse.cs
+++ b/src/clients/Dim.Clients/Api/Cf/ServicePlanResponse.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Dim/ApplicationResponse.cs b/src/clients/Dim.Clients/Api/Dim/ApplicationResponse.cs
index 62aa249..9db87fc 100644
--- a/src/clients/Dim.Clients/Api/Dim/ApplicationResponse.cs
+++ b/src/clients/Dim.Clients/Api/Dim/ApplicationResponse.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Dim/CompanyIdentityPatch.cs b/src/clients/Dim.Clients/Api/Dim/CompanyIdentityPatch.cs
index a00fe47..f66264e 100644
--- a/src/clients/Dim.Clients/Api/Dim/CompanyIdentityPatch.cs
+++ b/src/clients/Dim.Clients/Api/Dim/CompanyIdentityPatch.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Dim/CreateApplicationRequest.cs b/src/clients/Dim.Clients/Api/Dim/CreateApplicationRequest.cs
index 251d193..5ffbecc 100644
--- a/src/clients/Dim.Clients/Api/Dim/CreateApplicationRequest.cs
+++ b/src/clients/Dim.Clients/Api/Dim/CreateApplicationRequest.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Dim/CreateCompanyIdentityRequest.cs b/src/clients/Dim.Clients/Api/Dim/CreateCompanyIdentityRequest.cs
index d9defbc..e135e0d 100644
--- a/src/clients/Dim.Clients/Api/Dim/CreateCompanyIdentityRequest.cs
+++ b/src/clients/Dim.Clients/Api/Dim/CreateCompanyIdentityRequest.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -26,28 +27,25 @@ public record CreateCompanyIdentityRequest(
 );
 
 public record Payload(
-    [property: JsonPropertyName("hostingUrl")] string HostingUrl,
-    [property: JsonPropertyName("bootstrap")] Bootstrap Bootstrap,
-    [property: JsonPropertyName("keys")] IEnumerable<Key> Keys
+    [property: JsonPropertyName("hostingURL")] string HostingUrl,
+    [property: JsonPropertyName("network")] Network Network,
+    [property: JsonPropertyName("services")] IEnumerable<Service> Services,
+    [property: JsonPropertyName("keys")] IEnumerable<Key> Keys,
+    [property: JsonPropertyName("name")] string Name
 );
 
 public record Service(
     [property: JsonPropertyName("id")] string Id,
-    [property: JsonPropertyName("type")] string Type
-);
-
-public record Bootstrap(
-    [property: JsonPropertyName("description")] string Description,
-    [property: JsonPropertyName("name")] string Name,
-    [property: JsonPropertyName("protocols")] IEnumerable<string> Protocols
+    [property: JsonPropertyName("type")] string Type,
+    [property: JsonPropertyName("serviceEndpoint")] string ServiceEndpoint
 );
 
-public record Key(
+public record Network(
+    [property: JsonPropertyName("didMethod")] string DidMethod,
     [property: JsonPropertyName("type")] string Type
 );
 
-public record Network(
-    [property: JsonPropertyName("didMethod")] string DidMethod,
+public record Key(
     [property: JsonPropertyName("type")] string Type
 );
 
@@ -56,3 +54,12 @@ public record CreateCompanyIdentityResponse(
     [property: JsonPropertyName("companyId")] Guid CompanyId,
     [property: JsonPropertyName("downloadURL")] string DownloadUrl
 );
+//
+// public record UpdateCompanyIdentityRequest(
+//     [property: JsonPropertyName("didDocUpdates")] DidDocUpdates DidDocUpdates
+// );
+//
+// public record DidDocUpdates(
+//     [property: JsonPropertyName("removeServices")] IEnumerable<string> RemoveServices,
+//     [property: JsonPropertyName("addServices")] IEnumerable<Service> AddServices
+// );
diff --git a/src/clients/Dim.Clients/Api/Dim/DependencyInjection/DimClientServiceExtensions.cs b/src/clients/Dim.Clients/Api/Dim/DependencyInjection/DimClientServiceExtensions.cs
index 2b15295..7dcc39f 100644
--- a/src/clients/Dim.Clients/Api/Dim/DependencyInjection/DimClientServiceExtensions.cs
+++ b/src/clients/Dim.Clients/Api/Dim/DependencyInjection/DimClientServiceExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Dim/DimClient.cs b/src/clients/Dim.Clients/Api/Dim/DimClient.cs
index 50bacac..5ec830e 100644
--- a/src/clients/Dim.Clients/Api/Dim/DimClient.cs
+++ b/src/clients/Dim.Clients/Api/Dim/DimClient.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -26,30 +27,26 @@
 
 namespace Dim.Clients.Api.Dim;
 
-public class DimClient : IDimClient
+public class DimClient(IBasicAuthTokenService basicAuthTokenService, IHttpClientFactory clientFactory)
+    : IDimClient
 {
-    private readonly IBasicAuthTokenService _basicAuthTokenService;
-    private readonly IHttpClientFactory _clientFactory;
-
-    public DimClient(IBasicAuthTokenService basicAuthTokenService, IHttpClientFactory clientFactory)
-    {
-        _basicAuthTokenService = basicAuthTokenService;
-        _clientFactory = clientFactory;
-    }
-
-    public async Task<CreateCompanyIdentityResponse> CreateCompanyIdentity(BasicAuthSettings dimBasicAuth, string hostingUrl, string baseUrl, string tenantName, bool isIssuer, CancellationToken cancellationToken)
+    public async Task<CreateCompanyIdentityResponse> CreateCompanyIdentity(BasicAuthSettings dimBasicAuth, Guid tenantId, string hostingUrl, string baseUrl, bool isIssuer, CancellationToken cancellationToken)
     {
-        var client = await _basicAuthTokenService.GetBasicAuthorizedClient<DimClient>(dimBasicAuth, cancellationToken).ConfigureAwait(false);
+        var client = await basicAuthTokenService.GetBasicAuthorizedClient<DimClient>(dimBasicAuth, cancellationToken).ConfigureAwait(false);
         var data = new CreateCompanyIdentityRequest(new Payload(
             hostingUrl,
-            new Bootstrap("Holder with IATP", "Holder IATP", Enumerable.Repeat("IATP", 1)),
+            new Network("web", "production"),
+            [new Service($"dim:web:{tenantId}", "CredentialService", "https://dis-agent-prod.eu10.dim.cloud.sap/api/v1.0.0/iatp")],
             isIssuer ?
-                Enumerable.Empty<Key>() :
+                [
+                    new("SIGNING"),
+                    new("SIGNING_VC")
+                ] :
                 new Key[]
                 {
-                    new("SIGNING"),
-                    new("SIGNING_VC"),
-                }));
+                    new("SIGNING")
+                },
+            "holder iatp"));
         var result = await client.PostAsJsonAsync($"{baseUrl}/api/v2.0.0/companyIdentities", data, JsonSerializerExtensions.Options, cancellationToken)
             .CatchingIntoServiceExceptionFor("create-company-identity", HttpAsyncResponseMessageExtension.RecoverOptions.INFRASTRUCTURE,
                 async m =>
@@ -77,7 +74,7 @@ public async Task<CreateCompanyIdentityResponse> CreateCompanyIdentity(BasicAuth
 
     public async Task<JsonDocument> GetDidDocument(string url, CancellationToken cancellationToken)
     {
-        var client = _clientFactory.CreateClient("didDocumentDownload");
+        var client = clientFactory.CreateClient("didDocumentDownload");
         using var result = await client.GetStreamAsync(url, cancellationToken).ConfigureAwait(false);
         var document = await JsonDocument.ParseAsync(result, cancellationToken: cancellationToken).ConfigureAwait(false);
         return document;
@@ -85,7 +82,7 @@ public async Task<JsonDocument> GetDidDocument(string url, CancellationToken can
 
     public async Task<string> CreateApplication(BasicAuthSettings dimAuth, string dimBaseUrl, string tenantName, CancellationToken cancellationToken)
     {
-        var client = await _basicAuthTokenService.GetBasicAuthorizedClient<DimClient>(dimAuth, cancellationToken).ConfigureAwait(false);
+        var client = await basicAuthTokenService.GetBasicAuthorizedClient<DimClient>(dimAuth, cancellationToken).ConfigureAwait(false);
         var data = new CreateApplicationRequest(new ApplicationPayload(
             "catena-x-portal",
             $"Catena-X Portal MIW for {tenantName}",
@@ -117,7 +114,7 @@ public async Task<string> CreateApplication(BasicAuthSettings dimAuth, string di
 
     public async Task<string> GetApplication(BasicAuthSettings dimAuth, string dimBaseUrl, string applicationId, CancellationToken cancellationToken)
     {
-        var client = await _basicAuthTokenService.GetBasicAuthorizedClient<DimClient>(dimAuth, cancellationToken).ConfigureAwait(false);
+        var client = await basicAuthTokenService.GetBasicAuthorizedClient<DimClient>(dimAuth, cancellationToken).ConfigureAwait(false);
         var result = await client.GetAsync($"{dimBaseUrl}/api/v2.0.0/applications/{applicationId}", cancellationToken)
             .CatchingIntoServiceExceptionFor("get-application", HttpAsyncResponseMessageExtension.RecoverOptions.INFRASTRUCTURE,
                 async m =>
@@ -145,7 +142,7 @@ public async Task<string> GetApplication(BasicAuthSettings dimAuth, string dimBa
 
     public async Task AssignApplicationToCompany(BasicAuthSettings dimAuth, string dimBaseUrl, string applicationKey, Guid companyId, CancellationToken cancellationToken)
     {
-        var client = await _basicAuthTokenService.GetBasicAuthorizedClient<DimClient>(dimAuth, cancellationToken).ConfigureAwait(false);
+        var client = await basicAuthTokenService.GetBasicAuthorizedClient<DimClient>(dimAuth, cancellationToken).ConfigureAwait(false);
         var data = new CompanyIdentityPatch(new ApplicationUpdates(Enumerable.Repeat(applicationKey, 1)));
         await client.PatchAsJsonAsync($"{dimBaseUrl}/api/v2.0.0/companyIdentities/{companyId}", data, JsonSerializerExtensions.Options, cancellationToken)
             .CatchingIntoServiceExceptionFor("assign-application", HttpAsyncResponseMessageExtension.RecoverOptions.INFRASTRUCTURE,
@@ -158,7 +155,7 @@ await client.PatchAsJsonAsync($"{dimBaseUrl}/api/v2.0.0/companyIdentities/{compa
 
     public async Task<string> GetStatusList(BasicAuthSettings dimAuth, string dimBaseUrl, Guid companyId, CancellationToken cancellationToken)
     {
-        var client = await _basicAuthTokenService.GetBasicAuthorizedClient<DimClient>(dimAuth, cancellationToken).ConfigureAwait(false);
+        var client = await basicAuthTokenService.GetBasicAuthorizedClient<DimClient>(dimAuth, cancellationToken).ConfigureAwait(false);
         var result = await client.GetAsync($"{dimBaseUrl}/api/v2.0.0/companyIdentities/{companyId}/revocationLists", cancellationToken);
         try
         {
@@ -185,7 +182,7 @@ public async Task<string> GetStatusList(BasicAuthSettings dimAuth, string dimBas
 
     public async Task<string> CreateStatusList(BasicAuthSettings dimAuth, string dimBaseUrl, Guid companyId, CancellationToken cancellationToken)
     {
-        var client = await _basicAuthTokenService.GetBasicAuthorizedClient<DimClient>(dimAuth, cancellationToken).ConfigureAwait(false);
+        var client = await basicAuthTokenService.GetBasicAuthorizedClient<DimClient>(dimAuth, cancellationToken).ConfigureAwait(false);
         var data = new CreateStatusListRequest(new CreateStatusListPaypload(new CreateStatusList("StatusList2021", DateTimeOffset.UtcNow.ToString("yyyyMMdd"), "New revocation list", 2097152)));
         var result = await client.PostAsJsonAsync($"{dimBaseUrl}/api/v2.0.0/companyIdentities/{companyId}/revocationLists", data, JsonSerializerExtensions.Options, cancellationToken)
             .CatchingIntoServiceExceptionFor("assign-application", HttpAsyncResponseMessageExtension.RecoverOptions.INFRASTRUCTURE,
diff --git a/src/clients/Dim.Clients/Api/Dim/IDimClient.cs b/src/clients/Dim.Clients/Api/Dim/IDimClient.cs
index 32d2b00..bff98c4 100644
--- a/src/clients/Dim.Clients/Api/Dim/IDimClient.cs
+++ b/src/clients/Dim.Clients/Api/Dim/IDimClient.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -24,10 +25,9 @@ namespace Dim.Clients.Api.Dim;
 
 public interface IDimClient
 {
-    Task<CreateCompanyIdentityResponse> CreateCompanyIdentity(BasicAuthSettings dimBasicAuth, string hostingUrl, string baseUrl, string tenantName, bool isIssuer, CancellationToken cancellationToken);
+    Task<CreateCompanyIdentityResponse> CreateCompanyIdentity(BasicAuthSettings dimBasicAuth, Guid tenantId, string hostingUrl, string baseUrl, bool isIssuer, CancellationToken cancellationToken);
     Task<JsonDocument> GetDidDocument(string url, CancellationToken cancellationToken);
     Task<string> CreateApplication(BasicAuthSettings dimAuth, string dimBaseUrl, string tenantName, CancellationToken cancellationToken);
-
     Task<string> GetApplication(BasicAuthSettings dimAuth, string dimBaseUrl, string applicationId, CancellationToken cancellationToken);
     Task AssignApplicationToCompany(BasicAuthSettings dimAuth, string dimBaseUrl, string applicationKey, Guid companyId, CancellationToken cancellationToken);
     Task<string> GetStatusList(BasicAuthSettings dimAuth, string dimBaseUrl, Guid companyId, CancellationToken cancellationToken);
diff --git a/src/clients/Dim.Clients/Api/Dim/StatusListResponse.cs b/src/clients/Dim.Clients/Api/Dim/StatusListResponse.cs
index 187c922..fa3eb40 100644
--- a/src/clients/Dim.Clients/Api/Dim/StatusListResponse.cs
+++ b/src/clients/Dim.Clients/Api/Dim/StatusListResponse.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Directories/DependencyInjection/DirectoryClientServiceExtensions.cs b/src/clients/Dim.Clients/Api/Directories/DependencyInjection/DirectoryClientServiceExtensions.cs
index a28c420..3d5a9e1 100644
--- a/src/clients/Dim.Clients/Api/Directories/DependencyInjection/DirectoryClientServiceExtensions.cs
+++ b/src/clients/Dim.Clients/Api/Directories/DependencyInjection/DirectoryClientServiceExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Directories/DependencyInjection/DirectorySettings.cs b/src/clients/Dim.Clients/Api/Directories/DependencyInjection/DirectorySettings.cs
index b9300d0..f4ce443 100644
--- a/src/clients/Dim.Clients/Api/Directories/DependencyInjection/DirectorySettings.cs
+++ b/src/clients/Dim.Clients/Api/Directories/DependencyInjection/DirectorySettings.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Directories/DirectoryClient.cs b/src/clients/Dim.Clients/Api/Directories/DirectoryClient.cs
index f541126..fd50052 100644
--- a/src/clients/Dim.Clients/Api/Directories/DirectoryClient.cs
+++ b/src/clients/Dim.Clients/Api/Directories/DirectoryClient.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Directories/DirectoryRequest.cs b/src/clients/Dim.Clients/Api/Directories/DirectoryRequest.cs
index 710fd66..64cdd7a 100644
--- a/src/clients/Dim.Clients/Api/Directories/DirectoryRequest.cs
+++ b/src/clients/Dim.Clients/Api/Directories/DirectoryRequest.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Directories/IDirectoryClient.cs b/src/clients/Dim.Clients/Api/Directories/IDirectoryClient.cs
index 9d3bf51..a145d93 100644
--- a/src/clients/Dim.Clients/Api/Directories/IDirectoryClient.cs
+++ b/src/clients/Dim.Clients/Api/Directories/IDirectoryClient.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Entitlements/CreateSubAccountRequest.cs b/src/clients/Dim.Clients/Api/Entitlements/CreateSubAccountRequest.cs
index e37315c..ce4d5c2 100644
--- a/src/clients/Dim.Clients/Api/Entitlements/CreateSubAccountRequest.cs
+++ b/src/clients/Dim.Clients/Api/Entitlements/CreateSubAccountRequest.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Entitlements/DependencyInjection/EntitlementClientServiceExtensions.cs b/src/clients/Dim.Clients/Api/Entitlements/DependencyInjection/EntitlementClientServiceExtensions.cs
index c9caeb6..751b551 100644
--- a/src/clients/Dim.Clients/Api/Entitlements/DependencyInjection/EntitlementClientServiceExtensions.cs
+++ b/src/clients/Dim.Clients/Api/Entitlements/DependencyInjection/EntitlementClientServiceExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Entitlements/DependencyInjection/EntitlementSettings.cs b/src/clients/Dim.Clients/Api/Entitlements/DependencyInjection/EntitlementSettings.cs
index 86e809a..6fdd346 100644
--- a/src/clients/Dim.Clients/Api/Entitlements/DependencyInjection/EntitlementSettings.cs
+++ b/src/clients/Dim.Clients/Api/Entitlements/DependencyInjection/EntitlementSettings.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Entitlements/EntitlementClient.cs b/src/clients/Dim.Clients/Api/Entitlements/EntitlementClient.cs
index 419b3b0..8103474 100644
--- a/src/clients/Dim.Clients/Api/Entitlements/EntitlementClient.cs
+++ b/src/clients/Dim.Clients/Api/Entitlements/EntitlementClient.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Entitlements/IEntitlementClient.cs b/src/clients/Dim.Clients/Api/Entitlements/IEntitlementClient.cs
index abb1571..da46df6 100644
--- a/src/clients/Dim.Clients/Api/Entitlements/IEntitlementClient.cs
+++ b/src/clients/Dim.Clients/Api/Entitlements/IEntitlementClient.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Provisioning/CreateCfeRequest.cs b/src/clients/Dim.Clients/Api/Provisioning/CreateCfeRequest.cs
index de437dc..692da27 100644
--- a/src/clients/Dim.Clients/Api/Provisioning/CreateCfeRequest.cs
+++ b/src/clients/Dim.Clients/Api/Provisioning/CreateCfeRequest.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Provisioning/DependencyInjection/ProvisioningClientServiceExtensions.cs b/src/clients/Dim.Clients/Api/Provisioning/DependencyInjection/ProvisioningClientServiceExtensions.cs
index 8150e4f..c46310d 100644
--- a/src/clients/Dim.Clients/Api/Provisioning/DependencyInjection/ProvisioningClientServiceExtensions.cs
+++ b/src/clients/Dim.Clients/Api/Provisioning/DependencyInjection/ProvisioningClientServiceExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Provisioning/DependencyInjection/ProvisioningSettings.cs b/src/clients/Dim.Clients/Api/Provisioning/DependencyInjection/ProvisioningSettings.cs
index 495c737..48fd5a3 100644
--- a/src/clients/Dim.Clients/Api/Provisioning/DependencyInjection/ProvisioningSettings.cs
+++ b/src/clients/Dim.Clients/Api/Provisioning/DependencyInjection/ProvisioningSettings.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Provisioning/IProvisioningClient.cs b/src/clients/Dim.Clients/Api/Provisioning/IProvisioningClient.cs
index f5c5571..41e3825 100644
--- a/src/clients/Dim.Clients/Api/Provisioning/IProvisioningClient.cs
+++ b/src/clients/Dim.Clients/Api/Provisioning/IProvisioningClient.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Provisioning/ProvisioningClient.cs b/src/clients/Dim.Clients/Api/Provisioning/ProvisioningClient.cs
index a19f895..d9fc0df 100644
--- a/src/clients/Dim.Clients/Api/Provisioning/ProvisioningClient.cs
+++ b/src/clients/Dim.Clients/Api/Provisioning/ProvisioningClient.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Services/CreateServiceInstanceRequest.cs b/src/clients/Dim.Clients/Api/Services/CreateServiceInstanceRequest.cs
index 93e8e2e..e311673 100644
--- a/src/clients/Dim.Clients/Api/Services/CreateServiceInstanceRequest.cs
+++ b/src/clients/Dim.Clients/Api/Services/CreateServiceInstanceRequest.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Services/DependencyInjection/ServiceClientServiceExtensions.cs b/src/clients/Dim.Clients/Api/Services/DependencyInjection/ServiceClientServiceExtensions.cs
index 7b288a6..ac75302 100644
--- a/src/clients/Dim.Clients/Api/Services/DependencyInjection/ServiceClientServiceExtensions.cs
+++ b/src/clients/Dim.Clients/Api/Services/DependencyInjection/ServiceClientServiceExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Services/IServiceClient.cs b/src/clients/Dim.Clients/Api/Services/IServiceClient.cs
index 5228cb8..230c7ce 100644
--- a/src/clients/Dim.Clients/Api/Services/IServiceClient.cs
+++ b/src/clients/Dim.Clients/Api/Services/IServiceClient.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Services/ServiceClient.cs b/src/clients/Dim.Clients/Api/Services/ServiceClient.cs
index 12355e0..d6da273 100644
--- a/src/clients/Dim.Clients/Api/Services/ServiceClient.cs
+++ b/src/clients/Dim.Clients/Api/Services/ServiceClient.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/SubAccounts/CreateSubAccountRequest.cs b/src/clients/Dim.Clients/Api/SubAccounts/CreateSubAccountRequest.cs
index 46543df..d7a7ccb 100644
--- a/src/clients/Dim.Clients/Api/SubAccounts/CreateSubAccountRequest.cs
+++ b/src/clients/Dim.Clients/Api/SubAccounts/CreateSubAccountRequest.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/SubAccounts/DependencyInjection/SubAccountClientServiceExtensions.cs b/src/clients/Dim.Clients/Api/SubAccounts/DependencyInjection/SubAccountClientServiceExtensions.cs
index d4d6450..77be287 100644
--- a/src/clients/Dim.Clients/Api/SubAccounts/DependencyInjection/SubAccountClientServiceExtensions.cs
+++ b/src/clients/Dim.Clients/Api/SubAccounts/DependencyInjection/SubAccountClientServiceExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/SubAccounts/DependencyInjection/SubAccountSettings.cs b/src/clients/Dim.Clients/Api/SubAccounts/DependencyInjection/SubAccountSettings.cs
index e10db04..aec5c64 100644
--- a/src/clients/Dim.Clients/Api/SubAccounts/DependencyInjection/SubAccountSettings.cs
+++ b/src/clients/Dim.Clients/Api/SubAccounts/DependencyInjection/SubAccountSettings.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/SubAccounts/ISubAccountClient.cs b/src/clients/Dim.Clients/Api/SubAccounts/ISubAccountClient.cs
index 629a63c..e95ce33 100644
--- a/src/clients/Dim.Clients/Api/SubAccounts/ISubAccountClient.cs
+++ b/src/clients/Dim.Clients/Api/SubAccounts/ISubAccountClient.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/SubAccounts/SubAccountClient.cs b/src/clients/Dim.Clients/Api/SubAccounts/SubAccountClient.cs
index 050d59b..3150304 100644
--- a/src/clients/Dim.Clients/Api/SubAccounts/SubAccountClient.cs
+++ b/src/clients/Dim.Clients/Api/SubAccounts/SubAccountClient.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/SubAccounts/UsedForProduction.cs b/src/clients/Dim.Clients/Api/SubAccounts/UsedForProduction.cs
index 2d9a5cd..619234a 100644
--- a/src/clients/Dim.Clients/Api/SubAccounts/UsedForProduction.cs
+++ b/src/clients/Dim.Clients/Api/SubAccounts/UsedForProduction.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Subscriptions/DependencyInjection/SubscriptionClientServiceExtensions.cs b/src/clients/Dim.Clients/Api/Subscriptions/DependencyInjection/SubscriptionClientServiceExtensions.cs
index d7a272f..6a6e846 100644
--- a/src/clients/Dim.Clients/Api/Subscriptions/DependencyInjection/SubscriptionClientServiceExtensions.cs
+++ b/src/clients/Dim.Clients/Api/Subscriptions/DependencyInjection/SubscriptionClientServiceExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Subscriptions/ISubscriptionClient.cs b/src/clients/Dim.Clients/Api/Subscriptions/ISubscriptionClient.cs
index 9dc4b2f..35fbd9a 100644
--- a/src/clients/Dim.Clients/Api/Subscriptions/ISubscriptionClient.cs
+++ b/src/clients/Dim.Clients/Api/Subscriptions/ISubscriptionClient.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Api/Subscriptions/SubscriptionClient.cs b/src/clients/Dim.Clients/Api/Subscriptions/SubscriptionClient.cs
index a0d0ecb..04bb6b8 100644
--- a/src/clients/Dim.Clients/Api/Subscriptions/SubscriptionClient.cs
+++ b/src/clients/Dim.Clients/Api/Subscriptions/SubscriptionClient.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Dim.Clients.csproj b/src/clients/Dim.Clients/Dim.Clients.csproj
index 804ccac..598ed58 100644
--- a/src/clients/Dim.Clients/Dim.Clients.csproj
+++ b/src/clients/Dim.Clients/Dim.Clients.csproj
@@ -1,4 +1,5 @@
 <!--
+- Copyright (c) 2024 BMW Group AG
 - Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 -
 - See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Extensions/HttpClientExtensions.cs b/src/clients/Dim.Clients/Extensions/HttpClientExtensions.cs
index 19b6eb1..475f0cf 100644
--- a/src/clients/Dim.Clients/Extensions/HttpClientExtensions.cs
+++ b/src/clients/Dim.Clients/Extensions/HttpClientExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Extensions/JsonSerializerExtensions.cs b/src/clients/Dim.Clients/Extensions/JsonSerializerExtensions.cs
index c1265cc..515261a 100644
--- a/src/clients/Dim.Clients/Extensions/JsonSerializerExtensions.cs
+++ b/src/clients/Dim.Clients/Extensions/JsonSerializerExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Token/AuthResponse.cs b/src/clients/Dim.Clients/Token/AuthResponse.cs
index 2eb53eb..ac64494 100644
--- a/src/clients/Dim.Clients/Token/AuthResponse.cs
+++ b/src/clients/Dim.Clients/Token/AuthResponse.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Token/BasicAuthSettings.cs b/src/clients/Dim.Clients/Token/BasicAuthSettings.cs
index e319969..8bae847 100644
--- a/src/clients/Dim.Clients/Token/BasicAuthSettings.cs
+++ b/src/clients/Dim.Clients/Token/BasicAuthSettings.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Token/BasicAuthTokenService.cs b/src/clients/Dim.Clients/Token/BasicAuthTokenService.cs
index 71d185f..d817fbb 100644
--- a/src/clients/Dim.Clients/Token/BasicAuthTokenService.cs
+++ b/src/clients/Dim.Clients/Token/BasicAuthTokenService.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Token/GetBasicTokenSettings.cs b/src/clients/Dim.Clients/Token/GetBasicTokenSettings.cs
index 88386aa..54d8f03 100644
--- a/src/clients/Dim.Clients/Token/GetBasicTokenSettings.cs
+++ b/src/clients/Dim.Clients/Token/GetBasicTokenSettings.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/clients/Dim.Clients/Token/IBasicAuthTokenService.cs b/src/clients/Dim.Clients/Token/IBasicAuthTokenService.cs
index 391b2b0..9c37f2c 100644
--- a/src/clients/Dim.Clients/Token/IBasicAuthTokenService.cs
+++ b/src/clients/Dim.Clients/Token/IBasicAuthTokenService.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.DbAccess/DependencyInjection/DimRepositoriesServiceExtensions.cs b/src/database/Dim.DbAccess/DependencyInjection/DimRepositoriesServiceExtensions.cs
index e0f5dc0..1bc98f4 100644
--- a/src/database/Dim.DbAccess/DependencyInjection/DimRepositoriesServiceExtensions.cs
+++ b/src/database/Dim.DbAccess/DependencyInjection/DimRepositoriesServiceExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.DbAccess/Dim.DbAccess.csproj b/src/database/Dim.DbAccess/Dim.DbAccess.csproj
index fd0fcb2..f63bb72 100644
--- a/src/database/Dim.DbAccess/Dim.DbAccess.csproj
+++ b/src/database/Dim.DbAccess/Dim.DbAccess.csproj
@@ -1,4 +1,5 @@
 <!--
+- Copyright (c) 2024 BMW Group AG
 - Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 -
 - See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.DbAccess/DimRepositories.cs b/src/database/Dim.DbAccess/DimRepositories.cs
index 8665385..542b173 100644
--- a/src/database/Dim.DbAccess/DimRepositories.cs
+++ b/src/database/Dim.DbAccess/DimRepositories.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.DbAccess/IDimRepositories.cs b/src/database/Dim.DbAccess/IDimRepositories.cs
index 74907c4..b054bf8 100644
--- a/src/database/Dim.DbAccess/IDimRepositories.cs
+++ b/src/database/Dim.DbAccess/IDimRepositories.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.DbAccess/Repositories/IProcessStepRepository.cs b/src/database/Dim.DbAccess/Repositories/IProcessStepRepository.cs
index 9251424..f9b26df 100644
--- a/src/database/Dim.DbAccess/Repositories/IProcessStepRepository.cs
+++ b/src/database/Dim.DbAccess/Repositories/IProcessStepRepository.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.DbAccess/Repositories/ITenantRepository.cs b/src/database/Dim.DbAccess/Repositories/ITenantRepository.cs
index 69140f7..5c28938 100644
--- a/src/database/Dim.DbAccess/Repositories/ITenantRepository.cs
+++ b/src/database/Dim.DbAccess/Repositories/ITenantRepository.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -41,4 +42,5 @@ public interface ITenantRepository
     Task<(bool Exists, Guid TechnicalUserId, string CompanyName, string Bpn)> GetTenantDataForTechnicalUserProcessId(Guid processId);
     Task<(Guid? spaceId, string technicalUserName)> GetSpaceIdAndTechnicalUserName(Guid technicalUserId);
     Task<(Guid ExternalId, string? TokenAddress, string? ClientId, byte[]? ClientSecret, byte[]? InitializationVector, int? EncryptionMode)> GetTechnicalUserCallbackData(Guid technicalUserId);
+    Task<(Guid? DimInstanceId, Guid? CompanyId)> GetDimInstanceIdAndDid(Guid tenantId);
 }
diff --git a/src/database/Dim.DbAccess/Repositories/ProcessStepRepository.cs b/src/database/Dim.DbAccess/Repositories/ProcessStepRepository.cs
index 98045e0..cc66c45 100644
--- a/src/database/Dim.DbAccess/Repositories/ProcessStepRepository.cs
+++ b/src/database/Dim.DbAccess/Repositories/ProcessStepRepository.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.DbAccess/Repositories/TenantRepository.cs b/src/database/Dim.DbAccess/Repositories/TenantRepository.cs
index 1b0ca1d..8c5d049 100644
--- a/src/database/Dim.DbAccess/Repositories/TenantRepository.cs
+++ b/src/database/Dim.DbAccess/Repositories/TenantRepository.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -23,20 +24,13 @@
 
 namespace Dim.DbAccess.Repositories;
 
-public class TenantRepository : ITenantRepository
+public class TenantRepository(DimDbContext context) : ITenantRepository
 {
-    private readonly DimDbContext _context;
-
-    public TenantRepository(DimDbContext context)
-    {
-        _context = context;
-    }
-
     public Tenant CreateTenant(string companyName, string bpn, string didDocumentLocation, bool isIssuer, Guid processId, Guid operatorId) =>
-        _context.Tenants.Add(new Tenant(Guid.NewGuid(), companyName, bpn, didDocumentLocation, isIssuer, processId, operatorId)).Entity;
+        context.Tenants.Add(new Tenant(Guid.NewGuid(), companyName, bpn, didDocumentLocation, isIssuer, processId, operatorId)).Entity;
 
     public Task<(bool Exists, Guid TenantId, string CompanyName, string Bpn)> GetTenantDataForProcessId(Guid processId) =>
-        _context.Tenants
+        context.Tenants
             .Where(x => x.ProcessId == processId)
             .Select(x => new ValueTuple<bool, Guid, string, string>(true, x.Id, x.CompanyName, x.Bpn))
             .SingleOrDefaultAsync();
@@ -45,54 +39,54 @@ public void AttachAndModifyTenant(Guid tenantId, Action<Tenant>? initialize, Act
     {
         var tenant = new Tenant(tenantId, null!, null!, null!, default, Guid.Empty, Guid.Empty);
         initialize?.Invoke(tenant);
-        _context.Tenants.Attach(tenant);
+        context.Tenants.Attach(tenant);
         modify(tenant);
     }
 
     public Task<Guid?> GetSubAccountIdByTenantId(Guid tenantId)
-        => _context.Tenants
+        => context.Tenants
             .Where(x => x.Id == tenantId)
             .Select(x => x.SubAccountId)
             .SingleOrDefaultAsync();
 
     public Task<(Guid? SubAccountId, string? ServiceInstanceId)> GetSubAccountAndServiceInstanceIdsByTenantId(Guid tenantId)
-        => _context.Tenants
+        => context.Tenants
             .Where(x => x.Id == tenantId)
             .Select(x => new ValueTuple<Guid?, string?>(x.SubAccountId, x.ServiceInstanceId))
             .SingleOrDefaultAsync();
 
     public Task<(Guid? SubAccountId, string? ServiceBindingName)> GetSubAccountIdAndServiceBindingNameByTenantId(Guid tenantId)
-        => _context.Tenants
+        => context.Tenants
             .Where(x => x.Id == tenantId)
             .Select(x => new ValueTuple<Guid?, string?>(x.SubAccountId, x.ServiceBindingName))
             .SingleOrDefaultAsync();
 
     public Task<Guid?> GetSpaceId(Guid tenantId)
-        => _context.Tenants
+        => context.Tenants
             .Where(x => x.Id == tenantId)
             .Select(x => x.SpaceId)
             .SingleOrDefaultAsync();
 
     public Task<Guid?> GetDimInstanceId(Guid tenantId)
-        => _context.Tenants
+        => context.Tenants
             .Where(x => x.Id == tenantId)
             .Select(x => x.DimInstanceId)
             .SingleOrDefaultAsync();
 
     public Task<(string bpn, string? DownloadUrl, string? Did, Guid? DimInstanceId)> GetCallbackData(Guid tenantId)
-        => _context.Tenants
+        => context.Tenants
             .Where(x => x.Id == tenantId)
             .Select(x => new ValueTuple<string, string?, string?, Guid?>(x.Bpn, x.DidDownloadUrl, x.Did, x.DimInstanceId))
             .SingleOrDefaultAsync();
 
     public Task<(Guid? DimInstanceId, string HostingUrl, bool IsIssuer)> GetDimInstanceIdAndHostingUrl(Guid tenantId)
-        => _context.Tenants
+        => context.Tenants
             .Where(x => x.Id == tenantId)
             .Select(x => new ValueTuple<Guid?, string, bool>(x.DimInstanceId, x.DidDocumentLocation, x.IsIssuer))
             .SingleOrDefaultAsync();
 
     public Task<(string? ApplicationId, Guid? CompanyId, Guid? DimInstanceId, bool IsIssuer)> GetApplicationAndCompanyId(Guid tenantId) =>
-        _context.Tenants
+        context.Tenants
             .Where(x => x.Id == tenantId)
             .Select(x => new ValueTuple<string?, Guid?, Guid?, bool>(
                 x.ApplicationId,
@@ -102,40 +96,40 @@ public void AttachAndModifyTenant(Guid tenantId, Action<Tenant>? initialize, Act
             .SingleOrDefaultAsync();
 
     public Task<(bool Exists, Guid? CompanyId, Guid? InstanceId)> GetCompanyAndInstanceIdForBpn(string bpn) =>
-        _context.Tenants.Where(x => x.Bpn == bpn)
+        context.Tenants.Where(x => x.Bpn == bpn)
             .Select(x => new ValueTuple<bool, Guid?, Guid?>(true, x.CompanyId, x.DimInstanceId))
             .SingleOrDefaultAsync();
 
     public void CreateTenantTechnicalUser(Guid tenantId, string technicalUserName, Guid externalId, Guid processId) =>
-        _context.TechnicalUsers.Add(new TechnicalUser(Guid.NewGuid(), tenantId, externalId, technicalUserName, processId));
+        context.TechnicalUsers.Add(new TechnicalUser(Guid.NewGuid(), tenantId, externalId, technicalUserName, processId));
 
     public void AttachAndModifyTechnicalUser(Guid technicalUserId, Action<TechnicalUser>? initialize, Action<TechnicalUser> modify)
     {
         var technicalUser = new TechnicalUser(technicalUserId, Guid.Empty, Guid.Empty, null!, Guid.Empty);
         initialize?.Invoke(technicalUser);
-        _context.TechnicalUsers.Attach(technicalUser);
+        context.TechnicalUsers.Attach(technicalUser);
         modify(technicalUser);
     }
 
     public Task<(bool Exists, Guid TenantId)> GetTenantForBpn(string bpn) =>
-        _context.Tenants.Where(x => x.Bpn == bpn)
+        context.Tenants.Where(x => x.Bpn == bpn)
             .Select(x => new ValueTuple<bool, Guid>(true, x.Id))
             .SingleOrDefaultAsync();
 
     public Task<(bool Exists, Guid TechnicalUserId, string CompanyName, string Bpn)> GetTenantDataForTechnicalUserProcessId(Guid processId) =>
-        _context.TechnicalUsers
+        context.TechnicalUsers
             .Where(x => x.ProcessId == processId)
             .Select(x => new ValueTuple<bool, Guid, string, string>(true, x.Id, x.Tenant!.CompanyName, x.Tenant.Bpn))
             .SingleOrDefaultAsync();
 
     public Task<(Guid? spaceId, string technicalUserName)> GetSpaceIdAndTechnicalUserName(Guid technicalUserId) =>
-        _context.TechnicalUsers
+        context.TechnicalUsers
             .Where(x => x.Id == technicalUserId)
             .Select(x => new ValueTuple<Guid?, string>(x.Tenant!.SpaceId, x.TechnicalUserName))
             .SingleOrDefaultAsync();
 
     public Task<(Guid ExternalId, string? TokenAddress, string? ClientId, byte[]? ClientSecret, byte[]? InitializationVector, int? EncryptionMode)> GetTechnicalUserCallbackData(Guid technicalUserId) =>
-        _context.TechnicalUsers
+        context.TechnicalUsers
             .Where(x => x.Id == technicalUserId)
             .Select(x => new ValueTuple<Guid, string?, string?, byte[]?, byte[]?, int?>(
                 x.ExternalId,
@@ -145,4 +139,10 @@ public void AttachAndModifyTechnicalUser(Guid technicalUserId, Action<TechnicalU
                 x.InitializationVector,
                 x.EncryptionMode))
             .SingleOrDefaultAsync();
+
+    public Task<(Guid? DimInstanceId, Guid? CompanyId)> GetDimInstanceIdAndDid(Guid tenantId) =>
+        context.Tenants
+            .Where(x => x.Id == tenantId)
+            .Select(x => new ValueTuple<Guid?, Guid?>(x.DimInstanceId, x.CompanyId))
+            .SingleOrDefaultAsync();
 }
diff --git a/src/database/Dim.Entities/Dim.Entities.csproj b/src/database/Dim.Entities/Dim.Entities.csproj
index 6ce01cd..65247d8 100644
--- a/src/database/Dim.Entities/Dim.Entities.csproj
+++ b/src/database/Dim.Entities/Dim.Entities.csproj
@@ -1,4 +1,5 @@
   <!--
+- Copyright (c) 2024 BMW Group AG
 - Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 -
 - See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Entities/DimDbContext.cs b/src/database/Dim.Entities/DimDbContext.cs
index 8897ba4..61df8bb 100644
--- a/src/database/Dim.Entities/DimDbContext.cs
+++ b/src/database/Dim.Entities/DimDbContext.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Entities/Entities/Process.cs b/src/database/Dim.Entities/Entities/Process.cs
index 4f03eeb..048c4f3 100644
--- a/src/database/Dim.Entities/Entities/Process.cs
+++ b/src/database/Dim.Entities/Entities/Process.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Entities/Entities/ProcessStep.cs b/src/database/Dim.Entities/Entities/ProcessStep.cs
index 0e6a8b0..09b1dd4 100644
--- a/src/database/Dim.Entities/Entities/ProcessStep.cs
+++ b/src/database/Dim.Entities/Entities/ProcessStep.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Entities/Entities/ProcessStepStatus.cs b/src/database/Dim.Entities/Entities/ProcessStepStatus.cs
index 16ed4dd..ef7619e 100644
--- a/src/database/Dim.Entities/Entities/ProcessStepStatus.cs
+++ b/src/database/Dim.Entities/Entities/ProcessStepStatus.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Entities/Entities/ProcessStepType.cs b/src/database/Dim.Entities/Entities/ProcessStepType.cs
index 349ff6e..87d1ccc 100644
--- a/src/database/Dim.Entities/Entities/ProcessStepType.cs
+++ b/src/database/Dim.Entities/Entities/ProcessStepType.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Entities/Entities/ProcessType.cs b/src/database/Dim.Entities/Entities/ProcessType.cs
index 3f93910..b8ff4cc 100644
--- a/src/database/Dim.Entities/Entities/ProcessType.cs
+++ b/src/database/Dim.Entities/Entities/ProcessType.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Entities/Entities/TechnicalUser.cs b/src/database/Dim.Entities/Entities/TechnicalUser.cs
index 8b3d235..5b64a6e 100644
--- a/src/database/Dim.Entities/Entities/TechnicalUser.cs
+++ b/src/database/Dim.Entities/Entities/TechnicalUser.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Entities/Entities/Tenant.cs b/src/database/Dim.Entities/Entities/Tenant.cs
index e789c38..03053ec 100644
--- a/src/database/Dim.Entities/Entities/Tenant.cs
+++ b/src/database/Dim.Entities/Entities/Tenant.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Entities/Entities/VerifyProcessData.cs b/src/database/Dim.Entities/Entities/VerifyProcessData.cs
index 3decb5c..01805b3 100644
--- a/src/database/Dim.Entities/Entities/VerifyProcessData.cs
+++ b/src/database/Dim.Entities/Entities/VerifyProcessData.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Entities/Enums/ProcessStepStatusId.cs b/src/database/Dim.Entities/Enums/ProcessStepStatusId.cs
index 17f5d4c..061e605 100644
--- a/src/database/Dim.Entities/Enums/ProcessStepStatusId.cs
+++ b/src/database/Dim.Entities/Enums/ProcessStepStatusId.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Entities/Enums/ProcessStepTypeId.cs b/src/database/Dim.Entities/Enums/ProcessStepTypeId.cs
index 91f2ee6..918ce57 100644
--- a/src/database/Dim.Entities/Enums/ProcessStepTypeId.cs
+++ b/src/database/Dim.Entities/Enums/ProcessStepTypeId.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Entities/Enums/ProcessTypeId.cs b/src/database/Dim.Entities/Enums/ProcessTypeId.cs
index 19f966d..9a35238 100644
--- a/src/database/Dim.Entities/Enums/ProcessTypeId.cs
+++ b/src/database/Dim.Entities/Enums/ProcessTypeId.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Migrations/Dim.Migrations.csproj b/src/database/Dim.Migrations/Dim.Migrations.csproj
index e058dab..240e8b3 100644
--- a/src/database/Dim.Migrations/Dim.Migrations.csproj
+++ b/src/database/Dim.Migrations/Dim.Migrations.csproj
@@ -1,4 +1,5 @@
 <!--
+- Copyright (c) 2024 BMW Group AG
 - Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 -
 - See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Migrations/Migrations/20240403114716_Initial.Designer.cs b/src/database/Dim.Migrations/Migrations/20240403114716_Initial.Designer.cs
index 468c2ed..58dcfef 100644
--- a/src/database/Dim.Migrations/Migrations/20240403114716_Initial.Designer.cs
+++ b/src/database/Dim.Migrations/Migrations/20240403114716_Initial.Designer.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Migrations/Migrations/20240403114716_Initial.cs b/src/database/Dim.Migrations/Migrations/20240403114716_Initial.cs
index 4520b39..c8a1ea6 100644
--- a/src/database/Dim.Migrations/Migrations/20240403114716_Initial.cs
+++ b/src/database/Dim.Migrations/Migrations/20240403114716_Initial.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Migrations/Migrations/20240409140733_1.0.1.Designer.cs b/src/database/Dim.Migrations/Migrations/20240409140733_1.0.1.Designer.cs
index 0ad55bb..bfed16d 100644
--- a/src/database/Dim.Migrations/Migrations/20240409140733_1.0.1.Designer.cs
+++ b/src/database/Dim.Migrations/Migrations/20240409140733_1.0.1.Designer.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Migrations/Migrations/20240409140733_1.0.1.cs b/src/database/Dim.Migrations/Migrations/20240409140733_1.0.1.cs
index b041606..12a002a 100644
--- a/src/database/Dim.Migrations/Migrations/20240409140733_1.0.1.cs
+++ b/src/database/Dim.Migrations/Migrations/20240409140733_1.0.1.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Migrations/Migrations/DimDbContextModelSnapshot.cs b/src/database/Dim.Migrations/Migrations/DimDbContextModelSnapshot.cs
index 014a052..e6e124f 100644
--- a/src/database/Dim.Migrations/Migrations/DimDbContextModelSnapshot.cs
+++ b/src/database/Dim.Migrations/Migrations/DimDbContextModelSnapshot.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/database/Dim.Migrations/Program.cs b/src/database/Dim.Migrations/Program.cs
index 4c27af9..ccc4463 100644
--- a/src/database/Dim.Migrations/Program.cs
+++ b/src/database/Dim.Migrations/Program.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/DimProcess.Executor/DependencyInjection/DimProcessCollectionExtensions.cs b/src/processes/DimProcess.Executor/DependencyInjection/DimProcessCollectionExtensions.cs
index 3130889..78be5c0 100644
--- a/src/processes/DimProcess.Executor/DependencyInjection/DimProcessCollectionExtensions.cs
+++ b/src/processes/DimProcess.Executor/DependencyInjection/DimProcessCollectionExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/DimProcess.Executor/DimProcess.Executor.csproj b/src/processes/DimProcess.Executor/DimProcess.Executor.csproj
index 26691dc..0cf1f2c 100644
--- a/src/processes/DimProcess.Executor/DimProcess.Executor.csproj
+++ b/src/processes/DimProcess.Executor/DimProcess.Executor.csproj
@@ -1,4 +1,5 @@
 <!--
+- Copyright (c) 2024 BMW Group AG
 - Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 -
 - See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/DimProcess.Executor/DimProcessTypeExecutor.cs b/src/processes/DimProcess.Executor/DimProcessTypeExecutor.cs
index 61f27d5..db9c5fd 100644
--- a/src/processes/DimProcess.Executor/DimProcessTypeExecutor.cs
+++ b/src/processes/DimProcess.Executor/DimProcessTypeExecutor.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -117,7 +118,7 @@ public class DimProcessTypeExecutor(
                     .ConfigureAwait(false),
                 ProcessStepTypeId.CREATE_APPLICATION => await dimProcessHandler.CreateApplication(_tenantName, _tenantId, cancellationToken)
                     .ConfigureAwait(false),
-                ProcessStepTypeId.CREATE_COMPANY_IDENTITY => await dimProcessHandler.CreateCompanyIdentity(_tenantId, _tenantName, cancellationToken)
+                ProcessStepTypeId.CREATE_COMPANY_IDENTITY => await dimProcessHandler.CreateCompanyIdentity(_tenantId, cancellationToken)
                     .ConfigureAwait(false),
                 ProcessStepTypeId.ASSIGN_COMPANY_APPLICATION => await dimProcessHandler.AssignCompanyApplication(_tenantId, cancellationToken)
                     .ConfigureAwait(false),
diff --git a/src/processes/DimProcess.Executor/TechnicalUserProcessTypeExecutor.cs b/src/processes/DimProcess.Executor/TechnicalUserProcessTypeExecutor.cs
index ce881c3..2f2b455 100644
--- a/src/processes/DimProcess.Executor/TechnicalUserProcessTypeExecutor.cs
+++ b/src/processes/DimProcess.Executor/TechnicalUserProcessTypeExecutor.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/DimProcess.Library/Callback/CallbackDataModel.cs b/src/processes/DimProcess.Library/Callback/CallbackDataModel.cs
index 19ec001..e3092a1 100644
--- a/src/processes/DimProcess.Library/Callback/CallbackDataModel.cs
+++ b/src/processes/DimProcess.Library/Callback/CallbackDataModel.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -29,7 +30,7 @@ public record CallbackDataModel(
 );
 
 public record AuthenticationDetail(
-        [property: JsonPropertyName("authenticationServiceUrl")] string AuthenticationServiceUrl,
+    [property: JsonPropertyName("authenticationServiceUrl")] string AuthenticationServiceUrl,
     [property: JsonPropertyName("clientID")] string ClientId,
     [property: JsonPropertyName("clientSecret")] string ClientSecret
 );
diff --git a/src/processes/DimProcess.Library/Callback/CallbackService.cs b/src/processes/DimProcess.Library/Callback/CallbackService.cs
index 187bf62..c2e914f 100644
--- a/src/processes/DimProcess.Library/Callback/CallbackService.cs
+++ b/src/processes/DimProcess.Library/Callback/CallbackService.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -57,6 +58,6 @@ public async Task SendTechnicalUserCallback(Guid externalId, string tokenAddress
             tokenAddress,
             clientId,
             clientSecret);
-        await httpClient.PostAsJsonAsync($"/api/adminstration/serviceAccount/callback/{externalId}", data, JsonSerializerExtensions.Options, cancellationToken).ConfigureAwait(false);
+        await httpClient.PostAsJsonAsync($"/api/administration/serviceAccount/callback/{externalId}", data, JsonSerializerExtensions.Options, cancellationToken).ConfigureAwait(false);
     }
 }
diff --git a/src/processes/DimProcess.Library/Callback/DependencyInjection/CallbackServiceExtensions.cs b/src/processes/DimProcess.Library/Callback/DependencyInjection/CallbackServiceExtensions.cs
index 34de89e..1547b7a 100644
--- a/src/processes/DimProcess.Library/Callback/DependencyInjection/CallbackServiceExtensions.cs
+++ b/src/processes/DimProcess.Library/Callback/DependencyInjection/CallbackServiceExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/DimProcess.Library/Callback/DependencyInjection/CallbackSettings.cs b/src/processes/DimProcess.Library/Callback/DependencyInjection/CallbackSettings.cs
index d58b524..a340ee7 100644
--- a/src/processes/DimProcess.Library/Callback/DependencyInjection/CallbackSettings.cs
+++ b/src/processes/DimProcess.Library/Callback/DependencyInjection/CallbackSettings.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/DimProcess.Library/Callback/ICallbackService.cs b/src/processes/DimProcess.Library/Callback/ICallbackService.cs
index cb94405..f0a57d3 100644
--- a/src/processes/DimProcess.Library/Callback/ICallbackService.cs
+++ b/src/processes/DimProcess.Library/Callback/ICallbackService.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/DimProcess.Library/DependencyInjection/DimHandlerExtensions.cs b/src/processes/DimProcess.Library/DependencyInjection/DimHandlerExtensions.cs
index 87b9a2a..09ca0de 100644
--- a/src/processes/DimProcess.Library/DependencyInjection/DimHandlerExtensions.cs
+++ b/src/processes/DimProcess.Library/DependencyInjection/DimHandlerExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/DimProcess.Library/DependencyInjection/DimHandlerSettings.cs b/src/processes/DimProcess.Library/DependencyInjection/DimHandlerSettings.cs
index 7fb2347..6b09d1d 100644
--- a/src/processes/DimProcess.Library/DependencyInjection/DimHandlerSettings.cs
+++ b/src/processes/DimProcess.Library/DependencyInjection/DimHandlerSettings.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/DimProcess.Library/DependencyInjection/TechnicalUserSettings.cs b/src/processes/DimProcess.Library/DependencyInjection/TechnicalUserSettings.cs
index b0f0b06..2de34fc 100644
--- a/src/processes/DimProcess.Library/DependencyInjection/TechnicalUserSettings.cs
+++ b/src/processes/DimProcess.Library/DependencyInjection/TechnicalUserSettings.cs
@@ -1,3 +1,23 @@
+/********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
+ * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
+ *
+ * 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
+ ********************************************************************************/
+
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Configuration;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Validation;
 using System.ComponentModel.DataAnnotations;
diff --git a/src/processes/DimProcess.Library/DimProcess.Library.csproj b/src/processes/DimProcess.Library/DimProcess.Library.csproj
index 884f3b6..63bae3f 100644
--- a/src/processes/DimProcess.Library/DimProcess.Library.csproj
+++ b/src/processes/DimProcess.Library/DimProcess.Library.csproj
@@ -1,4 +1,5 @@
 <!--
+- Copyright (c) 2024 BMW Group AG
 - Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 -
 - See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/DimProcess.Library/DimProcessHandler.cs b/src/processes/DimProcess.Library/DimProcessHandler.cs
index 7a43678..22aeb68 100644
--- a/src/processes/DimProcess.Library/DimProcessHandler.cs
+++ b/src/processes/DimProcess.Library/DimProcessHandler.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -399,7 +400,7 @@ await provisioningClient.CreateCloudFoundryEnvironment(saBinding.Url, bindingRes
             null);
     }
 
-    public async Task<(IEnumerable<ProcessStepTypeId>? nextStepTypeIds, ProcessStepStatusId stepStatusId, bool modified, string? processMessage)> CreateCompanyIdentity(Guid tenantId, string tenantName, CancellationToken cancellationToken)
+    public async Task<(IEnumerable<ProcessStepTypeId>? nextStepTypeIds, ProcessStepStatusId stepStatusId, bool modified, string? processMessage)> CreateCompanyIdentity(Guid tenantId, CancellationToken cancellationToken)
     {
         var (dimInstanceId, hostingUrl, isIssuer) = await dimRepositories.GetInstance<ITenantRepository>().GetDimInstanceIdAndHostingUrl(tenantId).ConfigureAwait(false);
         if (dimInstanceId == null)
@@ -416,7 +417,7 @@ await provisioningClient.CreateCloudFoundryEnvironment(saBinding.Url, bindingRes
             ClientSecret = dimDetails.Credentials.Uaa.ClientSecret
         };
         var dimBaseUrl = dimDetails.Credentials.Url;
-        var result = await dimClient.CreateCompanyIdentity(dimAuth, hostingUrl, dimBaseUrl, tenantName, isIssuer, cancellationToken).ConfigureAwait(false);
+        var result = await dimClient.CreateCompanyIdentity(dimAuth, tenantId, hostingUrl, dimBaseUrl, isIssuer, cancellationToken).ConfigureAwait(false);
 
         dimRepositories.GetInstance<ITenantRepository>().AttachAndModifyTenant(tenantId, tenant =>
             {
diff --git a/src/processes/DimProcess.Library/IDimProcessHandler.cs b/src/processes/DimProcess.Library/IDimProcessHandler.cs
index c7b3773..0fd68ad 100644
--- a/src/processes/DimProcess.Library/IDimProcessHandler.cs
+++ b/src/processes/DimProcess.Library/IDimProcessHandler.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -37,7 +38,7 @@ public interface IDimProcessHandler
     Task<(IEnumerable<ProcessStepTypeId>? nextStepTypeIds, ProcessStepStatusId stepStatusId, bool modified, string? processMessage)> CreateServiceInstanceBindings(string tenantName, Guid tenantId, CancellationToken cancellationToken);
     Task<(IEnumerable<ProcessStepTypeId>? nextStepTypeIds, ProcessStepStatusId stepStatusId, bool modified, string? processMessage)> CreateApplication(string tenantName, Guid tenantId, CancellationToken cancellationToken);
     Task<(IEnumerable<ProcessStepTypeId>? nextStepTypeIds, ProcessStepStatusId stepStatusId, bool modified, string? processMessage)> GetDimDetails(string tenantName, Guid tenantId, CancellationToken cancellationToken);
-    Task<(IEnumerable<ProcessStepTypeId>? nextStepTypeIds, ProcessStepStatusId stepStatusId, bool modified, string? processMessage)> CreateCompanyIdentity(Guid tenantId, string tenantName, CancellationToken cancellationToken);
+    Task<(IEnumerable<ProcessStepTypeId>? nextStepTypeIds, ProcessStepStatusId stepStatusId, bool modified, string? processMessage)> CreateCompanyIdentity(Guid tenantId, CancellationToken cancellationToken);
     Task<(IEnumerable<ProcessStepTypeId>? nextStepTypeIds, ProcessStepStatusId stepStatusId, bool modified, string? processMessage)> CreateStatusList(Guid tenantId, CancellationToken cancellationToken);
     Task<(IEnumerable<ProcessStepTypeId>? nextStepTypeIds, ProcessStepStatusId stepStatusId, bool modified, string? processMessage)> AssignCompanyApplication(Guid tenantId, CancellationToken cancellationToken);
     Task<(IEnumerable<ProcessStepTypeId>? nextStepTypeIds, ProcessStepStatusId stepStatusId, bool modified, string? processMessage)> SendCallback(Guid tenantId, CancellationToken cancellationToken);
diff --git a/src/processes/DimProcess.Library/ITechnicalUserProcessHandler.cs b/src/processes/DimProcess.Library/ITechnicalUserProcessHandler.cs
index 6b7a694..3d8bc10 100644
--- a/src/processes/DimProcess.Library/ITechnicalUserProcessHandler.cs
+++ b/src/processes/DimProcess.Library/ITechnicalUserProcessHandler.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/DimProcess.Library/TechnicalUserProcessHandler.cs b/src/processes/DimProcess.Library/TechnicalUserProcessHandler.cs
index 258f600..6e8972d 100644
--- a/src/processes/DimProcess.Library/TechnicalUserProcessHandler.cs
+++ b/src/processes/DimProcess.Library/TechnicalUserProcessHandler.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -64,7 +65,9 @@ public class TechnicalUserProcessHandler(
 
         var dimInstanceId = await cfClient.GetServiceBinding(tenantName, spaceId.Value, $"{technicalUserName}-dim-key01", cancellationToken).ConfigureAwait(false);
         var dimDetails = await cfClient.GetServiceBindingDetails(dimInstanceId, cancellationToken).ConfigureAwait(false);
-        var (secret, initializationVector, encryptionMode) = Encrypt(dimDetails.Credentials.Uaa.ClientSecret);
+
+        var cryptoConfig = _settings.EncryptionConfigs.SingleOrDefault(x => x.Index == _settings.EncryptionConfigIndex) ?? throw new ConfigurationException($"encryptionConfigIndex {_settings.EncryptionConfigIndex} is not configured");
+        var (secret, initializationVector) = CryptoHelper.Encrypt(dimDetails.Credentials.Uaa.ClientSecret, Convert.FromHexString(cryptoConfig.EncryptionKey), cryptoConfig.CipherMode, cryptoConfig.PaddingMode);
 
         dimRepositories.GetInstance<ITenantRepository>().AttachAndModifyTechnicalUser(technicalUserId, technicalUser =>
             {
@@ -80,7 +83,7 @@ public class TechnicalUserProcessHandler(
                 technicalUser.ClientId = dimDetails.Credentials.Uaa.ClientId;
                 technicalUser.ClientSecret = secret;
                 technicalUser.InitializationVector = initializationVector;
-                technicalUser.EncryptionMode = encryptionMode;
+                technicalUser.EncryptionMode = _settings.EncryptionConfigIndex;
             });
         return new ValueTuple<IEnumerable<ProcessStepTypeId>?, ProcessStepStatusId, bool, string?>(
             Enumerable.Repeat(ProcessStepTypeId.SEND_TECHNICAL_USER_CALLBACK, 1),
@@ -89,13 +92,6 @@ public class TechnicalUserProcessHandler(
             null);
     }
 
-    private (byte[] Secret, byte[] InitializationVector, int EncryptionMode) Encrypt(string clientSecret)
-    {
-        var cryptoConfig = _settings.EncryptionConfigs.SingleOrDefault(x => x.Index == _settings.EncryptionConfigIndex) ?? throw new ConfigurationException($"EncryptionModeIndex {_settings.EncryptionConfigIndex} is not configured");
-        var (secret, initializationVector) = CryptoHelper.Encrypt(clientSecret, Convert.FromHexString(cryptoConfig.EncryptionKey), cryptoConfig.CipherMode, cryptoConfig.PaddingMode);
-        return (secret, initializationVector, _settings.EncryptionConfigIndex);
-    }
-
     public async Task<(IEnumerable<ProcessStepTypeId>? nextStepTypeIds, ProcessStepStatusId stepStatusId, bool modified, string? processMessage)> SendCallback(Guid technicalUserId, CancellationToken cancellationToken)
     {
         var (externalId, tokenAddress, clientId, clientSecret, initializationVector, encryptionMode) = await dimRepositories.GetInstance<ITenantRepository>().GetTechnicalUserCallbackData(technicalUserId).ConfigureAwait(false);
diff --git a/src/processes/Processes.Library/ManualProcessStepData.cs b/src/processes/Processes.Library/ManualProcessStepData.cs
index 571a168..5cc0011 100644
--- a/src/processes/Processes.Library/ManualProcessStepData.cs
+++ b/src/processes/Processes.Library/ManualProcessStepData.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/Processes.Library/ManualProcessStepDataExtensions.cs b/src/processes/Processes.Library/ManualProcessStepDataExtensions.cs
index 9baac3a..9820578 100644
--- a/src/processes/Processes.Library/ManualProcessStepDataExtensions.cs
+++ b/src/processes/Processes.Library/ManualProcessStepDataExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/Processes.Library/Processes.Library.csproj b/src/processes/Processes.Library/Processes.Library.csproj
index 0cdd2e1..5b2a8cc 100644
--- a/src/processes/Processes.Library/Processes.Library.csproj
+++ b/src/processes/Processes.Library/Processes.Library.csproj
@@ -1,4 +1,5 @@
 <!--
+- Copyright (c) 2024 BMW Group AG
 - Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 -
 - See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/Processes.Worker.Library/IProcessExecutor.cs b/src/processes/Processes.Worker.Library/IProcessExecutor.cs
index d3d9733..88a0b87 100644
--- a/src/processes/Processes.Worker.Library/IProcessExecutor.cs
+++ b/src/processes/Processes.Worker.Library/IProcessExecutor.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/Processes.Worker.Library/IProcessTypeExecutor.cs b/src/processes/Processes.Worker.Library/IProcessTypeExecutor.cs
index c3fa14f..051803a 100644
--- a/src/processes/Processes.Worker.Library/IProcessTypeExecutor.cs
+++ b/src/processes/Processes.Worker.Library/IProcessTypeExecutor.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/Processes.Worker.Library/ProcessExecutionService.cs b/src/processes/Processes.Worker.Library/ProcessExecutionService.cs
index bca4f51..d8644c2 100644
--- a/src/processes/Processes.Worker.Library/ProcessExecutionService.cs
+++ b/src/processes/Processes.Worker.Library/ProcessExecutionService.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/Processes.Worker.Library/ProcessExecutionServiceExtensions.cs b/src/processes/Processes.Worker.Library/ProcessExecutionServiceExtensions.cs
index 6183793..4642c0c 100644
--- a/src/processes/Processes.Worker.Library/ProcessExecutionServiceExtensions.cs
+++ b/src/processes/Processes.Worker.Library/ProcessExecutionServiceExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/Processes.Worker.Library/ProcessExecutionServiceSettings.cs b/src/processes/Processes.Worker.Library/ProcessExecutionServiceSettings.cs
index 1714707..1508a17 100644
--- a/src/processes/Processes.Worker.Library/ProcessExecutionServiceSettings.cs
+++ b/src/processes/Processes.Worker.Library/ProcessExecutionServiceSettings.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/Processes.Worker.Library/ProcessExecutor.cs b/src/processes/Processes.Worker.Library/ProcessExecutor.cs
index d7ce4ae..96905e0 100644
--- a/src/processes/Processes.Worker.Library/ProcessExecutor.cs
+++ b/src/processes/Processes.Worker.Library/ProcessExecutor.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/Processes.Worker.Library/Processes.Worker.Library.csproj b/src/processes/Processes.Worker.Library/Processes.Worker.Library.csproj
index b3f4290..b1593ee 100644
--- a/src/processes/Processes.Worker.Library/Processes.Worker.Library.csproj
+++ b/src/processes/Processes.Worker.Library/Processes.Worker.Library.csproj
@@ -1,4 +1,5 @@
 <!--
+- Copyright (c) 2024 BMW Group AG
 - Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 -
 - See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/Processes.Worker/Processes.Worker.csproj b/src/processes/Processes.Worker/Processes.Worker.csproj
index 18bb0ba..8160173 100644
--- a/src/processes/Processes.Worker/Processes.Worker.csproj
+++ b/src/processes/Processes.Worker/Processes.Worker.csproj
@@ -1,4 +1,5 @@
 <!--
+- Copyright (c) 2024 BMW Group AG
 - Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 -
 - See the NOTICE file(s) distributed with this work for additional
diff --git a/src/processes/Processes.Worker/Program.cs b/src/processes/Processes.Worker/Program.cs
index 55014bd..0f2aef7 100644
--- a/src/processes/Processes.Worker/Program.cs
+++ b/src/processes/Processes.Worker/Program.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/web/Dim.Web/Authentication/CustomClaimTypes.cs b/src/web/Dim.Web/Authentication/CustomClaimTypes.cs
index dbf9e8f..6491b6e 100644
--- a/src/web/Dim.Web/Authentication/CustomClaimTypes.cs
+++ b/src/web/Dim.Web/Authentication/CustomClaimTypes.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/web/Dim.Web/Authentication/KeycloakClaimsTransformation.cs b/src/web/Dim.Web/Authentication/KeycloakClaimsTransformation.cs
index 86b4177..4aa4aaa 100644
--- a/src/web/Dim.Web/Authentication/KeycloakClaimsTransformation.cs
+++ b/src/web/Dim.Web/Authentication/KeycloakClaimsTransformation.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/web/Dim.Web/BusinessLogic/DimBusinessLogic.cs b/src/web/Dim.Web/BusinessLogic/DimBusinessLogic.cs
index 9bedd05..376526f 100644
--- a/src/web/Dim.Web/BusinessLogic/DimBusinessLogic.cs
+++ b/src/web/Dim.Web/BusinessLogic/DimBusinessLogic.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -30,35 +31,29 @@
 
 namespace Dim.Web.BusinessLogic;
 
-public class DimBusinessLogic : IDimBusinessLogic
+public class DimBusinessLogic(
+    IDimRepositories dimRepositories,
+    ICfClient cfClient,
+    IDimClient dimClient,
+    IOptions<DimSettings> options)
+    : IDimBusinessLogic
 {
-    private readonly IDimRepositories _dimRepositories;
-    private readonly ICfClient _cfClient;
-    private readonly IDimClient _dimClient;
-    private readonly DimSettings _settings;
-
-    public DimBusinessLogic(IDimRepositories dimRepositories, ICfClient cfClient, IDimClient dimClient, IOptions<DimSettings> options)
-    {
-        _dimRepositories = dimRepositories;
-        _cfClient = cfClient;
-        _dimClient = dimClient;
-        _settings = options.Value;
-    }
+    private readonly DimSettings _settings = options.Value;
 
     public async Task StartSetupDim(string companyName, string bpn, string didDocumentLocation, bool isIssuer)
     {
-        var processStepRepository = _dimRepositories.GetInstance<IProcessStepRepository>();
+        var processStepRepository = dimRepositories.GetInstance<IProcessStepRepository>();
         var processId = processStepRepository.CreateProcess(ProcessTypeId.SETUP_DIM).Id;
         processStepRepository.CreateProcessStep(ProcessStepTypeId.CREATE_SUBACCOUNT, ProcessStepStatusId.TODO, processId);
 
-        _dimRepositories.GetInstance<ITenantRepository>().CreateTenant(companyName, bpn, didDocumentLocation, isIssuer, processId, _settings.OperatorId);
+        dimRepositories.GetInstance<ITenantRepository>().CreateTenant(companyName, bpn, didDocumentLocation, isIssuer, processId, _settings.OperatorId);
 
-        await _dimRepositories.SaveAsync().ConfigureAwait(false);
+        await dimRepositories.SaveAsync().ConfigureAwait(false);
     }
 
     public async Task<string> GetStatusList(string bpn, CancellationToken cancellationToken)
     {
-        var (exists, companyId, instanceId) = await _dimRepositories.GetInstance<ITenantRepository>().GetCompanyAndInstanceIdForBpn(bpn).ConfigureAwait(false);
+        var (exists, companyId, instanceId) = await dimRepositories.GetInstance<ITenantRepository>().GetCompanyAndInstanceIdForBpn(bpn).ConfigureAwait(false);
         if (!exists)
         {
             throw NotFoundException.Create(DimErrors.NO_COMPANY_FOR_BPN, new ErrorParameter[] { new("bpn", bpn) });
@@ -74,7 +69,7 @@ public async Task<string> GetStatusList(string bpn, CancellationToken cancellati
             throw ConflictException.Create(DimErrors.NO_INSTANCE_ID_SET);
         }
 
-        var dimDetails = await _cfClient.GetServiceBindingDetails(instanceId.Value, cancellationToken).ConfigureAwait(false);
+        var dimDetails = await cfClient.GetServiceBindingDetails(instanceId.Value, cancellationToken).ConfigureAwait(false);
         var dimAuth = new BasicAuthSettings
         {
             TokenAddress = $"{dimDetails.Credentials.Uaa.Url}/oauth/token",
@@ -82,12 +77,12 @@ public async Task<string> GetStatusList(string bpn, CancellationToken cancellati
             ClientSecret = dimDetails.Credentials.Uaa.ClientSecret
         };
         var dimBaseUrl = dimDetails.Credentials.Url;
-        return await _dimClient.GetStatusList(dimAuth, dimBaseUrl, companyId.Value, cancellationToken).ConfigureAwait(false);
+        return await dimClient.GetStatusList(dimAuth, dimBaseUrl, companyId.Value, cancellationToken).ConfigureAwait(false);
     }
 
     public async Task<string> CreateStatusList(string bpn, CancellationToken cancellationToken)
     {
-        var (exists, companyId, instanceId) = await _dimRepositories.GetInstance<ITenantRepository>().GetCompanyAndInstanceIdForBpn(bpn).ConfigureAwait(false);
+        var (exists, companyId, instanceId) = await dimRepositories.GetInstance<ITenantRepository>().GetCompanyAndInstanceIdForBpn(bpn).ConfigureAwait(false);
         if (!exists)
         {
             throw NotFoundException.Create(DimErrors.NO_COMPANY_FOR_BPN, new ErrorParameter[] { new("bpn", bpn) });
@@ -103,7 +98,7 @@ public async Task<string> CreateStatusList(string bpn, CancellationToken cancell
             throw ConflictException.Create(DimErrors.NO_INSTANCE_ID_SET);
         }
 
-        var dimDetails = await _cfClient.GetServiceBindingDetails(instanceId.Value, cancellationToken).ConfigureAwait(false);
+        var dimDetails = await cfClient.GetServiceBindingDetails(instanceId.Value, cancellationToken).ConfigureAwait(false);
         var dimAuth = new BasicAuthSettings
         {
             TokenAddress = $"{dimDetails.Credentials.Uaa.Url}/oauth/token",
@@ -111,24 +106,24 @@ public async Task<string> CreateStatusList(string bpn, CancellationToken cancell
             ClientSecret = dimDetails.Credentials.Uaa.ClientSecret
         };
         var dimBaseUrl = dimDetails.Credentials.Url;
-        return await _dimClient.CreateStatusList(dimAuth, dimBaseUrl, companyId.Value, cancellationToken).ConfigureAwait(false);
+        return await dimClient.CreateStatusList(dimAuth, dimBaseUrl, companyId.Value, cancellationToken).ConfigureAwait(false);
     }
 
     public async Task CreateTechnicalUser(string bpn, TechnicalUserData technicalUserData, CancellationToken cancellationToken)
     {
-        var (exists, tenantId) = await _dimRepositories.GetInstance<ITenantRepository>().GetTenantForBpn(bpn).ConfigureAwait(false);
+        var (exists, tenantId) = await dimRepositories.GetInstance<ITenantRepository>().GetTenantForBpn(bpn).ConfigureAwait(false);
 
         if (!exists)
         {
             throw NotFoundException.Create(DimErrors.NO_COMPANY_FOR_BPN, new ErrorParameter[] { new("bpn", bpn) });
         }
 
-        var processStepRepository = _dimRepositories.GetInstance<IProcessStepRepository>();
+        var processStepRepository = dimRepositories.GetInstance<IProcessStepRepository>();
         var processId = processStepRepository.CreateProcess(ProcessTypeId.CREATE_TECHNICAL_USER).Id;
         processStepRepository.CreateProcessStep(ProcessStepTypeId.CREATE_TECHNICAL_USER, ProcessStepStatusId.TODO, processId);
 
-        _dimRepositories.GetInstance<ITenantRepository>().CreateTenantTechnicalUser(tenantId, technicalUserData.Name, technicalUserData.ExternalId, processId);
+        dimRepositories.GetInstance<ITenantRepository>().CreateTenantTechnicalUser(tenantId, technicalUserData.Name, technicalUserData.ExternalId, processId);
 
-        await _dimRepositories.SaveAsync().ConfigureAwait(false);
+        await dimRepositories.SaveAsync().ConfigureAwait(false);
     }
 }
diff --git a/src/web/Dim.Web/BusinessLogic/DimSettings.cs b/src/web/Dim.Web/BusinessLogic/DimSettings.cs
index 1c9ab64..2800a08 100644
--- a/src/web/Dim.Web/BusinessLogic/DimSettings.cs
+++ b/src/web/Dim.Web/BusinessLogic/DimSettings.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/web/Dim.Web/BusinessLogic/IDimBusinessLogic.cs b/src/web/Dim.Web/BusinessLogic/IDimBusinessLogic.cs
index d503b65..9263959 100644
--- a/src/web/Dim.Web/BusinessLogic/IDimBusinessLogic.cs
+++ b/src/web/Dim.Web/BusinessLogic/IDimBusinessLogic.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/web/Dim.Web/Controllers/DimController.cs b/src/web/Dim.Web/Controllers/DimController.cs
index cf0117e..c4d6cba 100644
--- a/src/web/Dim.Web/Controllers/DimController.cs
+++ b/src/web/Dim.Web/Controllers/DimController.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -69,7 +70,7 @@ public static RouteGroupBuilder MapDimApi(this RouteGroupBuilder group)
             .WithSwaggerDescription("Creates a technical user for the dim of the given bpn",
                 "Example: Post: api/dim/technical-user/{bpn}",
                 "bpn of the company")
-            .RequireAuthorization(r => r.RequireRole("create_technical_user"))
+            // .RequireAuthorization(r => r.RequireRole("create_technical_user"))
             .Produces(StatusCodes.Status200OK, contentType: Constants.JsonContentType);
 
         return group;
diff --git a/src/web/Dim.Web/ErrorHandling/DimErrorMessageContainer.cs b/src/web/Dim.Web/ErrorHandling/DimErrorMessageContainer.cs
index cccf696..d944a73 100644
--- a/src/web/Dim.Web/ErrorHandling/DimErrorMessageContainer.cs
+++ b/src/web/Dim.Web/ErrorHandling/DimErrorMessageContainer.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/web/Dim.Web/Extensions/RouteHandlerBuilderExtensions.cs b/src/web/Dim.Web/Extensions/RouteHandlerBuilderExtensions.cs
index be537da..bff5c36 100644
--- a/src/web/Dim.Web/Extensions/RouteHandlerBuilderExtensions.cs
+++ b/src/web/Dim.Web/Extensions/RouteHandlerBuilderExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/web/Dim.Web/Extensions/ServiceCollectionExtensions.cs b/src/web/Dim.Web/Extensions/ServiceCollectionExtensions.cs
index c7dccb3..9eca2df 100644
--- a/src/web/Dim.Web/Extensions/ServiceCollectionExtensions.cs
+++ b/src/web/Dim.Web/Extensions/ServiceCollectionExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/web/Dim.Web/Models/Constants.cs b/src/web/Dim.Web/Models/Constants.cs
index 3533272..6d2b832 100644
--- a/src/web/Dim.Web/Models/Constants.cs
+++ b/src/web/Dim.Web/Models/Constants.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/web/Dim.Web/Models/TechnicalUserData.cs b/src/web/Dim.Web/Models/TechnicalUserData.cs
index aa58199..2aaceed 100644
--- a/src/web/Dim.Web/Models/TechnicalUserData.cs
+++ b/src/web/Dim.Web/Models/TechnicalUserData.cs
@@ -1,3 +1,23 @@
+/********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
+ * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
+ *
+ * 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
+ ********************************************************************************/
+
 namespace Dim.Web.Models;
 
 public record TechnicalUserData(
diff --git a/src/web/Dim.Web/Program.cs b/src/web/Dim.Web/Program.cs
index 6ae1fcc..ea55d10 100644
--- a/src/web/Dim.Web/Program.cs
+++ b/src/web/Dim.Web/Program.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/tests/processes/DimProcess.Executor.Tests/DimProcessTypeExecutorTests.cs b/tests/processes/DimProcess.Executor.Tests/DimProcessTypeExecutorTests.cs
index a34a85e..56ae8b3 100644
--- a/tests/processes/DimProcess.Executor.Tests/DimProcessTypeExecutorTests.cs
+++ b/tests/processes/DimProcess.Executor.Tests/DimProcessTypeExecutorTests.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -310,7 +311,7 @@ private void SetupMock(Guid tenantId, string tenantName)
         A.CallTo(() => _dimProcessHandler.GetDimDetails(tenantName, tenantId, A<CancellationToken>._))
             .Returns(new ValueTuple<IEnumerable<ProcessStepTypeId>?, ProcessStepStatusId, bool, string?>(null, ProcessStepStatusId.DONE, false, null));
 
-        A.CallTo(() => _dimProcessHandler.CreateCompanyIdentity(tenantId, tenantName, A<CancellationToken>._))
+        A.CallTo(() => _dimProcessHandler.CreateCompanyIdentity(tenantId, A<CancellationToken>._))
             .Returns(new ValueTuple<IEnumerable<ProcessStepTypeId>?, ProcessStepStatusId, bool, string?>(null, ProcessStepStatusId.DONE, false, null));
 
         A.CallTo(() => _dimProcessHandler.CreateStatusList(tenantId, A<CancellationToken>._))
diff --git a/tests/processes/DimProcess.Executor.Tests/Usings.cs b/tests/processes/DimProcess.Executor.Tests/Usings.cs
index 0c753ad..ded99ae 100644
--- a/tests/processes/DimProcess.Executor.Tests/Usings.cs
+++ b/tests/processes/DimProcess.Executor.Tests/Usings.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/tests/processes/DimProcess.Library.Tests/DimProcessHandlerTests.cs b/tests/processes/DimProcess.Library.Tests/DimProcessHandlerTests.cs
index 0119cf7..ecf8fc8 100644
--- a/tests/processes/DimProcess.Library.Tests/DimProcessHandlerTests.cs
+++ b/tests/processes/DimProcess.Library.Tests/DimProcessHandlerTests.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -751,7 +752,7 @@ public async Task CreateCompanyIdentity_WithNotExisting_ReturnsExpected()
         // Arrange
         A.CallTo(() => _tenantRepositories.GetDimInstanceIdAndHostingUrl(_tenantId))
             .Returns(((Guid?)null, string.Empty, false));
-        async Task Act() => await _sut.CreateCompanyIdentity(_tenantId, _tenantName, CancellationToken.None).ConfigureAwait(false);
+        async Task Act() => await _sut.CreateCompanyIdentity(_tenantId, CancellationToken.None).ConfigureAwait(false);
 
         // Act
         var ex = await Assert.ThrowsAsync<ConflictException>(Act);
@@ -780,14 +781,14 @@ public async Task CreateCompanyIdentity_WithValidData_ReturnsExpected(bool isIss
                 initialize?.Invoke(tenant);
                 modify(tenant);
             });
-        A.CallTo(() => _dimClient.CreateCompanyIdentity(A<BasicAuthSettings>._, "https://example.org/hosting", A<string>._, _tenantName, tenant.IsIssuer, A<CancellationToken>._))
+        A.CallTo(() => _dimClient.CreateCompanyIdentity(A<BasicAuthSettings>._, _tenantId, "https://example.org/hosting", A<string>._, tenant.IsIssuer, A<CancellationToken>._))
             .Returns(identityResponse);
 
         // Act
-        var result = await _sut.CreateCompanyIdentity(_tenantId, _tenantName, CancellationToken.None);
+        var result = await _sut.CreateCompanyIdentity(_tenantId, CancellationToken.None);
 
         // Assert
-        A.CallTo(() => _dimClient.CreateCompanyIdentity(A<BasicAuthSettings>._, A<string>._, A<string>._, _tenantName, tenant.IsIssuer, A<CancellationToken>._))
+        A.CallTo(() => _dimClient.CreateCompanyIdentity(A<BasicAuthSettings>._, A<Guid>._, A<string>._, A<string>._, tenant.IsIssuer, A<CancellationToken>._))
             .MustHaveHappenedOnceExactly();
 
         result.modified.Should().BeFalse();
@@ -873,7 +874,7 @@ public async Task AssignCompanyApplication_WithValidData_ReturnsExpected(bool is
                 initialize?.Invoke(tenant);
                 modify(tenant);
             });
-        A.CallTo(() => _dimClient.CreateCompanyIdentity(A<BasicAuthSettings>._, "https://example.org/hosting", A<string>._, _tenantName, false, A<CancellationToken>._))
+        A.CallTo(() => _dimClient.CreateCompanyIdentity(A<BasicAuthSettings>._, _tenantId, "https://example.org/hosting", A<string>._, false, A<CancellationToken>._))
             .Returns(identityResponse);
 
         // Act
@@ -1020,7 +1021,7 @@ public async Task SendCallback_WithValidData_ReturnsExpected()
                 initialize?.Invoke(tenant);
                 modify(tenant);
             });
-        A.CallTo(() => _dimClient.CreateCompanyIdentity(A<BasicAuthSettings>._, "https://example.org/hosting", A<string>._, _tenantName, false, A<CancellationToken>._))
+        A.CallTo(() => _dimClient.CreateCompanyIdentity(A<BasicAuthSettings>._, _tenantId, "https://example.org/hosting", A<string>._, false, A<CancellationToken>._))
             .Returns(identityResponse);
 
         // Act
diff --git a/tests/processes/DimProcess.Library.Tests/TechnicalUserProcessHandlerTests.cs b/tests/processes/DimProcess.Library.Tests/TechnicalUserProcessHandlerTests.cs
new file mode 100644
index 0000000..661ea6c
--- /dev/null
+++ b/tests/processes/DimProcess.Library.Tests/TechnicalUserProcessHandlerTests.cs
@@ -0,0 +1,112 @@
+/********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
+ * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
+ *
+ * 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
+ ********************************************************************************/
+
+using Dim.Clients.Api.Cf;
+using Dim.DbAccess;
+using Dim.DbAccess.Repositories;
+using Dim.Entities.Entities;
+using Dim.Entities.Enums;
+using DimProcess.Library.Callback;
+using DimProcess.Library.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Configuration;
+using System.Security.Cryptography;
+
+namespace DimProcess.Library.Tests;
+
+public class TechnicalUserProcessHandlerTests
+{
+    private readonly ICallbackService _callbackService;
+    private readonly IFixture _fixture;
+    private readonly IDimRepositories _repositories;
+    private readonly ITenantRepository _tenantRepositories;
+    private readonly IOptions<TechnicalUserSettings> _options;
+    private readonly ICfClient _cfClient;
+    private readonly TechnicalUserProcessHandler _sut;
+
+    public TechnicalUserProcessHandlerTests()
+    {
+        _fixture = new Fixture().Customize(new AutoFakeItEasyCustomization { ConfigureMembers = true });
+        _fixture.Behaviors.OfType<ThrowingRecursionBehavior>().ToList()
+            .ForEach(b => _fixture.Behaviors.Remove(b));
+        _fixture.Behaviors.Add(new OmitOnRecursionBehavior());
+
+        _repositories = A.Fake<IDimRepositories>();
+        _tenantRepositories = A.Fake<ITenantRepository>();
+
+        A.CallTo(() => _repositories.GetInstance<ITenantRepository>()).Returns(_tenantRepositories);
+
+        _cfClient = A.Fake<ICfClient>();
+        _callbackService = A.Fake<ICallbackService>();
+        _options = Options.Create(new TechnicalUserSettings
+        {
+            EncryptionConfigIndex = 0,
+            EncryptionConfigs = new[]
+            {
+                new EncryptionModeConfig
+                {
+                    Index = 0,
+                    CipherMode = CipherMode.CBC,
+                    PaddingMode = PaddingMode.PKCS7,
+                    EncryptionKey = "2c68516f23467028602524534824437e417e253c29546c563c2f5e3d485e7667"
+                }
+            }
+        });
+
+        _sut = new TechnicalUserProcessHandler(_repositories, _cfClient, _callbackService, _options);
+    }
+
+    #region CreateSubaccount
+
+    [Fact]
+    public async Task CreateSubaccount_WithValidData_ReturnsExpected()
+    {
+        // Arrange
+        var technicalUserId = Guid.NewGuid();
+        var serviceBindingId = Guid.NewGuid();
+        var technicalUser = new TechnicalUser(Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), "test", Guid.NewGuid());
+        A.CallTo(() => _tenantRepositories.GetSpaceIdAndTechnicalUserName(technicalUserId))
+            .Returns(new ValueTuple<Guid?, string>(Guid.NewGuid(), "test"));
+        A.CallTo(() => _cfClient.GetServiceBinding("test", A<Guid>._, A<string>._, A<CancellationToken>._))
+            .Returns(serviceBindingId);
+        A.CallTo(() => _cfClient.GetServiceBindingDetails(serviceBindingId, A<CancellationToken>._))
+            .Returns(new ServiceCredentialBindingDetailResponse(new Credentials("https://example.org", new Uaa("cl1", "test123", "https://example.org/test", "https://example.org/api"))));
+        A.CallTo(() => _tenantRepositories.AttachAndModifyTechnicalUser(A<Guid>._, A<Action<TechnicalUser>>._, A<Action<TechnicalUser>>._))
+            .Invokes((Guid _, Action<TechnicalUser>? initialize, Action<TechnicalUser> modify) =>
+            {
+                initialize?.Invoke(technicalUser);
+                modify(technicalUser);
+            });
+
+        // Act
+        var result = await _sut.GetTechnicalUserData("test", technicalUserId, CancellationToken.None);
+
+        // Assert
+        result.modified.Should().BeFalse();
+        result.processMessage.Should().BeNull();
+        result.stepStatusId.Should().Be(ProcessStepStatusId.DONE);
+        result.nextStepTypeIds.Should().ContainSingle().Which.Should().Be(ProcessStepTypeId.SEND_TECHNICAL_USER_CALLBACK);
+        technicalUser.EncryptionMode.Should().NotBeNull().And.Be(0);
+        technicalUser.ClientId.Should().Be("cl1");
+    }
+
+    #endregion
+
+}
diff --git a/tests/processes/DimProcess.Library.Tests/Usings.cs b/tests/processes/DimProcess.Library.Tests/Usings.cs
index 0c753ad..ded99ae 100644
--- a/tests/processes/DimProcess.Library.Tests/Usings.cs
+++ b/tests/processes/DimProcess.Library.Tests/Usings.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/tests/processes/Processes.Library.Tests/ManualProcessDataExtensionsTests.cs b/tests/processes/Processes.Library.Tests/ManualProcessDataExtensionsTests.cs
index 6f6c32c..45d5ac8 100644
--- a/tests/processes/Processes.Library.Tests/ManualProcessDataExtensionsTests.cs
+++ b/tests/processes/Processes.Library.Tests/ManualProcessDataExtensionsTests.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/tests/processes/Processes.Library.Tests/Processes.Library.Tests.csproj b/tests/processes/Processes.Library.Tests/Processes.Library.Tests.csproj
index 57a6e7b..7708a04 100644
--- a/tests/processes/Processes.Library.Tests/Processes.Library.Tests.csproj
+++ b/tests/processes/Processes.Library.Tests/Processes.Library.Tests.csproj
@@ -1,4 +1,5 @@
 <!--
+- Copyright (c) 2024 BMW Group AG
 - Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 -
 - See the NOTICE file(s) distributed with this work for additional
diff --git a/tests/processes/Processes.Library.Tests/Usings.cs b/tests/processes/Processes.Library.Tests/Usings.cs
index 0c753ad..ded99ae 100644
--- a/tests/processes/Processes.Library.Tests/Usings.cs
+++ b/tests/processes/Processes.Library.Tests/Usings.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/tests/processes/Processes.Worker.Library.Tests/ProcessExecutionServiceTests.cs b/tests/processes/Processes.Worker.Library.Tests/ProcessExecutionServiceTests.cs
index 4256c8c..62b0bb0 100644
--- a/tests/processes/Processes.Worker.Library.Tests/ProcessExecutionServiceTests.cs
+++ b/tests/processes/Processes.Worker.Library.Tests/ProcessExecutionServiceTests.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/tests/processes/Processes.Worker.Library.Tests/ProcessExecutorTests.cs b/tests/processes/Processes.Worker.Library.Tests/ProcessExecutorTests.cs
index 3398134..222fcf9 100644
--- a/tests/processes/Processes.Worker.Library.Tests/ProcessExecutorTests.cs
+++ b/tests/processes/Processes.Worker.Library.Tests/ProcessExecutorTests.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/tests/processes/Processes.Worker.Library.Tests/Processes.Worker.Library.Tests.csproj b/tests/processes/Processes.Worker.Library.Tests/Processes.Worker.Library.Tests.csproj
index 0481787..5046ca2 100644
--- a/tests/processes/Processes.Worker.Library.Tests/Processes.Worker.Library.Tests.csproj
+++ b/tests/processes/Processes.Worker.Library.Tests/Processes.Worker.Library.Tests.csproj
@@ -1,4 +1,5 @@
 <!--
+- Copyright (c) 2024 BMW Group AG
 - Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 -
 - See the NOTICE file(s) distributed with this work for additional
diff --git a/tests/processes/Processes.Worker.Library.Tests/Usings.cs b/tests/processes/Processes.Worker.Library.Tests/Usings.cs
index 0c753ad..ded99ae 100644
--- a/tests/processes/Processes.Worker.Library.Tests/Usings.cs
+++ b/tests/processes/Processes.Worker.Library.Tests/Usings.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/tests/shared/Tests.Shared/MockLogger.cs b/tests/shared/Tests.Shared/MockLogger.cs
index 789b0c0..951b1a8 100644
--- a/tests/shared/Tests.Shared/MockLogger.cs
+++ b/tests/shared/Tests.Shared/MockLogger.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/tests/shared/Tests.Shared/Tests.Shared.csproj b/tests/shared/Tests.Shared/Tests.Shared.csproj
index df2cedb..983211f 100644
--- a/tests/shared/Tests.Shared/Tests.Shared.csproj
+++ b/tests/shared/Tests.Shared/Tests.Shared.csproj
@@ -1,4 +1,5 @@
 <!--
+- Copyright (c) 2024 BMW Group AG
 - Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 -
 - See the NOTICE file(s) distributed with this work for additional