diff --git a/src/main/resources/vc-templates/PassportCh.json b/src/main/resources/vc-templates/PassportCh.json
index 4fdbc0a2..f5bc93a4 100644
--- a/src/main/resources/vc-templates/PassportCh.json
+++ b/src/main/resources/vc-templates/PassportCh.json
@@ -15,13 +15,15 @@
     "credentialSubject": {
         "id": "urn:uri:123",
         "residence": "Schweiz",
-        "canton": "",
+        "canton": "Zug",
+        "address": "Bergstrasse 1",
         "passportNumber": "C7648556",
         "salutation": "",
         "familyName": "DOE",
-        "firstName": "Fidelis",
-        "emailAddress": "",
+        "givenName": "Fidelis",
+        "birthName": "Doe",
         "dateOfBirth": "1930-10-01",
+        "emailAddress": "",
         "placeOfBirth": "Ruemligen BL",
         "height" : "183",
         "gender" : "F",
diff --git a/src/main/resources/vc-templates/VerifiablePortableDocumentA1.json b/src/main/resources/vc-templates/VerifiablePortableDocumentA1.json
index b3001d45..17a8ee7b 100644
--- a/src/main/resources/vc-templates/VerifiablePortableDocumentA1.json
+++ b/src/main/resources/vc-templates/VerifiablePortableDocumentA1.json
@@ -16,7 +16,7 @@
             "sex": "01",
             "surname": "Dalton",
             "forenames": "Joe Jack William Averell",
-            "nameAtBirth": "Default Fidelis",
+            "birthName": "Default Fidelis",
             "dateBirth": "1985-08-15",
             "nationalities": ["BE"],
             "stateOfResidenceAddress": {