diff --git a/charts/irs-environments/dev/Chart.yaml b/charts/irs-environments/dev/Chart.yaml
index 77024b360b..09ae28edbb 100644
--- a/charts/irs-environments/dev/Chart.yaml
+++ b/charts/irs-environments/dev/Chart.yaml
@@ -19,7 +19,7 @@ version: 1.0.6
 dependencies:
   - name: irs-helm
     repository: https://eclipse-tractusx.github.io/item-relationship-service
-    version: 6.13.0
+    version: 6.14.0
   - name: tractusx-connector
     repository: https://eclipse-tractusx.github.io/tractusx-edc
     version: 0.5.3
diff --git a/charts/irs-environments/dev/values.yaml b/charts/irs-environments/dev/values.yaml
index 0a32ecf1a2..3bac62c52d 100644
--- a/charts/irs-environments/dev/values.yaml
+++ b/charts/irs-environments/dev/values.yaml
@@ -35,9 +35,11 @@ irs-helm:
           controlPlane3: http://irs-provider3-tractusx-connector-controlplane:8080/api/check/liveness
   digitalTwinRegistry:
     url: https://irs-aas-registry.dev.demo.catena-x.net/semantics/registry/api/v3.0
-    discoveryFinderUrl: https://discovery-mock.dev.demo.catena-x.net/api/administration/connectors/discovery/search
     shellDescriptorTemplate: /shell-descriptors/{aasIdentifier}
     lookupShellsTemplate: /lookup/shells?assetIds={assetIds}
+  discovery:
+    discoveryFinderUrl: https://discovery-mock.dev.demo.catena-x.net/api/administration/connectors/discovery/search
+
   semanticshub:
     url: https://semantics.int.demo.catena-x.net/hub/api/v1/models
   bpdm:
@@ -45,9 +47,16 @@ irs-helm:
   minioUser: <path:traceability-irs/data/dev/minio#minioUser>
   minioPassword: <path:traceability-irs/data/dev/minio#minioPassword>
   oauth2:
-    clientId: <path:traceability-irs/data/dev/oauth2#clientId>
-    clientSecret: <path:traceability-irs/data/dev/oauth2#clientSecret>
     clientTokenUri: <path:traceability-irs/data/dev/oauth2#tokenUri>
+    semantics:
+      clientId: <path:traceability-irs/data/oauth2/semantics#clientId>
+      clientSecret: <path:traceability-irs/data/oauth2/semantics#clientSecret>
+    discovery:
+      clientId: <path:traceability-irs/data/oauth2/discovery#clientId>
+      clientSecret: <path:traceability-irs/data/oauth2/discovery#clientSecret>
+    bpdm:
+      clientId: <path:traceability-irs/data/oauth2/bpdm#clientId>
+      clientSecret: <path:traceability-irs/data/oauth2/bpdm#clientSecret>
   edc:
     submodel:
       request:
diff --git a/charts/irs-environments/dil/Chart.yaml b/charts/irs-environments/dil/Chart.yaml
index 41c8688839..77c441fd27 100644
--- a/charts/irs-environments/dil/Chart.yaml
+++ b/charts/irs-environments/dil/Chart.yaml
@@ -19,7 +19,7 @@ version: 1.0.6
 dependencies:
   - name: irs-helm
     repository: https://eclipse-tractusx.github.io/item-relationship-service
-    version: 6.13.0
+    version: 6.14.0
   - name: tractusx-connector
     repository: https://eclipse-tractusx.github.io/tractusx-edc
     version: 0.5.3
diff --git a/charts/irs-environments/dil/values.yaml b/charts/irs-environments/dil/values.yaml
index 806933b7ae..5c584aee5b 100644
--- a/charts/irs-environments/dil/values.yaml
+++ b/charts/irs-environments/dil/values.yaml
@@ -26,9 +26,16 @@ irs-helm:
   minioUser: <path:traceability-irs/data/dev/minio#minioUser>
   minioPassword: <path:traceability-irs/data/dev/minio#minioPassword>
   oauth2:
-    clientId: <path:traceability-irs/data/dil/oauth2#clientId>
-    clientSecret: <path:traceability-irs/data/dil/oauth2#clientSecret>
     clientTokenUri: <path:traceability-irs/data/dil/oauth2#tokenUri>
+    semantics:
+      clientId: <path:traceability-irs/data/oauth2/semantics#clientId>
+      clientSecret: <path:traceability-irs/data/oauth2/semantics#clientSecret>
+    discovery:
+      clientId: <path:traceability-irs/data/oauth2/discovery#clientId>
+      clientSecret: <path:traceability-irs/data/oauth2/discovery#clientSecret>
+    bpdm:
+      clientId: <path:traceability-irs/data/oauth2/bpdm#clientId>
+      clientSecret: <path:traceability-irs/data/oauth2/bpdm#clientSecret>
   edc:
     controlplane:
       apikey:
@@ -79,10 +86,11 @@ irs-helm:
       digitalTwinRegistry:
         descriptorEndpoint: "https://irs-aas-registry.dev.demo.catena-x.net/semantics/registry/api/v3.0/shell-descriptors/{aasIdentifier}"
         shellLookupEndpoint: "https://irs-aas-registry.dev.demo.catena-x.net/semantics/registry/api/v3.0/lookup/shells?assetIds={assetIds}"
-        discoveryFinderUrl: "https://discovery-mock.dev.demo.catena-x.net/api/administration/connectors/discovery/search"
         shellDescriptorTemplate: "/shell-descriptors/{aasIdentifier}"
         lookupShellsTemplate: "/lookup/shells?assetIds={assetIds}"
         type: "decentral"
+        discovery:
+          discoveryFinderUrl: "https://discovery-mock.dev.demo.catena-x.net/api/administration/connectors/discovery/search"
 
       semanticshub:
         url: "https://semantics.int.demo.catena-x.net/hub/api/v1/models"
diff --git a/charts/irs-environments/ess/Chart.yaml b/charts/irs-environments/ess/Chart.yaml
index 28784a2395..3b2db1dee9 100644
--- a/charts/irs-environments/ess/Chart.yaml
+++ b/charts/irs-environments/ess/Chart.yaml
@@ -19,7 +19,7 @@ version: 1.0.0
 dependencies:
   - name: irs-helm
     repository: https://eclipse-tractusx.github.io/item-relationship-service
-    version: 6.13.0
+    version: 6.14.0
   - name: tractusx-connector
     repository: https://eclipse-tractusx.github.io/tractusx-edc
     version: 0.5.3
diff --git a/charts/irs-environments/ess/values.yaml b/charts/irs-environments/ess/values.yaml
index 12329a6d05..eea2afeb94 100644
--- a/charts/irs-environments/ess/values.yaml
+++ b/charts/irs-environments/ess/values.yaml
@@ -24,9 +24,10 @@ irs-helm:
         secretName: tls-secret
   digitalTwinRegistry:
     url: https://irs-aas-registry-ess.int.demo.catena-x.net/semantics/registry
-    discoveryFinderUrl: https://irs-ess-discovery-mock.int.demo.catena-x.net/api/administration/connectors/discovery/search
     shellDescriptorTemplate: /shell-descriptors/{aasIdentifier}
     lookupShellsTemplate: /lookup/shells?assetIds={assetIds}
+  discovery:
+    discoveryFinderUrl: https://irs-ess-discovery-mock.int.demo.catena-x.net/api/administration/connectors/discovery/search
   semanticshub:
     url: https://semantics.int.demo.catena-x.net/hub/api/v1/models
     pageSize: "200"
@@ -35,13 +36,16 @@ irs-helm:
   minioUser: <path:traceability-irs/data/int/minio#minioUser>
   minioPassword: <path:traceability-irs/data/int/minio#minioPassword>
   oauth2:
-    clientId: <path:traceability-irs/data/int/oauth2#clientId>
-    clientSecret: <path:traceability-irs/data/int/oauth2#clientSecret>
     clientTokenUri: <path:traceability-irs/data/int/oauth2#tokenUri>
-  portal:
-    oauth2:
-      clientId: <path:traceability-irs/data/int/dataspacediscovery#clientId>
-      clientSecret: <path:traceability-irs/data/int/dataspacediscovery#clientSecret>
+    semantics:
+      clientId: <path:traceability-irs/data/oauth2/semantics#clientId>
+      clientSecret: <path:traceability-irs/data/oauth2/semantics#clientSecret>
+    discovery:
+      clientId: <path:traceability-irs/data/oauth2/discovery#clientId>
+      clientSecret: <path:traceability-irs/data/oauth2/discovery#clientSecret>
+    bpdm:
+      clientId: <path:traceability-irs/data/oauth2/bpdm#clientId>
+      clientSecret: <path:traceability-irs/data/oauth2/bpdm#clientSecret>
   ess:
     edc:
       host: "https://irs-ess-provider-controlplane.int.demo.catena-x.net"
diff --git a/charts/irs-environments/int/Chart.yaml b/charts/irs-environments/int/Chart.yaml
index 969f3d2867..84de26bf02 100644
--- a/charts/irs-environments/int/Chart.yaml
+++ b/charts/irs-environments/int/Chart.yaml
@@ -19,7 +19,7 @@ version: 1.0.4
 dependencies:
   - name: irs-helm
     repository: https://eclipse-tractusx.github.io/item-relationship-service
-    version: 6.13.0
+    version: 6.14.0
   - name: tractusx-connector
     repository: https://eclipse-tractusx.github.io/tractusx-edc
     version: 0.5.3
diff --git a/charts/irs-environments/int/values.yaml b/charts/irs-environments/int/values.yaml
index 40f73b4aa0..8f7d13ec98 100644
--- a/charts/irs-environments/int/values.yaml
+++ b/charts/irs-environments/int/values.yaml
@@ -24,9 +24,10 @@ irs-helm:
         secretName: tls-secret
   digitalTwinRegistry:
     url: https://semantics.int.demo.catena-x.net/registry
-    discoveryFinderUrl: https://semantics.int.demo.catena-x.net/discoveryfinder/api/v1.0/administration/connectors/discovery/search
     shellDescriptorTemplate: /shell-descriptors/{aasIdentifier}
     lookupShellsTemplate: /lookup/shells?assetIds={assetIds}
+  discovery:
+    discoveryFinderUrl: https://semantics.int.demo.catena-x.net/discoveryfinder/api/v1.0/administration/connectors/discovery/search
   semanticshub:
     url: https://semantics.int.demo.catena-x.net/hub/api/v1/models
     pageSize: "200"
@@ -35,14 +36,16 @@ irs-helm:
   minioUser: <path:traceability-irs/data/int/minio#minioUser>
   minioPassword: <path:traceability-irs/data/int/minio#minioPassword>
   oauth2:
-    clientId: <path:traceability-irs/data/int/oauth2#clientId>
-    clientSecret: <path:traceability-irs/data/int/oauth2#clientSecret>
     clientTokenUri: <path:traceability-irs/data/int/oauth2#tokenUri>
-    jwkSetUri: <path:traceability-irs/data/int/oauth2#jwkSetUri>
-  portal:
-    oauth2:
-      clientId: <path:traceability-irs/data/int/dataspacediscovery#clientId>
-      clientSecret: <path:traceability-irs/data/int/dataspacediscovery#clientSecret>
+    semantics:
+      clientId: <path:traceability-irs/data/oauth2/semantics#clientId>
+      clientSecret: <path:traceability-irs/data/oauth2/semantics#clientSecret>
+    discovery:
+      clientId: <path:traceability-irs/data/oauth2/discovery#clientId>
+      clientSecret: <path:traceability-irs/data/oauth2/discovery#clientSecret>
+    bpdm:
+      clientId: <path:traceability-irs/data/oauth2/bpdm#clientId>
+      clientSecret: <path:traceability-irs/data/oauth2/bpdm#clientSecret>
   edc:
     submodel:
       request: