diff --git a/AUTHORS.md b/AUTHORS.md
index 202f3bb2..6d971999 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -5,4 +5,5 @@ The following people have contributed to this repository:
 * Aditya Kumar, T-Systems International GmbH, https://github.com/adkumar1
 * Dmitrii Vasiunin, T-Systems International GmbH, https://github.com/dvasunin
 * Amol Dashwant, T-Systems International GmbH, https://github.com/amoldashwant
-* Fedor Nazarov,, T-Systems International GmbH,  https://github.com/Wulghash
+* Fedor Nazarov, T-Systems International GmbH,  https://github.com/Wulghash
+* Chetan Parate, T-Systems International GmbH, https://github.com/ChetanT-System
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b94bc93e..a775cdc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,9 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
-## [Unreleased]
+## [2.1.15] - 2025-02-12
+- Added support for tagus-x compliance.
+- Added changes to support v2 version of clearing house.
 
 ## [2.1.14] - 2024-11-14
 ### Fixed
diff --git a/DEPENDENCIES b/DEPENDENCIES
index 47aad3a7..9432dc4c 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -1,8 +1,8 @@
 maven/mavencentral/ch.qos.logback/logback-classic/1.5.11, EPL-1.0 AND LGPL-2.1-only, approved, #15279
 maven/mavencentral/ch.qos.logback/logback-core/1.5.11, EPL-1.0 AND LGPL-2.1-only, approved, #15210
-maven/mavencentral/com.apicatalog/titanium-json-ld/1.1.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.danubetech/key-formats-java/1.6.0, Apache-2.0, approved, #10950
-maven/mavencentral/com.danubetech/verifiable-credentials-java/1.1.0, Apache-2.0, approved, #10953
+maven/mavencentral/com.apicatalog/titanium-json-ld/1.3.3, Apache-2.0, approved, #8912
+maven/mavencentral/com.danubetech/key-formats-java/1.15.0, Apache-2.0, approved, #19456
+maven/mavencentral/com.danubetech/verifiable-credentials-java/1.9.0, MIT, approved, #19458
 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.17.2, Apache-2.0, approved, #13672
 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.17.2, Apache-2.0 AND MIT, approved, #13665
 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.17.2, Apache-2.0, approved, #13671
@@ -11,27 +11,23 @@ maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.17.2,
 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.17.2, Apache-2.0, approved, #14160
 maven/mavencentral/com.fasterxml.jackson.module/jackson-module-parameter-names/2.17.2, Apache-2.0, approved, #15122
 maven/mavencentral/com.fasterxml/classmate/1.7.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.github.multiformats/java-multibase/v1.1.0, MIT AND BSD-3-Clause AND EPL-1.0 AND Apache-2.0, approved, #4095
+maven/mavencentral/com.github.multiformats/java-multibase/1.1.1, Apache-2.0, approved, #19457
 maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, Apache-2.0 and CC-BY-2.5, approved, #15220
 maven/mavencentral/com.google.errorprone/error_prone_annotations/2.26.1, Apache-2.0, approved, #13657
 maven/mavencentral/com.google.guava/failureaccess/1.0.2, Apache-2.0, approved, CQ22654
 maven/mavencentral/com.google.guava/guava/33.2.1-jre, Apache-2.0 AND CC0-1.0 AND (Apache-2.0 AND CC-PDDC), approved, #14607
 maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657
 maven/mavencentral/com.google.j2objc/j2objc-annotations/3.0.0, Apache-2.0, approved, #13676
-maven/mavencentral/com.google.protobuf/protobuf-javalite/4.27.5, BSD-3-Clause, approved, clearlydefined
-maven/mavencentral/com.goterl/lazysodium-java/5.1.1, MPL-2.0, approved, #10952
-maven/mavencentral/com.goterl/resource-loader/2.0.1, MIT, approved, clearlydefined
+maven/mavencentral/com.goterl/lazysodium-java/5.1.4, MPL-2.0, approved, #10952
+maven/mavencentral/com.goterl/resource-loader/2.0.2, MPL-2.0, approved, #19461
 maven/mavencentral/com.jayway.jsonpath/json-path/2.9.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.39.1, Apache-2.0, approved, #14830
-maven/mavencentral/com.squareup.okhttp3/okhttp/4.12.0, Apache-2.0, approved, #15227
-maven/mavencentral/com.squareup.okio/okio-jvm/3.6.0, Apache-2.0, approved, #11158
-maven/mavencentral/com.squareup.okio/okio/3.6.0, Apache-2.0, approved, #11155
 maven/mavencentral/com.vaadin.external.google/android-json/0.0.20131108.vaadin1, Apache-2.0, approved, CQ21310
 maven/mavencentral/commons-codec/commons-codec/1.16.1, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #9157
 maven/mavencentral/commons-fileupload/commons-fileupload/1.5, Apache-2.0, approved, #7109
 maven/mavencentral/commons-io/commons-io/2.14.0, Apache-2.0, approved, #10768
-maven/mavencentral/decentralized-identity/jsonld-common-java/1.1.0, Apache-2.0, approved, #10954
-maven/mavencentral/info.weboftrust/ld-signatures-java/1.2.0, Apache-2.0, approved, #10951
+maven/mavencentral/decentralized-identity/jsonld-common-java/1.9.0, Apache-2.0, approved, #19460
+maven/mavencentral/info.weboftrust/ld-signatures-java/1.9.0, Apache-2.0, approved, #19459
 maven/mavencentral/io.github.erdtman/java-json-canonicalization/1.1, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.github.openfeign.form/feign-form-spring/3.8.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.github.openfeign.form/feign-form/3.8.0, Apache-2.0, approved, clearlydefined
@@ -41,7 +37,7 @@ maven/mavencentral/io.micrometer/micrometer-commons/1.13.6, Apache-2.0 AND (Apac
 maven/mavencentral/io.micrometer/micrometer-core/1.13.6, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #14827
 maven/mavencentral/io.micrometer/micrometer-jakarta9/1.13.6, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.micrometer/micrometer-observation/1.13.6, Apache-2.0, approved, #14829
-maven/mavencentral/io.setl/rdf-urdna/1.1, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.setl/rdf-urdna/1.2, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.21, Apache-2.0, approved, #5947
 maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.21, Apache-2.0, approved, #5929
 maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.21, Apache-2.0, approved, #5919
@@ -54,10 +50,10 @@ maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.2, BSD-3-Clause, ap
 maven/mavencentral/junit/junit/4.13.2, EPL-2.0, approved, CQ23636
 maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.19, Apache-2.0, approved, #7164
 maven/mavencentral/net.bytebuddy/byte-buddy/1.14.19, Apache-2.0 AND BSD-3-Clause, approved, #7163
-maven/mavencentral/net.java.dev.jna/jna/5.8.0, Apache-2.0 OR LGPL-2.1-or-later, approved, CQ23217
+maven/mavencentral/net.java.dev.jna/jna/5.12.1, Apache-2.0 OR LGPL-2.1-or-later, approved, #3217
 maven/mavencentral/net.jcip/jcip-annotations/1.0, CC-BY-2.5, approved, clearlydefined
-maven/mavencentral/net.minidev/accessors-smart/2.5.1, Apache-2.0, approved, clearlydefined
-maven/mavencentral/net.minidev/json-smart/2.5.1, Apache-2.0, approved, clearlydefined
+maven/mavencentral/net.minidev/accessors-smart/2.5.1, Apache-2.0, approved, #19432
+maven/mavencentral/net.minidev/json-smart/2.5.1, Apache-2.0, approved, #19431
 maven/mavencentral/org.apache.commons/commons-lang3/3.14.0, Apache-2.0, approved, #11677
 maven/mavencentral/org.apache.logging.log4j/log4j-api/2.23.1, Apache-2.0, approved, #13368
 maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.23.1, Apache-2.0, approved, #15121
@@ -65,23 +61,19 @@ maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/10.1.31, Apache-2.0
 maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/10.1.31, Apache-2.0, approved, #6997
 maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/10.1.31, Apache-2.0, approved, #7920
 maven/mavencentral/org.apache.tomcat/tomcat-annotations-api/10.1.31, Apache-2.0, approved, #8196
-maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, #17641
 maven/mavencentral/org.assertj/assertj-core/3.25.3, Apache-2.0, approved, #12585
 maven/mavencentral/org.awaitility/awaitility/4.2.2, Apache-2.0, approved, #14178
-maven/mavencentral/org.bitcoinj/bitcoinj-core/0.16.1, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.bitcoinj/bitcoinj-core/0.16.2, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.78.1, MIT AND CC0-1.0, approved, #14433
 maven/mavencentral/org.checkerframework/checker-qual/3.42.0, MIT, approved, clearlydefined
-maven/mavencentral/org.glassfish/jakarta.json/2.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonp
+maven/mavencentral/org.glassfish/jakarta.json/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonp
 maven/mavencentral/org.hamcrest/hamcrest-core/2.2, BSD-3-Clause, approved, clearlydefined
-maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, clearlydefined
+maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, #17677
 maven/mavencentral/org.hdrhistogram/HdrHistogram/2.2.2, BSD-2-Clause AND CC0-1.0 AND CC0-1.0, approved, #14828
-maven/mavencentral/org.hibernate.validator/hibernate-validator/8.0.1.Final, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.hibernate.validator/hibernate-validator/8.0.1.Final, Apache-2.0 AND CC-PDDC, approved, #18198
 maven/mavencentral/org.jboss.logging/jboss-logging/3.5.3.Final, Apache-2.0, approved, #9471
-maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.9.25, Apache-2.0, approved, #14186
-maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.9.25, Apache-2.0, approved, #14188
-maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.9.25, Apache-2.0, approved, #14185
-maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.9.25, Apache-2.0, approved, #11827
-maven/mavencentral/org.jetbrains/annotations/13.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.json/json/20231013, LicenseRef-Public-Domain, approved, #19455
 maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.10.5, EPL-2.0, approved, #9714
 maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.10.5, EPL-2.0, approved, #9711
 maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.10.5, EPL-2.0, approved, #15250
diff --git a/README.md b/README.md
index 4a07c7df..1b795d0d 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ An example of the body for LegalParticipant is given bellow:
 {
   "type": "LegalParticipant",
   "holder": "BPNL000000000000",
-  "issuer": "CAXSDUMMYCATENAZZ", 
+  "name": "CAXSDUMMYCATENAZZ", 
   "externalId": "ID01234-123-4321",
   "registrationNumber": [
     {
@@ -89,9 +89,8 @@ An example of the body for LegalParticipant is given bellow:
       "value": "o12345678"
     }
   ],
-  "headquarterAddress.country": "DE",
-  "legalAddress.country": "DE",
-  "bpn": "BPNL000000000000"
+  "headquarterAddress.countrySubdivisionCode": "DE-BY",
+  "legalAddress.countrySubdivisionCode": "DE-NW"
 }
 ```
 
@@ -100,33 +99,53 @@ Verifiable Credentials for LegalParticipant:
 
 ```json
 {
-   "@context": [
-      "https://www.w3.org/2018/credentials/v1",
-      "https://f1c82785-5598-41c7-a083-01a8e1a80e19.mock.pstmn.io/ctxsd"
-   ],
-   "type": [
-      "VerifiableCredential"
-   ],
-   "id": "5096f9c2-24fd-43c5-9d50-e43a409ebb33",
-   "issuanceDate": "2023-07-26T17:07:31Z",
-   "expirationDate": "2023-10-24T17:07:31Z",
-   "credentialSubject": {
-      "bpn": "BPNL000000000000",
-      "registrationNumber": [
-         {
-            "type": "local",
-            "value": "o12345678"
-         }
-      ],
-      "headquarterAddress": {
-         "countryCode": "DE"
-      },
-      "type": "LegalParticipant",
-      "legalAddress": {
-         "countryCode": "DE"
-      }
-   },
-   "issuer": "CAXSDUMMYCATENAZZ"
+    "@context": "https://www.w3.org/2018/credentials/v1",
+    "type": "VerifiablePresentation",
+    "verifiableCredential": [
+        {
+            "@context": [
+                "https://www.w3.org/2018/credentials/v1",
+                "https://registry.lab.gaia-x.eu/development/api/trusted-shape-registry/v1/shapes/jsonld/trustframework#"
+            ],
+            "type": [
+                "VerifiableCredential"
+            ],
+            "id": "c4d47109-7a41-4440-a505-68ebb8239a91",
+            "issuanceDate": "2025-02-10T12:05:59Z",
+            "credentialSubject": {
+                "id": "http://catena-x.net/bpn/BPNL000000000000",
+                "type": "gx:LegalParticipant",
+                "bpn": "BPNL000000000000",
+                "gx:legalName": "Legal Participant Company Name",
+                "gx:legalRegistrationNumber": {
+                    "id": "775d0c0b-ce98-433f-a07f-f821f9501fd0"
+                },
+                "gx:headquarterAddress": {
+                    "gx:countrySubdivisionCode": "DE-BY"
+                },
+                "gx:legalAddress": {
+                    "gx:countrySubdivisionCode": "DE-NW"
+                }
+            }
+        },
+        {
+            "@context": [
+                "https://www.w3.org/2018/credentials/v1",
+                "https://w3id.org/security/suites/jws-2020/v1"
+            ],
+            "type": [
+                "VerifiableCredential"
+            ],
+            "id": "775d0c0b-ce98-433f-a07f-f821f9501fd0",
+            "issuanceDate": "2025-02-10T12:05:59Z",
+            "credentialSubject": {
+                "@context": "https://registry.lab.gaia-x.eu/development/api/trusted-shape-registry/v1/shapes/jsonld/trustframework#",
+                "type": "gx:legalRegistrationNumber",
+                "id": "http://catena-x.net/bpn/BPNL000000000000",
+                "gx:leiCode": "5299004XSA235235"
+            }
+        }
+    ]
 }
 ```
 
@@ -260,7 +279,7 @@ Distributed under the Apache 2.0 License. See [LICENSE](LICENSE) for more inform
 
 For contacting regarding the project see [CONTACT](CONTACT.md)
 
-[Pre-22.4 schema, AKA 1.06]: src/main/resources/static/SDFactoryApi-vRel3.yml
+[Pre-22.4 schema, AKA 1.06]: src/main/resources/static/SDFactoryApi-Tagus.yml
 [Trust Framework]: https://gitlab.com/gaia-x/policy-rules-committee/trust-framework
 [Trust Framework V.22.10]: https://gitlab.com/gaia-x/policy-rules-committee/trust-framework/-/tree/22.10
 
diff --git a/pom.xml b/pom.xml
index cf7279e9..8f9d0562 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /********************************************************************************
- * Copyright (c) 2022,2024 T-Systems International GmbH
- * Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022,2025 T-Systems International GmbH
+ * Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -171,7 +171,7 @@
         <dependency>
             <groupId>com.danubetech</groupId>
             <artifactId>verifiable-credentials-java</artifactId>
-            <version>1.1.0</version>
+            <version>1.9.0</version>
         </dependency>
     </dependencies>
 
@@ -326,6 +326,30 @@
                             </configOptions>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>api-tagus</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <inputSpec>${project.basedir}/src/main/resources/static/SDFactoryApi-Tagus.yml</inputSpec>
+                            <generatorName>spring</generatorName>
+                            <apiPackage>org.eclipse.tractusx.selfdescriptionfactory.api.tagus</apiPackage>
+                            <modelPackage>org.eclipse.tractusx.selfdescriptionfactory.model.tagus</modelPackage>
+                            <supportingFilesToGenerate>
+                                ApiUtil.java
+                            </supportingFilesToGenerate>
+                            <configOptions>
+                                <useSpringBoot3>true</useSpringBoot3>
+                                <useJakartaEe>true</useJakartaEe>
+                                <delegatePattern>true</delegatePattern>
+                                <openApiNullable>false</openApiNullable>
+                                <dateLibrary>java8</dateLibrary>
+                                <java8>true</java8>
+                                <useBeanValidation>true</useBeanValidation>
+                            </configOptions>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
diff --git a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/SDFactory.java b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/SDFactory.java
index f1b8b6e9..a7b27d1c 100644
--- a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/SDFactory.java
+++ b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/SDFactory.java
@@ -1,6 +1,6 @@
 /********************************************************************************
- * Copyright (c) 2022,2024 T-Systems International GmbH
- * Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022,2025 T-Systems International GmbH
+ * Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -20,27 +20,22 @@
 
 package org.eclipse.tractusx.selfdescriptionfactory;
 
-import com.danubetech.verifiablecredentials.CredentialSubject;
-import com.danubetech.verifiablecredentials.VerifiableCredential;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
+import com.danubetech.verifiablecredentials.VerifiablePresentation;
+import com.danubetech.verifiablecredentials.jsonld.VerifiableCredentialKeywords;
+import foundation.identity.jsonld.JsonLDUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.tractusx.selfdescriptionfactory.api.vrel3.ApiApiDelegate;
-import org.eclipse.tractusx.selfdescriptionfactory.model.vrel3.SelfdescriptionPostRequest;
+import org.eclipse.tractusx.selfdescriptionfactory.api.tagus.ApiApiDelegate;
+import org.eclipse.tractusx.selfdescriptionfactory.model.tagus.SelfdescriptionPostRequest;
 import org.eclipse.tractusx.selfdescriptionfactory.service.AuthChecker;
 import org.eclipse.tractusx.selfdescriptionfactory.service.clearinghouse.ClearingHouse;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-import java.net.URI;
-import java.time.Duration;
-import java.time.Instant;
 import java.util.*;
 import java.util.function.Function;
 
@@ -51,8 +46,6 @@
 @RequiredArgsConstructor
 @Slf4j
 public class SDFactory implements ApiApiDelegate, InitializingBean {
-    @Value("${app.verifiableCredentials.durationDays:90}")
-    private int duration;
 
     private final ConversionService conversionService;
     private final ClearingHouse clearingHouse;
@@ -66,18 +59,11 @@ public ResponseEntity<Void> selfdescriptionPost(SelfdescriptionPostRequest selfd
         return decoratedFunction.apply(selfdescriptionPostRequest);
     }
 
-    private ResponseEntity<Void> doWork(SelfdescriptionPostRequest selfdescriptionPostRequest) {
-        var processed = Objects.requireNonNull(conversionService.convert(selfdescriptionPostRequest, SelfDescription.class), "Converted SD-Document is null. Very strange");
-        var verifiableCredential = VerifiableCredential.builder()
-                .contexts(processed.getContexts())
-                .id(URI.create("http://example.org/" + UUID.randomUUID()))
-                .issuer(URI.create(processed.getIssuer()))
-                .issuanceDate(new Date())
-                .expirationDate(Date.from(Instant.now().plus(Duration.ofDays(duration))))
-                .credentialSubject(CredentialSubject.fromJsonObject(processed))
-                .type(processed.getType())
-                .build();
-        clearingHouse.sendToClearingHouse(verifiableCredential, processed.getExternalId());
+    private ResponseEntity<Void> doWork(org.eclipse.tractusx.selfdescriptionfactory.model.tagus.SelfdescriptionPostRequest selfdescriptionPostRequest) {
+        var selfDescription = Objects.requireNonNull(conversionService.convert(selfdescriptionPostRequest, SelfDescription.class), "Converted SD-Document is null. Very strange");
+        var presentation = VerifiablePresentation.builder().build();
+        JsonLDUtils.jsonLdAddAsJsonArray(presentation, VerifiableCredentialKeywords.JSONLD_TERM_VERIFIABLECREDENTIAL, selfDescription.getVerifiableCredentialList());
+        clearingHouse.sendToClearingHouse(presentation, selfDescription.getExternalId());
         return new ResponseEntity<>(HttpStatus.ACCEPTED);
     }
 
@@ -87,15 +73,4 @@ public void afterPropertiesSet() {
                 ? this::doWork
                 : authChecker.getAuthorizedFn(this::doWork);
     }
-
-    @Getter
-    @RequiredArgsConstructor
-    @EqualsAndHashCode(callSuper = true)
-    public static class SelfDescription extends LinkedHashMap<String, Object> {
-         private final List<URI> contexts;
-         private final String holder;
-         private final String issuer;
-         private final String externalId;
-         private final String type;
-    }
 }
diff --git a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/SelfDescription.java b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/SelfDescription.java
new file mode 100644
index 00000000..f3aea077
--- /dev/null
+++ b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/SelfDescription.java
@@ -0,0 +1,35 @@
+/********************************************************************************
+ * Copyright (c) 2025 T-Systems International GmbH
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+package org.eclipse.tractusx.selfdescriptionfactory;
+
+import com.danubetech.verifiablecredentials.VerifiableCredential;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@RequiredArgsConstructor
+public class SelfDescription {
+    private final String externalId;
+    private final List<VerifiableCredential> verifiableCredentialList = new ArrayList<>();
+}
diff --git a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/Utils.java b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/Utils.java
index cae01c5d..d672e709 100644
--- a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/Utils.java
+++ b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/Utils.java
@@ -1,6 +1,6 @@
 /********************************************************************************
- * Copyright (c) 2022,2023 T-Systems International GmbH
- * Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022,2025 T-Systems International GmbH
+ * Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -20,6 +20,7 @@
 
 package org.eclipse.tractusx.selfdescriptionfactory;
 
+import com.danubetech.verifiablecredentials.VerifiableCredential;
 import io.vavr.control.Try;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
@@ -29,12 +30,11 @@
 import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static io.vavr.control.Try.failure;
 
@@ -82,4 +82,49 @@ public static <T> Optional<List<T>> getNonEmptyListFromCommaSeparated(String sou
                         .map(transform).toList()
         ).filter(Predicate.not(Collection::isEmpty));
     }
+
+    /**
+     * Creates a map from the given key-value pairs.
+     *
+     * @param args An array of key-value pairs.
+     * @return A map containing the key-value pairs.
+     * @throws IllegalArgumentException If an odd number of arguments is provided.
+     */
+    public static Map<String, Object> mapOf(Object ... args) {
+        // Check if the number of arguments is even
+        if (args.length % 2 != 0) {
+            throw new IllegalArgumentException("Odd number of arguments in mapOf");
+        }
+
+        // Create a list to store key-value pairs
+        var pairList = new ArrayList<>(2);
+
+        // Stream the arguments and create a map
+        return Arrays.stream(args)
+                .flatMap(o -> {
+                    pairList.add(o);
+                    if (pairList.size() == 2) {
+                        var entry = Map.entry(pairList.get(0).toString(), pairList.get(1));
+                        pairList.clear();
+                        return Stream.of(entry);
+                    } else {
+                        return Stream.empty();
+                    }
+                })
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+    }
+
+    public static List<VerifiableCredential> getAttachmentVc(List<Object> attachments, int redirects) throws IOException, TooManyRedirectsException {
+        var result = new ArrayList<VerifiableCredential>();
+        for (Object attachment : Optional.ofNullable(attachments).orElse(Collections.emptyList())){
+            if (attachment instanceof String uriStr) {
+                var connection = getConnectionIfRedirected(URI.create(uriStr).toURL(), redirects);
+                result.add(VerifiableCredential.fromJson(new String(connection.getInputStream().readAllBytes())));
+            } else {
+                //noinspection unchecked
+                result.add(VerifiableCredential.fromMap((Map<String, Object>) attachment));
+            }
+        }
+        return result;
+    }
 }
diff --git a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/config/DefaultFeignConfig.java b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/config/DefaultFeignConfig.java
index 1f62678a..070f5e5a 100644
--- a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/config/DefaultFeignConfig.java
+++ b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/config/DefaultFeignConfig.java
@@ -1,6 +1,6 @@
 /********************************************************************************
- * Copyright (c) 2022,2024 T-Systems International GmbH
- * Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022,2025 T-Systems International GmbH
+ * Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -33,6 +33,7 @@
 import org.springframework.web.server.ResponseStatusException;
 
 import java.io.StringReader;
+import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Optional;
@@ -57,8 +58,8 @@ public RequestInterceptor getRequestInterceptor(KeycloakManager keycloakManager,
     @Bean
     public ErrorDecoder getErrorDecoder(ObjectMapper mapper) {
         return (methodKey, response) -> {
-            String contentType = response.headers().get("Content-Type").stream()
-                    .findFirst()
+            String contentType = response.headers().getOrDefault("Content-Type", List.of("Unknown"))
+                    .stream().findFirst()
                     .orElse("Unknown");
             var responseStr = Try.of(() -> response.body().asInputStream().readAllBytes()).map(bytes -> new String(bytes, response.charset())).getOrElse("");
             var msg = (contentType.contains("json") ? Try.success(new StringReader(responseStr)) : Try.<StringReader>failure(new NoSuchElementException()))
diff --git a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/clearinghouse/ClearingHouse.java b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/clearinghouse/ClearingHouse.java
index da8b1fd2..bf6539b8 100644
--- a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/clearinghouse/ClearingHouse.java
+++ b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/clearinghouse/ClearingHouse.java
@@ -1,6 +1,6 @@
 /********************************************************************************
- * Copyright (c) 2022,2024 T-Systems International GmbH
- * Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022,2025 T-Systems International GmbH
+ * Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -20,9 +20,10 @@
 
 package org.eclipse.tractusx.selfdescriptionfactory.service.clearinghouse;
 
-import com.danubetech.verifiablecredentials.VerifiableCredential;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import foundation.identity.jsonld.JsonLDObject;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -45,16 +46,21 @@ public class ClearingHouse implements InitializingBean {
     private final ObjectMapper objectMapper = new ObjectMapper();
     private final Environment environment;
 
-    public void sendToClearingHouse(VerifiableCredential payload, String externalId) {
+    public void sendToClearingHouse(JsonLDObject payload, String externalId) {
+        ObjectNode payloadObject = objectMapper.convertValue(payload, ObjectNode.class);
+        payloadObject.put("@context", payloadObject.get("@context").get(0).asText());
+        payloadObject.put("type", payloadObject.get("type").get(0).asText());
+
         if (log.isDebugEnabled()) {
-            debug(payload,  externalId);
+            debug(payloadObject,  externalId);
         }
         if (!Arrays.asList(environment.getActiveProfiles()).contains("test")) {
-            clearingHouseClient.send(payload, externalId);
+            clearingHouseClient.send(payloadObject, externalId);
         }
     }
+
     @SneakyThrows
-    protected void debug(VerifiableCredential payload, String externalId) {
+    protected void debug(ObjectNode payload, String externalId) {
         var annotation = ClearingHouseClient.class.getAnnotation(FeignClient.class);
         var name = annotation.name();
         Optional.ofNullable(technicalUsersDetails.getUsersDetails().get(name)).map(TechnicalUsersDetails.UserDetail::uri).ifPresent(uri -> log.debug("URL: {}", uri));
@@ -62,7 +68,6 @@ protected void debug(VerifiableCredential payload, String externalId) {
         log.debug("payload: {}", objectMapper.writeValueAsString(payload));
     }
 
-
     @Override
     public void afterPropertiesSet() {
         objectMapper.enable(SerializationFeature.INDENT_OUTPUT);
diff --git a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/clearinghouse/ClearingHouseClient.java b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/clearinghouse/ClearingHouseClient.java
index 2fda9cb1..51fb2258 100644
--- a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/clearinghouse/ClearingHouseClient.java
+++ b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/clearinghouse/ClearingHouseClient.java
@@ -1,6 +1,6 @@
 /********************************************************************************
- * Copyright (c) 2022,2024 T-Systems International GmbH
- * Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022,2025 T-Systems International GmbH
+ * Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -20,7 +20,7 @@
 
 package org.eclipse.tractusx.selfdescriptionfactory.service.clearinghouse;
 
-import com.danubetech.verifiablecredentials.VerifiableCredential;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,5 +29,5 @@
 @FeignClient(name = "clearingHouse", url = "http://placeholder:8080")
 public interface ClearingHouseClient {
     @PostMapping
-    void send(@RequestBody VerifiableCredential verifiableCredential, @RequestParam("externalId") String externalId);
+    Object send(@RequestBody ObjectNode payload, @RequestParam("externalId") String externalId);
 }
diff --git a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/RegCodeMapper.java b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/RegCodeMapper.java
index fe054ed0..ba08d73d 100644
--- a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/RegCodeMapper.java
+++ b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/RegCodeMapper.java
@@ -1,6 +1,6 @@
 /********************************************************************************
- * Copyright (c) 2022,2023 T-Systems International GmbH
- * Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022,2025 T-Systems International GmbH
+ * Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -20,19 +20,30 @@
 
 package org.eclipse.tractusx.selfdescriptionfactory.service.converter;
 
-import org.eclipse.tractusx.selfdescriptionfactory.model.vrel3.RegistrationNumberSchema.TypeEnum;
+import org.eclipse.tractusx.selfdescriptionfactory.model.tagus.RegistrationNumberSchema;
 
 import java.util.Map;
+import java.util.function.Function;
 
 public class RegCodeMapper {
-    private RegCodeMapper(){}
-    public static Map<TypeEnum, String> getRegCodeMapper(String prefix) {
-        return Map.of(
-                TypeEnum.TAXID, prefix.concat("local"),
-                TypeEnum.VATID, prefix.concat("vatID"),
-                TypeEnum.EUID, prefix.concat("EUID"),
-                TypeEnum.EORI, prefix.concat("EORI"),
-                TypeEnum.LEICODE, prefix.concat("leiCode")
-        );
+
+    private final String prefix;
+    private RegCodeMapper(String prefix){
+        this.prefix = prefix;
+    }
+    private static final Map<RegistrationNumberSchema.TypeEnum, String> regCodeMapper = Map.of(
+            RegistrationNumberSchema.TypeEnum.TAXID, "local",
+            RegistrationNumberSchema.TypeEnum.VATID, "vatID",
+            RegistrationNumberSchema.TypeEnum.EUID, "EUID",
+            RegistrationNumberSchema.TypeEnum.EORI, "EORI",
+            RegistrationNumberSchema.TypeEnum.LEICODE, "leiCode"
+    );
+
+    public String get(RegistrationNumberSchema.TypeEnum type) {
+        return prefix.concat(regCodeMapper.get(type));
+    }
+
+    public static Function<RegistrationNumberSchema.TypeEnum, String> getRegCodeMapper(String prefix) {
+        return new RegCodeMapper(prefix)::get;
     }
 }
diff --git a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/fcformat/LegalParticipantSDConverter.java b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/fcformat/LegalParticipantSDConverter.java
index 29641612..7db8c31a 100644
--- a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/fcformat/LegalParticipantSDConverter.java
+++ b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/fcformat/LegalParticipantSDConverter.java
@@ -1,6 +1,6 @@
 /********************************************************************************
- * Copyright (c) 2022,2023 T-Systems International GmbH
- * Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022,2025 T-Systems International GmbH
+ * Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -20,57 +20,68 @@
 
 package org.eclipse.tractusx.selfdescriptionfactory.service.converter.fcformat;
 
+import com.danubetech.verifiablecredentials.CredentialSubject;
+import com.danubetech.verifiablecredentials.VerifiableCredential;
 import lombok.RequiredArgsConstructor;
-import org.eclipse.tractusx.selfdescriptionfactory.SDFactory;
+import org.eclipse.tractusx.selfdescriptionfactory.SelfDescription;
 import org.eclipse.tractusx.selfdescriptionfactory.model.vrel3.LegalParticipantSchema;
 import org.eclipse.tractusx.selfdescriptionfactory.service.wallet.CustodianWallet;
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.http.HttpStatus;
-import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Component;
 import org.springframework.web.server.ResponseStatusException;
 
-import java.util.List;
-import java.util.Map;
+import java.net.URI;
+import java.util.*;
 
 @Component
 @RequiredArgsConstructor
 @Profile("fc-ctx")
-public class LegalParticipantSDConverter implements Converter<LegalParticipantSchema, SDFactory.SelfDescription> {
+public class LegalParticipantSDConverter implements Converter<LegalParticipantSchema, SelfDescription> {
 
     private final CustodianWallet custodianWallet;
 
     @Override
-    public SDFactory.SelfDescription convert(@NonNull LegalParticipantSchema legalParticipantSchema) {
+    public SelfDescription convert(LegalParticipantSchema legalParticipantSchema) {
         if (legalParticipantSchema.getRegistrationNumber().size() != 1) {
             throw new ResponseStatusException(
                     HttpStatus.BAD_REQUEST,
                     "Registration Number must have single element for Federated Catalog"
             );
         }
-        var legalParticipantSD = new SDFactory.SelfDescription(List.of(), legalParticipantSchema.getHolder(), legalParticipantSchema.getIssuer(), legalParticipantSchema.getExternalId(), null);
-        legalParticipantSD.put("@context", Map.of(
+        var selfDescription = new SelfDescription(legalParticipantSchema.getExternalId());
+
+        var legalParticipantVc = new LinkedHashMap<String, Object>();
+
+        legalParticipantVc.put("@context", Map.of(
                 "gx", "https://w3id.org/gaia-x/gax-trust-framework#",
                 "xsd", "http://www.w3.org/2001/XMLSchema#",
                 "vcard", "http://www.w3.org/2006/vcard/ns#",
                 "ctxsd", "https://w3id.org/catena-x/core#")
         );
-        legalParticipantSD.put("@id", custodianWallet.getWalletData(legalParticipantSchema.getHolder()).get("did"));
-        legalParticipantSD.put("@type", "gx:LegalPerson");
-        legalParticipantSD.put("ctxsd:bpn", legalParticipantSchema.getBpn());
-        legalParticipantSD.put("gx:name", custodianWallet.getWalletData(legalParticipantSchema.getBpn()).get("name"));
-        legalParticipantSD.put("gx:registrationNumber", legalParticipantSchema.getRegistrationNumber().iterator().next().getValue());
-        legalParticipantSD.put("gx:headquarterAddress",
+        legalParticipantVc.put("@id", custodianWallet.getWalletData(legalParticipantSchema.getHolder()).get("did"));
+        legalParticipantVc.put("@type", "gx:LegalPerson");
+        legalParticipantVc.put("ctxsd:bpn", legalParticipantSchema.getBpn());
+        legalParticipantVc.put("gx:name", custodianWallet.getWalletData(legalParticipantSchema.getBpn()).get("name"));
+        legalParticipantVc.put("gx:registrationNumber", legalParticipantSchema.getRegistrationNumber().iterator().next().getValue());
+        legalParticipantVc.put("gx:headquarterAddress",
                 Map.of("@type", "vcard:Address",
                         "vcard:country-name", legalParticipantSchema.getHeadquarterAddressCountry()
                 )
         );
-        legalParticipantSD.put("gx:legalAddress",
+        legalParticipantVc.put("gx:legalAddress",
                 Map.of("@type", "vcard:Address",
                         "vcard:country-name", legalParticipantSchema.getLegalAddressCountry()
                 )
         );
-        return legalParticipantSD;
+
+       var legalParticipantSD = VerifiableCredential.builder()
+               .issuer(URI.create(legalParticipantSchema.getIssuer()))
+               .credentialSubject(CredentialSubject.fromMap(legalParticipantVc))
+               .build();
+
+        selfDescription.getVerifiableCredentialList().add(legalParticipantSD);
+        return selfDescription;
     }
 }
diff --git a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/fcformat/ServiceOfferingSDConverter.java b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/fcformat/ServiceOfferingSDConverter.java
index 66444cf8..d8bd28b5 100644
--- a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/fcformat/ServiceOfferingSDConverter.java
+++ b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/fcformat/ServiceOfferingSDConverter.java
@@ -1,6 +1,6 @@
 /********************************************************************************
- * Copyright (c) 2022,2023 T-Systems International GmbH
- * Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022,2025 T-Systems International GmbH
+ * Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -20,8 +20,10 @@
 
 package org.eclipse.tractusx.selfdescriptionfactory.service.converter.fcformat;
 
+import com.danubetech.verifiablecredentials.CredentialSubject;
+import com.danubetech.verifiablecredentials.VerifiableCredential;
 import lombok.RequiredArgsConstructor;
-import org.eclipse.tractusx.selfdescriptionfactory.SDFactory;
+import org.eclipse.tractusx.selfdescriptionfactory.SelfDescription;
 import org.eclipse.tractusx.selfdescriptionfactory.Utils;
 import org.eclipse.tractusx.selfdescriptionfactory.model.vrel3.ServiceOfferingSchema;
 import org.eclipse.tractusx.selfdescriptionfactory.service.converter.TermsAndConditionsHelper;
@@ -30,7 +32,8 @@
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
+import java.net.URI;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -38,37 +41,43 @@
 @Component
 @RequiredArgsConstructor
 @Profile("fc-ctx")
-public class ServiceOfferingSDConverter implements Converter<ServiceOfferingSchema, SDFactory.SelfDescription> {
+public class ServiceOfferingSDConverter implements Converter<ServiceOfferingSchema, SelfDescription> {
 
     private final CustodianWallet custodianWallet;
     private final TermsAndConditionsHelper termsAndConditionsHelper;
 
     @Override
-    public SDFactory.SelfDescription convert(ServiceOfferingSchema serviceOfferingSchema) {
-        var serviceOfferingSD = new SDFactory.SelfDescription(List.of(), serviceOfferingSchema.getHolder(), serviceOfferingSchema.getIssuer(), serviceOfferingSchema.getExternalId(), null);
-        serviceOfferingSD.put("@context", Map.of(
+    public SelfDescription convert(ServiceOfferingSchema serviceOfferingSchema) {
+
+
+        var serviceOfferingSD = new SelfDescription(serviceOfferingSchema.getExternalId());
+
+        var serviceOfferingVc = new LinkedHashMap<String, Object>();
+
+
+        serviceOfferingVc.put("@context", Map.of(
                         "gx", "https://w3id.org/gaia-x/gax-trust-framework#",
                         "gax-core", "https://w3id.org/gaia-x/core#",
                         "ctxsd", "https://w3id.org/catena-x/core#",
                         "xsd", "http://www.w3.org/2001/XMLSchema#"
                 )
         );
-        serviceOfferingSD.put("@id", custodianWallet.getWalletData(serviceOfferingSchema.getHolder()).get("did"));
-        serviceOfferingSD.put("@type", "gx:ServiceOffering");
-        serviceOfferingSD.put("ctxsd:connector-url", "https://connector-placeholder.net");
+        serviceOfferingVc.put("@id", custodianWallet.getWalletData(serviceOfferingSchema.getHolder()).get("did"));
+        serviceOfferingVc.put("@type", "gx:ServiceOffering");
+        serviceOfferingVc.put("ctxsd:connector-url", "https://connector-placeholder.net");
         //WARNING! In Trust Framework specs it is called 'providedBy'
         //but in FC it is referred as 'gax-core:offeredBy'
-        serviceOfferingSD.put("gax-core:offeredBy", Map.of(
+        serviceOfferingVc.put("gax-core:offeredBy", Map.of(
                 "@id", serviceOfferingSchema.getProvidedBy())
         );
-        serviceOfferingSD.put("gx:dataAccountExport", Map.of(
+        serviceOfferingVc.put("gx:dataAccountExport", Map.of(
                 "gx:requestType", "email",
                 "gx:accessType", "digital",
                 "gx:formatType", "json")
         );
         var setter = new Object() {
             Consumer<Object> set(String fieldName) {
-                return any -> serviceOfferingSD.put(fieldName, any);
+                return any -> serviceOfferingVc.put(fieldName, any);
             }
         };
         Utils.getNonEmptyListFromCommaSeparated(serviceOfferingSchema.getAggregationOf(), Utils::uriFromStr)
@@ -101,6 +110,13 @@ Consumer<Object> set(String fieldName) {
                         ).map(l -> l.size() == 1 ? l.iterator().next() : l)
                         .orElse("policy_placeholder")
         );
+
+        var legalParticipantSD = VerifiableCredential.builder()
+                .issuer(URI.create(serviceOfferingSchema.getIssuer()))
+                .credentialSubject(CredentialSubject.fromMap(serviceOfferingVc))
+                .build();
+        serviceOfferingSD.getVerifiableCredentialList().add(legalParticipantSD);
+
         return serviceOfferingSD;
     }
 }
diff --git a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/gaiax/LegalParticipantSDConverter.java b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/gaiax/LegalParticipantSDConverter.java
index 6559ef06..863da925 100644
--- a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/gaiax/LegalParticipantSDConverter.java
+++ b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/gaiax/LegalParticipantSDConverter.java
@@ -1,6 +1,6 @@
 /********************************************************************************
- * Copyright (c) 2022,2023 T-Systems International GmbH
- * Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022,2025 T-Systems International GmbH
+ * Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -20,8 +20,11 @@
 
 package org.eclipse.tractusx.selfdescriptionfactory.service.converter.gaiax;
 
+import com.danubetech.verifiablecredentials.CredentialSubject;
+import com.danubetech.verifiablecredentials.VerifiableCredential;
 import lombok.RequiredArgsConstructor;
 import org.eclipse.tractusx.selfdescriptionfactory.SDFactory;
+import org.eclipse.tractusx.selfdescriptionfactory.SelfDescription;
 import org.eclipse.tractusx.selfdescriptionfactory.model.vrel3.LegalParticipantSchema;
 import org.eclipse.tractusx.selfdescriptionfactory.model.vrel3.RegistrationNumberSchema;
 import org.eclipse.tractusx.selfdescriptionfactory.service.converter.RegCodeMapper;
@@ -32,34 +35,47 @@
 import org.springframework.stereotype.Component;
 
 import java.net.URI;
-import java.util.List;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 @Component
 @RequiredArgsConstructor
 @Profile("gaia-x-ctx")
-public class LegalParticipantSDConverter implements Converter<LegalParticipantSchema, SDFactory.SelfDescription> {
+public class LegalParticipantSDConverter implements Converter<LegalParticipantSchema, SelfDescription> {
 
     private final CustodianWallet custodianWallet;
-    private final Map<RegistrationNumberSchema.TypeEnum, String> regCodeMapper = RegCodeMapper.getRegCodeMapper("gx:");
+    private final Map<RegistrationNumberSchema.TypeEnum, String> regCodeMapper = (Map<RegistrationNumberSchema.TypeEnum, String>) RegCodeMapper.getRegCodeMapper("gx:");
     @Value("${app.verifiableCredentials.gaia-x-participant-schema}")
     private URI contextUri;
 
 
     @Override
-    public SDFactory.SelfDescription convert(LegalParticipantSchema legalParticipantSchema) {
-        var legalParticipantSD = new SDFactory.SelfDescription(List.of(contextUri), legalParticipantSchema.getHolder(), legalParticipantSchema.getIssuer(), legalParticipantSchema.getExternalId(), null);
-        legalParticipantSD.put("@context", Map.of("ctxsd", "https://w3id.org/catena-x/core#"));
-        legalParticipantSD.put("id", custodianWallet.getWalletData(legalParticipantSchema.getBpn()).get("did"));
-        legalParticipantSD.put("type", "gx:LegalParticipant");
-        legalParticipantSD.put("ctxsd:bpn", legalParticipantSchema.getBpn());
-        legalParticipantSD.put("gx:legalName", custodianWallet.getWalletData(legalParticipantSchema.getBpn()).get("name"));
-        legalParticipantSD.put(
+    public SelfDescription convert(LegalParticipantSchema legalParticipantSchema) {
+
+
+        var legalParticipantSD = new SelfDescription(legalParticipantSchema.getExternalId());
+
+        var legalParticipantVc = new LinkedHashMap<String, Object>();
+        legalParticipantVc.put("@context", Map.of("ctxsd", "https://w3id.org/catena-x/core#"));
+        legalParticipantVc.put("id", custodianWallet.getWalletData(legalParticipantSchema.getBpn()).get("did"));
+        legalParticipantVc.put("type", "gx:LegalParticipant");
+        legalParticipantVc.put("ctxsd:bpn", legalParticipantSchema.getBpn());
+        legalParticipantVc.put("gx:legalName", custodianWallet.getWalletData(legalParticipantSchema.getBpn()).get("name"));
+        legalParticipantVc.put(
                 "gx:legalRegistrationNumber",
                 legalParticipantSchema.getRegistrationNumber().stream().map(regNum -> Map.of(regCodeMapper.get(regNum.getType()), regNum.getValue())).toList()
         );
-        legalParticipantSD.put("gx:headquarterAddress", Map.of("gx:countrySubdivisionCode", legalParticipantSchema.getHeadquarterAddressCountry()));
-        legalParticipantSD.put("gx:legalAddress", Map.of("gx:countrySubdivisionCode", legalParticipantSchema.getLegalAddressCountry()));
+        legalParticipantVc.put("gx:headquarterAddress", Map.of("gx:countrySubdivisionCode", legalParticipantSchema.getHeadquarterAddressCountry()));
+        legalParticipantVc.put("gx:legalAddress", Map.of("gx:countrySubdivisionCode", legalParticipantSchema.getLegalAddressCountry()));
+
+        var legalParticipant = VerifiableCredential.builder()
+                .context(contextUri)
+                .issuer(URI.create(legalParticipantSchema.getIssuer()))
+                .credentialSubject(CredentialSubject.fromMap(legalParticipantVc))
+                .build();
+
+        legalParticipantSD.getVerifiableCredentialList().add(legalParticipant);
+
         return legalParticipantSD;
     }
 }
diff --git a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/gaiax/ServiceOfferingSDConverter.java b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/gaiax/ServiceOfferingSDConverter.java
index 2fb77f6e..59687f53 100644
--- a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/gaiax/ServiceOfferingSDConverter.java
+++ b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/gaiax/ServiceOfferingSDConverter.java
@@ -1,6 +1,6 @@
 /********************************************************************************
- * Copyright (c) 2022,2023 T-Systems International GmbH
- * Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022,2025 T-Systems International GmbH
+ * Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -20,8 +20,10 @@
 
 package org.eclipse.tractusx.selfdescriptionfactory.service.converter.gaiax;
 
+import com.danubetech.verifiablecredentials.CredentialSubject;
+import com.danubetech.verifiablecredentials.VerifiableCredential;
 import lombok.RequiredArgsConstructor;
-import org.eclipse.tractusx.selfdescriptionfactory.SDFactory;
+import org.eclipse.tractusx.selfdescriptionfactory.SelfDescription;
 import org.eclipse.tractusx.selfdescriptionfactory.Utils;
 import org.eclipse.tractusx.selfdescriptionfactory.model.vrel3.ServiceOfferingSchema;
 import org.eclipse.tractusx.selfdescriptionfactory.service.converter.TermsAndConditionsHelper;
@@ -41,7 +43,7 @@
 @Component
 @RequiredArgsConstructor
 @Profile("gaia-x-ctx")
-public class ServiceOfferingSDConverter implements Converter<ServiceOfferingSchema, SDFactory.SelfDescription> {
+public class ServiceOfferingSDConverter implements Converter<ServiceOfferingSchema, SelfDescription> {
 
     private final CustodianWallet custodianWallet;
     private final TermsAndConditionsHelper termsAndConditionsHelper;
@@ -49,21 +51,25 @@ public class ServiceOfferingSDConverter implements Converter<ServiceOfferingSche
     private URI contextUri;
 
     @Override
-    public SDFactory.SelfDescription convert(ServiceOfferingSchema serviceOfferingSchema) {
-        var serviceOfferingSD = new SDFactory.SelfDescription(List.of(contextUri), serviceOfferingSchema.getHolder(), serviceOfferingSchema.getIssuer(), serviceOfferingSchema.getExternalId(), null);
-        serviceOfferingSD.put("@context", Map.of("ctxsd", "https://w3id.org/catena-x/core#"));
-        serviceOfferingSD.put("id", custodianWallet.getWalletData(serviceOfferingSchema.getHolder()).get("did"));
-        serviceOfferingSD.put("type", "gx:ServiceOffering");
-        serviceOfferingSD.put("ctxsd:connector-url", "https://connector-placeholder.net");
-        serviceOfferingSD.put("gx:providedBy", Map.of("id", serviceOfferingSchema.getProvidedBy()));
+    public SelfDescription convert(ServiceOfferingSchema serviceOfferingSchema) {
+
+        var serviceOfferingSD = new SelfDescription(serviceOfferingSchema.getExternalId());
+
+        var serviceOfferingVc = new LinkedHashMap<String, Object>();
+
+        serviceOfferingVc.put("@context", Map.of("ctxsd", "https://w3id.org/catena-x/core#"));
+        serviceOfferingVc.put("id", custodianWallet.getWalletData(serviceOfferingSchema.getHolder()).get("did"));
+        serviceOfferingVc.put("type", "gx:ServiceOffering");
+        serviceOfferingVc.put("ctxsd:connector-url", "https://connector-placeholder.net");
+        serviceOfferingVc.put("gx:providedBy", Map.of("id", serviceOfferingSchema.getProvidedBy()));
         Map<String, Object> dataAccountExportNode = new LinkedHashMap<>();
         dataAccountExportNode.put("gx:requestType", "email");
         dataAccountExportNode.put("gx:accessType", "digital");
         dataAccountExportNode.put("gx:formatType", "json");
-        serviceOfferingSD.put("gx:dataAccountExport", List.of(dataAccountExportNode));
+        serviceOfferingVc.put("gx:dataAccountExport", List.of(dataAccountExportNode));
         var setter = new Object() {
             <T> Consumer<T> set(String fieldName) {
-                return t -> serviceOfferingSD.put(fieldName, t);
+                return t -> serviceOfferingVc.put(fieldName, t);
             }
         };
         Utils.getNonEmptyListFromCommaSeparated(serviceOfferingSchema.getAggregationOf(), Utils::uriFromStr).ifPresent(setter.set("gx:aggregationOf"));
@@ -76,6 +82,14 @@ <T> Consumer<T> set(String fieldName) {
                 )
         ).ifPresent(setter.set("gx:termsAndConditions"));
         Utils.getNonEmptyListFromCommaSeparated(serviceOfferingSchema.getPolicies(), Function.identity()).ifPresent(setter.set("gx:policy"));
+
+        var legalParticipantSD = VerifiableCredential.builder()
+                .context(contextUri)
+                .issuer(URI.create(serviceOfferingSchema.getIssuer()))
+                .credentialSubject(CredentialSubject.fromMap(serviceOfferingVc))
+                .build();
+        serviceOfferingSD.getVerifiableCredentialList().add(legalParticipantSD);
+
         return serviceOfferingSD;
     }
 }
diff --git a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/tagus/LegalParticipantSDConverter.java b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/tagus/LegalParticipantSDConverter.java
new file mode 100644
index 00000000..143c257c
--- /dev/null
+++ b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/tagus/LegalParticipantSDConverter.java
@@ -0,0 +1,183 @@
+/********************************************************************************
+ * Copyright (c) 2022,2025 T-Systems International GmbH
+ * Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+package org.eclipse.tractusx.selfdescriptionfactory.service.converter.tagus;
+
+import com.danubetech.verifiablecredentials.CredentialSubject;
+import com.danubetech.verifiablecredentials.VerifiableCredential;
+import lombok.RequiredArgsConstructor;
+import org.eclipse.tractusx.selfdescriptionfactory.SelfDescription;
+import org.eclipse.tractusx.selfdescriptionfactory.Utils;
+import org.eclipse.tractusx.selfdescriptionfactory.model.tagus.LegalParticipantSchema;
+import org.eclipse.tractusx.selfdescriptionfactory.model.tagus.RegistrationNumberSchema;
+import org.eclipse.tractusx.selfdescriptionfactory.service.converter.RegCodeMapper;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Profile;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import static org.eclipse.tractusx.selfdescriptionfactory.Utils.mapOf;
+
+@Component
+@RequiredArgsConstructor
+@Profile("tagus-ctx")
+public class LegalParticipantSDConverter implements Converter<LegalParticipantSchema, SelfDescription> {
+    private final Function<RegistrationNumberSchema.TypeEnum, String> regCodeMapper = RegCodeMapper.getRegCodeMapper("gx:");
+
+    @Value("${app.verifiableCredentials.gaia-x-participant-schema}")
+    private URI contextUri;
+    @Value("${app.verifiableCredentials.catena-x-ns}")
+    private String ctxsd;
+
+    @Value("${app.verifiableCredentials.durationDays:90}")
+    private int duration;
+    @Value("${app.maxRedirect:5}")
+    private int maxRedirect;
+
+    @Override
+    public SelfDescription convert(LegalParticipantSchema legalParticipantSchema) {
+
+        var selfDescription = new SelfDescription(legalParticipantSchema.getExternalId());
+        var regNumbers = legalParticipantSchema.getRegistrationNumber().stream()
+                .map(registrationNumberSchema -> getLegalRegistrationNumberVc(legalParticipantSchema, registrationNumberSchema)).toList();
+        var legalParticipant = getLegalPersonVc(legalParticipantSchema, regNumbers.stream().map(VerifiableCredential::getId).toList());
+        selfDescription.getVerifiableCredentialList().add(legalParticipant);
+        selfDescription.getVerifiableCredentialList().addAll(regNumbers);
+        //var attachment = Try.of(() -> getGxTermsAndConditionsVc(legalParticipantSchema)).get();
+        //selfDescription.getVerifiableCredentialList().addAll(attachment);
+        return selfDescription;
+    }
+
+    /**
+     * Generates a Verifiable Credential for a legal person based on the provided legal participant schema and registration numbers.
+     *
+     * @param legalParticipantSchema The legal participant schema containing the necessary information.
+     * @param regNumbers The list of registration numbers for the legal person.
+     * @return The generated Verifiable Credential for the legal person.
+     */
+    private VerifiableCredential getLegalPersonVc(LegalParticipantSchema legalParticipantSchema, List<URI> regNumbers) {
+        // Create a map to hold the verifiable credential data
+        var legalParticipantSD = new LinkedHashMap<String, Object>();
+
+        // Set the context and id of the verifiable credential
+        legalParticipantSD.put("id", "http://catena-x.net/bpn/".concat(legalParticipantSchema.getHolder()));
+
+        // Set the type and additional properties of the legal participant
+        legalParticipantSD.put("type", "gx:LegalParticipant");
+        legalParticipantSD.put("bpn", legalParticipantSchema.getHolder());
+        legalParticipantSD.put("gx:legalName", legalParticipantSchema.getName());
+
+        // Set the legal registration number based on the number of registration numbers provided
+        legalParticipantSD.put("gx:legalRegistrationNumber",
+                regNumbers.size() == 1
+                        ? Map.of("id", regNumbers.get(0))
+                        : regNumbers.stream().map(regNum -> Map.of("gx:legalRegistrationNumber", Map.of("id", regNum))).toList()
+        );
+
+        // Set the headquarter and legal addresses
+        legalParticipantSD.put("gx:headquarterAddress", Map.of("gx:countrySubdivisionCode", legalParticipantSchema.getHeadquarterAddressCountrySubdivisionCode()));
+        legalParticipantSD.put("gx:legalAddress", Map.of("gx:countrySubdivisionCode", legalParticipantSchema.getLegalAddressCountrySubdivisionCode()));
+
+        // Build and return the Verifiable Credential
+        return VerifiableCredential.builder()
+                .context(contextUri)
+                .id(URI.create("http://catena-x.net/legal-participant/".concat(UUID.randomUUID().toString())))
+                .issuanceDate(new Date())
+                .credentialSubject(CredentialSubject.fromMap(legalParticipantSD))
+                .build();
+    }
+
+    /**
+     * Generates a Verifiable Credential for a legal registration number.
+     *
+     * @param legalParticipantSchema The legal participant schema
+     * @param registrationNumberSchema The registration number schema
+     * @return The Verifiable Credential for the legal registration number
+     */
+    private VerifiableCredential getLegalRegistrationNumberVc(
+            LegalParticipantSchema legalParticipantSchema,
+            RegistrationNumberSchema registrationNumberSchema
+    ) {
+        // Construct the Verifiable Credential with builder pattern
+        return VerifiableCredential.builder()
+                .context(URI.create("https://w3id.org/security/suites/jws-2020/v1"))
+                .id(URI.create("http://catena-x.net/legal-registration-number/".concat(UUID.randomUUID().toString())))
+                .issuanceDate(new Date())
+                .credentialSubject(
+                        CredentialSubject.builder()
+                                .context(contextUri)
+                                .type("gx:legalRegistrationNumber")
+                                .id(URI.create("http://catena-x.net/bpn/".concat(legalParticipantSchema.getHolder())))
+                                .properties(
+                                        // Conditionally set properties based on registration number type
+                                        registrationNumberSchema.getType().equals(RegistrationNumberSchema.TypeEnum.VATID)
+                                                ? mapOf("gx:vatID", registrationNumberSchema.getValue(), "gx:vatID-countryCode", "DE")
+                                                : Map.of(regCodeMapper.apply(registrationNumberSchema.getType()), registrationNumberSchema.getValue()))
+                                .build()
+                ).build();
+    }
+
+    private static final String GX_TNC =
+            """
+            The PARTICIPANT signing the Self-Description agrees as follows:
+            - to update its descriptions about any changes, be it technical, organizational, or legal - especially but not limited to contractual in regards to the indicated attributes present in the descriptions.
+            
+            The keypair used to sign Verifiable Credentials will be revoked where Gaia-X Association becomes aware of any inaccurate statements in regards to the claims which result in a non-compliance with the Trust Framework and policy rules defined in the Policy Rules and Labelling Document (PRLD).
+            """;
+
+    /**
+     * Checks if attachment contains appropriate Gx Terms and Conditions verifiable credential and generates one if it does not.
+     *
+     * @param  legalParticipantSchema   the legal participant schema
+     * @return                          the list of VC from attachment including Gx Terms and Conditions verifiable credentials
+     */
+    private List<VerifiableCredential> getGxTermsAndConditionsVc(LegalParticipantSchema legalParticipantSchema) throws Utils.TooManyRedirectsException, IOException {
+        var attachment = Utils.getAttachmentVc(legalParticipantSchema.getAttachment(), maxRedirect);
+        if (attachment.stream().flatMap(vc -> Optional.ofNullable(vc.getCredentialSubject()).stream())
+                .anyMatch(subj ->
+                        "gx:GaiaXTermsAndConditions".equals(subj.getType())
+                                && URI.create("http://catena-x.net/bpn/".concat(legalParticipantSchema.getHolder())).equals(subj.getId())
+                )) {
+            return attachment;
+        } else {
+            return Stream.concat(
+                    attachment.stream(),
+                    Stream.of(VerifiableCredential.builder()
+                            .id(URI.create("http://catena-x.net/terms-and-conditions/".concat(UUID.randomUUID().toString())))
+                            .issuanceDate(new Date())
+                            .credentialSubject(
+                                    CredentialSubject.builder()
+                                            .context(contextUri)
+                                            .type("gx:GaiaXTermsAndConditions")
+                                            .id(URI.create("http://catena-x.net/bpn/".concat(legalParticipantSchema.getHolder())))
+                                            .properties(Map.of("gx:termsAndConditions", GX_TNC))
+                                            .build()
+                            ).build()
+                    )
+            ).toList();
+        }
+    }
+}
diff --git a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/tagus/ServiceOfferingSDConverter.java b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/tagus/ServiceOfferingSDConverter.java
new file mode 100644
index 00000000..91ce8796
--- /dev/null
+++ b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/tagus/ServiceOfferingSDConverter.java
@@ -0,0 +1,145 @@
+/********************************************************************************
+ * Copyright (c) 2022,2025 T-Systems International GmbH
+ * Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+package org.eclipse.tractusx.selfdescriptionfactory.service.converter.tagus;
+
+import com.danubetech.verifiablecredentials.CredentialSubject;
+import com.danubetech.verifiablecredentials.VerifiableCredential;
+import io.vavr.control.Try;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import org.eclipse.tractusx.selfdescriptionfactory.SelfDescription;
+import org.eclipse.tractusx.selfdescriptionfactory.Utils;
+import org.eclipse.tractusx.selfdescriptionfactory.model.tagus.ServiceOfferingSchema;
+import org.eclipse.tractusx.selfdescriptionfactory.service.converter.TermsAndConditionsHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Profile;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.validation.annotation.Validated;
+
+import java.net.URI;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.*;
+import java.util.function.Consumer;
+
+@ConfigurationProperties(prefix = "app.verifiable-credentials")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@Validated
+@Profile("tagus-ctx")
+public class ServiceOfferingSDConverter implements Converter<ServiceOfferingSchema, SelfDescription> {
+
+    @Setter private Map<String, String> gaiaXDataAccountExport;
+    @Setter private Map<String, String> gaiaXTermsAndConditions;
+    @Setter private List<String> gaiaXDataProtectionRegime;
+    @Setter @NotNull(message = "app.verifiableCredentials.gaia-x-participant-schema shall be defined in the configuration file") private URI gaiaXServiceSchema;
+    @Setter @NotNull(message = "app.verifiableCredentials.gaia-x-policy shall be defined in the configuration file") private URI gaiaXPolicy;
+    @Setter @Positive(message = "app.verifiableCredentials.durationDays shall be defined in the configuration file") private int durationDays;
+    @Setter @NotNull(message = "app.verifiableCredentials.catena-x-ns shall be defined in the configuration file") private String catenaXNs;
+
+    @Value("${app.maxRedirect:5}")
+    private int maxRedirect;
+    private final TermsAndConditionsHelper termsAndConditionsHelper;
+
+    /**
+     * Convert ServiceOfferingSchema to SelfDescription
+     * @param serviceOfferingSchema the service offering schema
+     * @return the self description
+     */
+    @Override
+    public SelfDescription convert(ServiceOfferingSchema serviceOfferingSchema) {
+
+        var attachedVc = Try.of(() -> Utils.getAttachmentVc(serviceOfferingSchema.getAttachment(), maxRedirect)).get();
+        var holderId = URI.create("http://catena-x.net/bpn/".concat(serviceOfferingSchema.getHolder()));
+        var providedBy = findLegalParticipantVc(holderId, attachedVc).isEmpty()? serviceOfferingSchema.getProvidedBy():findLegalParticipantVc(holderId, attachedVc).get().getId();
+
+        // Create a self description with the external id from the service offering schema
+        var selfDescription = new SelfDescription(serviceOfferingSchema.getExternalId());
+
+        // Create a map for the service offering self description
+        var serviceOfferingSD = new LinkedHashMap<String, Object>();
+        serviceOfferingSD.put("id", holderId.toString());
+        serviceOfferingSD.put("type", "gx:ServiceOffering");
+        serviceOfferingSD.put("gx:providedBy", Map.of("id",providedBy));
+
+        // Create a setter function to add values to the service offering self description
+        var setter = new Object() {
+            <T> Consumer<T> set(String fieldName) {
+                return t -> serviceOfferingSD.put(fieldName, t);
+            }
+        };
+
+        // Add termsAndConditions field if non-empty
+        Optional.ofNullable(serviceOfferingSchema.getTermsAndConditions())
+                .map(Object.class::cast)
+                .or(() -> Optional.ofNullable(gaiaXTermsAndConditions))
+                .ifPresent(setter.set("gx:termsAndConditions"));
+
+        // Add policies field if non-empty, using policyUri
+
+        Optional.ofNullable(serviceOfferingSchema.getPolicy())
+                .ifPresent(setter.set("gx:policy"));
+        // Add dataProtectionRegime and dataAccountExport fields
+        Optional.ofNullable(serviceOfferingSchema.getDataProtectionRegime())
+                .map(Collection.class::cast)
+                .or(() -> Optional.ofNullable(gaiaXDataProtectionRegime))
+                .ifPresent(setter.set("gx:dataProtectionRegime"));
+        Optional.ofNullable(serviceOfferingSchema.getDataAccountExport())
+                .map(Object.class::cast)
+                .or(() -> Optional.ofNullable(gaiaXDataAccountExport))
+                .ifPresent(setter.set("gx:dataAccountExport"));
+
+        // Create a verifiable credential using the service offering self description
+        var vc = VerifiableCredential.builder()
+                .context(gaiaXServiceSchema)
+                .id(URI.create("http://catena-x.net/service-offering/".concat(UUID.randomUUID().toString())))
+                .issuanceDate(new Date())
+                .expirationDate(Date.from(Instant.now().plus(Duration.ofDays(durationDays))))
+                .credentialSubject(CredentialSubject.fromMap(serviceOfferingSD))
+                .build();
+
+        // Add the verifiable credential to the self description and return it
+        selfDescription.getVerifiableCredentialList().add(vc);
+        selfDescription.getVerifiableCredentialList().addAll(attachedVc);
+        return selfDescription;
+    }
+
+    /**
+     * Finds a legal participant verifiable credential based on the holder ID.
+     *
+     * @param holderId                The URI of the holder
+     * @param verifiableCredentialList The list of verifiable credentials to search
+     * @return                        An optional containing the first legal participant verifiable credential found, or empty if not found
+     */
+    private Optional<VerifiableCredential> findLegalParticipantVc(URI holderId, List<VerifiableCredential> verifiableCredentialList) {
+        return verifiableCredentialList.stream()
+                .filter(vc -> {
+                    var credentialSubject = vc.getCredentialSubject();
+                    return credentialSubject != null
+                            && "gx:LegalParticipant".equals(credentialSubject.getType())
+                            && holderId.equals(vc.getCredentialSubject().getId());
+                }).findFirst();
+    }
+
+}
diff --git a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/vrel3/LegalParticipantSDConverter.java b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/vrel3/LegalParticipantSDConverter.java
index c0bbd2c5..0ebc070d 100644
--- a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/vrel3/LegalParticipantSDConverter.java
+++ b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/vrel3/LegalParticipantSDConverter.java
@@ -1,6 +1,6 @@
 /********************************************************************************
- * Copyright (c) 2022,2023 T-Systems International GmbH
- * Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022,2025 T-Systems International GmbH
+ * Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -20,8 +20,10 @@
 
 package org.eclipse.tractusx.selfdescriptionfactory.service.converter.vrel3;
 
+import com.danubetech.verifiablecredentials.CredentialSubject;
+import com.danubetech.verifiablecredentials.VerifiableCredential;
 import lombok.RequiredArgsConstructor;
-import org.eclipse.tractusx.selfdescriptionfactory.SDFactory;
+import org.eclipse.tractusx.selfdescriptionfactory.SelfDescription;
 import org.eclipse.tractusx.selfdescriptionfactory.model.vrel3.LegalParticipantSchema;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
@@ -30,24 +32,26 @@
 
 import java.net.URI;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
 @Component
 @RequiredArgsConstructor
 @Profile("catena-x-ctx")
-public class LegalParticipantSDConverter implements Converter<LegalParticipantSchema, SDFactory.SelfDescription> {
+public class LegalParticipantSDConverter implements Converter<LegalParticipantSchema, SelfDescription> {
 
     @Value("${app.verifiableCredentials.schema2210Url}")
     private URI contextUri;
 
     @Override
-    public SDFactory.SelfDescription convert(LegalParticipantSchema legalParticipantSchema) {
-        var legalParticipantSD =  new SDFactory.SelfDescription(List.of(contextUri), legalParticipantSchema.getHolder(), legalParticipantSchema.getIssuer(), legalParticipantSchema.getExternalId(), null);
-        legalParticipantSD.put("type", "LegalParticipant");
-        legalParticipantSD.put("bpn", legalParticipantSchema.getBpn());
-        legalParticipantSD.put(
+    public SelfDescription convert(LegalParticipantSchema legalParticipantSchema) {
+
+        var legalParticipantSD = new SelfDescription(legalParticipantSchema.getExternalId());
+        var legalParticipantVc = new LinkedHashMap<String, Object>();
+
+        legalParticipantVc.put("type", "LegalParticipant");
+        legalParticipantVc.put("bpn", legalParticipantSchema.getBpn());
+        legalParticipantVc.put(
                 "registrationNumber",
                 legalParticipantSchema.getRegistrationNumber().stream()
                         .map(rNum -> {
@@ -57,8 +61,18 @@ public SDFactory.SelfDescription convert(LegalParticipantSchema legalParticipant
                             return val;
                         }).collect(Collectors.toUnmodifiableSet())
         );
-        legalParticipantSD.put("headquarterAddress", Map.of("countryCode", legalParticipantSchema.getHeadquarterAddressCountry()));
-        legalParticipantSD.put("legalAddress", Map.of("countryCode", legalParticipantSchema.getLegalAddressCountry()));
+        legalParticipantVc.put("headquarterAddress", Map.of("countryCode", legalParticipantSchema.getHeadquarterAddressCountry()));
+        legalParticipantVc.put("legalAddress", Map.of("countryCode", legalParticipantSchema.getLegalAddressCountry()));
+
+
+        var legalParticipant = VerifiableCredential.builder()
+                .context(contextUri)
+                .issuer(URI.create(legalParticipantSchema.getIssuer()))
+                .credentialSubject(CredentialSubject.fromMap(legalParticipantVc))
+                .build();
+
+        legalParticipantSD.getVerifiableCredentialList().add(legalParticipant);
+
         return legalParticipantSD;
     }
 }
diff --git a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/vrel3/ServiceOfferingSDConverter.java b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/vrel3/ServiceOfferingSDConverter.java
index 323d90d8..83a30467 100644
--- a/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/vrel3/ServiceOfferingSDConverter.java
+++ b/src/main/java/org/eclipse/tractusx/selfdescriptionfactory/service/converter/vrel3/ServiceOfferingSDConverter.java
@@ -1,6 +1,6 @@
 /********************************************************************************
- * Copyright (c) 2022,2023 T-Systems International GmbH
- * Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022,2025 T-Systems International GmbH
+ * Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -20,10 +20,12 @@
 
 package org.eclipse.tractusx.selfdescriptionfactory.service.converter.vrel3;
 
+import com.danubetech.verifiablecredentials.CredentialSubject;
+import com.danubetech.verifiablecredentials.VerifiableCredential;
 import io.vavr.control.Try;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.eclipse.tractusx.selfdescriptionfactory.SDFactory;
+import org.eclipse.tractusx.selfdescriptionfactory.SelfDescription;
 import org.eclipse.tractusx.selfdescriptionfactory.Utils;
 import org.eclipse.tractusx.selfdescriptionfactory.model.v2210.DataAccountExportSchema;
 import org.eclipse.tractusx.selfdescriptionfactory.model.v2210.TermsAndConditionsSchema;
@@ -37,13 +39,14 @@
 
 import java.net.URI;
 import java.net.URL;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.function.Function;
 
 @Component
 @RequiredArgsConstructor
 @Profile("catena-x-ctx")
-public class ServiceOfferingSDConverter implements Converter<ServiceOfferingSchema, SDFactory.SelfDescription> {
+public class ServiceOfferingSDConverter implements Converter<ServiceOfferingSchema, SelfDescription> {
 
     @Value("${app.maxRedirect:5}")
     private int maxRedirect;
@@ -52,24 +55,35 @@ public class ServiceOfferingSDConverter implements Converter<ServiceOfferingSche
     private URI contextUri;
 
     @Override
-    public SDFactory.SelfDescription convert(ServiceOfferingSchema serviceOfferingSchema) {
+    public SelfDescription convert(ServiceOfferingSchema serviceOfferingSchema) {
         var aggregationOf = Utils.getNonEmptyListFromCommaSeparated(serviceOfferingSchema.getAggregationOf(), Utils::uriFromStr).orElse(null);
         var termsAndConditions = Utils.getNonEmptyListFromCommaSeparated(serviceOfferingSchema.getTermsAndConditions(), this::getTermsAndConditions).orElse(null);
         var policy = Utils.getNonEmptyListFromCommaSeparated(serviceOfferingSchema.getPolicies(), Function.identity()).orElse(null);
-        var serviceOfferingSD = new SDFactory.SelfDescription(List.of(contextUri), serviceOfferingSchema.getHolder(), serviceOfferingSchema.getIssuer(), serviceOfferingSchema.getExternalId(), null);
-        serviceOfferingSD.put("type", "ServiceOffering");
-        serviceOfferingSD.put("bpn", serviceOfferingSchema.getHolder());
-        serviceOfferingSD.put("providedBy", serviceOfferingSchema.getProvidedBy());
-        serviceOfferingSD.put("aggregationOf", aggregationOf);
-        serviceOfferingSD.put("termsAndConditions", termsAndConditions);
-        serviceOfferingSD.put("policy", policy);
-        serviceOfferingSD.put("dataAccountExport", List.of(
+
+        var serviceOfferingSD = new SelfDescription(serviceOfferingSchema.getExternalId());
+        var serviceOfferingVc = new LinkedHashMap<String, Object>();
+
+        serviceOfferingVc.put("type", "ServiceOffering");
+        serviceOfferingVc.put("bpn", serviceOfferingSchema.getHolder());
+        serviceOfferingVc.put("providedBy", serviceOfferingSchema.getProvidedBy());
+        serviceOfferingVc.put("aggregationOf", aggregationOf);
+        serviceOfferingVc.put("termsAndConditions", termsAndConditions);
+        serviceOfferingVc.put("policy", policy);
+        serviceOfferingVc.put("dataAccountExport", List.of(
                 new DataAccountExportSchema()
                         .requestType(DataAccountExportSchema.RequestTypeEnum.EMAIL)
                         .accessType(DataAccountExportSchema.AccessTypeEnum.DIGITAL)
                         .formatType("json")
                 )
         );
+
+        var legalParticipantSD = VerifiableCredential.builder()
+                .context(contextUri)
+                .issuer(URI.create(serviceOfferingSchema.getIssuer()))
+                .credentialSubject(CredentialSubject.fromMap(serviceOfferingVc))
+                .build();
+        serviceOfferingSD.getVerifiableCredentialList().add(legalParticipantSD);
+
         return serviceOfferingSD;
     }
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f7d2837f..b50059d9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2022,2024 T-Systems International GmbH
-# Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2025 T-Systems International GmbH
+# Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -29,7 +29,7 @@ spring:
   jackson:
     default-property-inclusion: non_null
   profiles:
-    active: catena-x-ctx
+    active: tagus-ctx
   security:
     oauth2:
       resourceserver:
@@ -39,15 +39,25 @@ springdoc:
   api-docs:
     enabled: true
   swagger-ui:
-    url: /SDFactoryApi-vRel3.yml
+    url: /SDFactoryApi-Tagus.yml
 app:
   build:
     version: ^project.version^
   verifiableCredentials:
     durationDays: 90
     #schema2210Url: 
-    gaia-x-participant-schema: https://registry.lab.gaia-x.eu/development/api/trusted-schemas-registry/v2/schemas
+    gaia-x-participant-schema: https://registry.lab.gaia-x.eu/development/api/trusted-shape-registry/v1/shapes/jsonld/trustframework#
     gaia-x-service-schema: https://gaia-x.gitlab.io/gaia-x-community/gaia-x-self-descriptions/service/ontology.json
+    gaia-x-policy:
+    gaia-x-dataAccountExport:
+      "[gx:requestType]": API
+      "[gx:accessType]":
+      "[gx:formatType]": application/json
+    gaia-x-termsAndConditions:
+      "[gx:URL]":
+      "[gx:hash]":
+    gaia-x-dataProtectionRegime:
+      - GDPR12345
   usersDetails:
     clearingHouse:
       #uri: https://validation.example.com/api/v1/compliance
diff --git a/src/main/resources/static/SDFactoryApi-Tagus.yml b/src/main/resources/static/SDFactoryApi-Tagus.yml
new file mode 100644
index 00000000..33e255b0
--- /dev/null
+++ b/src/main/resources/static/SDFactoryApi-Tagus.yml
@@ -0,0 +1,277 @@
+#################################################################################
+# Copyright (c) 2022,2025 T-Systems International GmbH
+# Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Apache License, Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0.
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+################################################################################
+
+openapi: 3.0.0
+info:
+  version: TagusRelease
+  title: SD-Factory API
+  description: API for creating and storing the Verifiable Credentials
+paths:
+  /api/tagus/selfdescription:
+    post:
+      summary: Creates a Verifiable Credential and returns it
+      operationId: selfdescriptionPost
+      requestBody:
+        required: true
+        description: parameters to generate VC
+        content:
+          application/json:
+            schema:
+              oneOf:
+                - $ref: '#/components/schemas/LegalParticipantSchema'
+                - $ref: '#/components/schemas/ServiceOfferingSchema'
+              discriminator:
+                propertyName: type
+                mapping:
+                  LegalParticipant: '#/components/schemas/LegalParticipantSchema'
+                  ServiceOffering: '#/components/schemas/ServiceOfferingSchema'
+            examples:
+              LegalParticipant:
+                description: payload to create LegalParticipant
+                value:
+                    externalId: ID01234-123-4321
+                    type: LegalParticipant
+                    holder: BPNL000000000000
+                    name: Legal Participant Company Name
+                    registrationNumber:
+                      - type: leiCode
+                        value: 123345345XYZ
+                    headquarterAddress.countrySubdivisionCode: DE-BY
+                    legalAddress.countrySubdivisionCode: DE-NW
+                    attachment:
+                      - "@context":
+                          - https://w3id.org/security/suites/jws-2020/v1
+                          - https://www.w3.org/2018/credentials/v1
+                        type: VerifiableCredential
+                        id: https://resource.self.description.url1.com
+                        issuer: did:web:sample.self.example.com:v1
+                        issuanceDate:
+                        credentialSubject:
+                          "@context":
+                          id: https://resource.self.description.url1.com
+                          type: gx:GaiaXTermsAndConditions
+                          gx:termsAndConditions: |
+                            The PARTICIPANT signing the Self-Description agrees as follows:
+                            - to update its descriptions about any changes, be it technical, organizational, or legal - especially but not limited to contractual in regards to the indicated attributes present in the descriptions.
+
+                            The keypair used to sign Verifiable Credentials will be revoked where Gaia-X Association becomes aware of any inaccurate statements in regards to the claims which result in a non-compliance with the Trust Framework and policy rules defined in the Policy Rules and Labelling Document (PRLD)
+                        proof:
+                          type:
+                          created:
+                          proofPurpose:
+                          verificationMethod:
+                          jws:
+              ServiceOffering:
+                description: payload to create ServiceOffering
+                value:
+                  externalId: ID01234-123-4321
+                  type: ServiceOffering
+                  holder: BPNL000000000000
+                  termsAndConditions:
+                    gx:URL:
+                    gx:hash:
+                  providedBy: https://participant.url
+                  policy:
+                  dataProtectionRegime:
+                    - GDPR2016
+                  dataAccountExport:
+                    gx:requestType: API
+                    gx:accessType:
+                    gx:formatType: application/json
+                  connectorUrl: https://company.connector-url.org/
+                  attachment:
+                    - "@context":
+                        - https://www.w3.org/2018/credentials/v1
+                        - https://registry.lab.gaia-x.eu/development/api/trusted-shape-registry/v1/shapes/jsonld/trustframework#
+                        - https://w3id.org/security/suites/jws-2020/v1
+                      type:
+                        - VerifiableCredential
+                      id:
+                      credentialSubject:
+                        id: http://catena-x.net/bpn/BPNL000000000000
+                        type: gx:LegalParticipant
+                        bpn: BPNL000000000000
+                        gx:legalName:
+                        gx:headquarterAddress:
+                          gx:countrySubdivisionCode: DE-BY
+                        gx:legalAddress:
+                          gx:countrySubdivisionCode: DE-NW
+                        gx:legalRegistrationNumber:
+                          id:
+                      issuer: did:web:sample.xyz.example.com:v1
+                      issuanceDate:
+                      proof:
+                          type:
+                          created:
+                          proofPurpose:
+                          jws:
+                          verificationMethod:
+                    - "@context":
+                        - https://www.w3.org/2018/credentials/v1
+                        - https://w3id.org/security/suites/jws-2020/v1
+                      type:
+                        - VerifiableCredential
+                      id:
+                      issuer:
+                      issuanceDate:
+                      credentialSubject:
+                        "@context": https://registry.lab.gaia-x.eu/development/api/trusted-shape-registry/v1/shapes/jsonld/trustframework#
+                        id:
+                        type: gx:legalRegistrationNumber
+                        gx:vatID:
+                        gx:vatID-countryCode: DE
+                        gx:leiCode:
+                        gx:leiCode-countryCode: DE
+                        gx:leiCode-subdivisionCountryCode": DE-HE
+                      evidence:
+                        - gx:evidenceURL:
+                          gx:executionDate:
+                          gx:evidenceOf:
+                        - gx:evidenceURL:
+                          gx:executionDate:
+                          gx:evidenceOf:
+                      proof:
+                        type:
+                        created:
+                        proofPurpose:
+                        verificationMethod:
+                        jws:
+      responses:
+        '202':
+          description: request has been accepted for processing
+components:
+  securitySchemes:
+    bearerAuth: # arbitrary name for the security scheme
+      type: http
+      scheme: bearer
+      bearerFormat: JWT    # optional, arbitrary value for documentation purposes
+  schemas:
+    SelfDescriptionSchema:
+      type: object
+      properties:
+        type:
+          type: string
+        holder:
+          type: string
+        externalId:
+          type: string
+        attachment:
+          type: array
+          description: any VC that can be attached to a resource
+          items: {}
+          minItems: 1
+          maxItems: 10
+      required:
+        - type
+        - holder
+        - externalId
+    RegistrationNumberSchema:
+      type: object
+      description: Registration Number element
+      properties:
+        type:
+          type: string
+          description: the mean to request data retrieval
+          enum:
+            - taxID
+            - vatID
+            - EUID
+            - EORI
+            - leiCode
+        value:
+          type: string
+          description: Registration Number value
+          minLength: 1
+          maxLength: 128
+    LegalParticipantSchema:
+      type: object
+      allOf:
+        - $ref: '#/components/schemas/SelfDescriptionSchema'
+        - type: object
+          properties:
+            name:
+              type: string
+            registrationNumber:
+              type: array
+              uniqueItems: true
+              minItems: 1
+              maxItems: 512
+              description: A list of registration numbers
+              items:
+                $ref: '#/components/schemas/RegistrationNumberSchema'
+            headquarterAddress.countrySubdivisionCode:
+              type: string
+            legalAddress.countrySubdivisionCode:
+              type: string
+          required:
+            - registrationNumber
+            - headquarterAddress.countrySubdivisionCode
+            - legalAddress.countrySubdivisionCode
+    ServiceOfferingSchema:
+      type: object
+      allOf:
+        - $ref: '#/components/schemas/SelfDescriptionSchema'
+        - type: object
+          properties:
+            aggregationOf:
+              type: array
+              uniqueItems: true
+              minItems: 1
+              maximum: 512
+              items:
+                type: string
+                format: uri
+            termsAndConditions:
+              type: object
+              properties:
+                gx:URL:
+                  type: string
+                gx:hash:
+                  type: string
+            providedBy:
+              type: String
+              format: uri
+            policy:
+              type: string
+              format: uri
+            dataProtectionRegime:
+              type: array
+              uniqueItems: true
+              minItems: 1
+              maximum: 10
+              items:
+                type: string
+            dataAccountExport:
+              type: object
+              properties:
+                gx:requestType:
+                  type: string
+                gx:accessType:
+                  type: string
+                gx:formatType:
+                  type: string
+            connectorUrl:
+              type: string
+              format: uri
+          required:
+            - providedBy
+            - connectorUrl
+security:
+  - bearerAuth: []
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index 24ce6998..a3f8a5a1 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2022,2023 T-Systems International GmbH
-# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2025 T-Systems International GmbH
+# Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -46,9 +46,18 @@ app:
   verifiableCredentials:
     durationDays: 90
     schema2210Url: https://github.com/eclipse-tractusx/sd-factory/blob/main/src/main/resources/verifiablecredentials/sd-document-v2210.jsonld
-    gaia-x-participant-schema: https://registry.lab.gaia-x.eu/development/api/trusted-schemas-registry/v2/schemas
+    gaia-x-participant-schema: https://registry.lab.gaia-x.eu/development/api/trusted-shape-registry/v1/shapes/jsonld/trustframework#
     gaia-x-service-schema: https://gaia-x.gitlab.io/gaia-x-community/gaia-x-self-descriptions/service/ontology.json
-    catena-x-schema: https://github.com/eclipse-tractusx/sd-factory/blob/main/src/main/resources/verifiablecredentials.jsonld/catenax.jsonld
+    gaia-x-policy: https://<policy.example.com>/policy
+    gaia-x-dataAccountExport:
+      "[gx:requestType]": API
+      "[gx:accessType]":
+      "[gx:formatType]": application/json
+    gaia-x-termsAndConditions:
+      "[gx:URL]":
+      "[gx:hash]":
+    gaia-x-dataProtectionRegime:
+      - GDPR12345
   usersDetails:
     custodianWallet:
       uri: https://<miw.example.com>/api