diff --git a/credentialSchemas/certificateOfRegistration/2024.9.1/schema.json b/credentialSchemas/certificateOfRegistration/2024.9.1/schema.json
index 9bd78d6..c255ba4 100644
--- a/credentialSchemas/certificateOfRegistration/2024.9.1/schema.json
+++ b/credentialSchemas/certificateOfRegistration/2024.9.1/schema.json
@@ -1,63 +1,76 @@
 {
   "type": "object",
   "properties": {
-    "name": {
-      "type": "string"
+    "activity": {
+      "type": "string",
+      "limitDisclosure": true
     },
     "legalForm": {
-      "type": "string"
+      "type": "string",
+      "limitDisclosure": true
     },
-    "activity": {
-      "type": "string"
+    "legalStatus": {
+      "type": "string",
+      "limitDisclosure": true
     },
-    "registrationDate": {
-      "type": "string"
+    "name": {
+      "type": "string",
+      "limitDisclosure": true
     },
-    "legalStatus": {
-      "type": "string"
+    "orgNumber": {
+      "type": "string",
+      "limitDisclosure": true
     },
     "registeredAddress": {
       "type": "object",
+      "limitDisclosure": true,
       "properties": {
-        "fullAddress": {
-          "type": "string"
+        "adminUnitLevel1": {
+          "type": "string",
+          "limitDisclosure": true
         },
-        "thoroughFare": {
-          "type": "string"
+        "fullAddress": {
+          "type": "string",
+          "limitDisclosure": true
         },
         "locatorDesignator": {
-          "type": "string"
+          "type": "string",
+          "limitDisclosure": true
         },
         "postCode": {
-          "type": "string"
+          "type": "string",
+          "limitDisclosure": true
         },
         "postName": {
-          "type": "string"
+          "type": "string",
+          "limitDisclosure": true
         },
-        "adminUnitLevel1": {
-          "type": "string"
+        "thoroughFare": {
+          "type": "string",
+          "limitDisclosure": true
         }
       },
       "required": [
+        "adminUnitLevel1",
         "fullAddress",
-        "thoroughFare",
         "locatorDesignator",
         "postCode",
         "postName",
-        "adminUnitLevel1"
+        "thoroughFare"
       ]
     },
-    "orgNumber": {
-      "type": "string"
+    "registrationDate": {
+      "type": "string",
+      "limitDisclosure": true
     }
   },
   "required": [
-    "name",
-    "legalForm",
     "activity",
-    "registrationDate",
+    "legalForm",
     "legalStatus",
+    "name",
+    "orgNumber",
     "registeredAddress",
-    "orgNumber"
+    "registrationDate"
   ]
-}
\ No newline at end of file
+}
diff --git a/credentialSchemas/lpid/2024.9.1/schema.json b/credentialSchemas/lpid/2024.9.1/schema.json
index 3c2c5d7..b402c09 100644
--- a/credentialSchemas/lpid/2024.9.1/schema.json
+++ b/credentialSchemas/lpid/2024.9.1/schema.json
@@ -2,14 +2,13 @@
   "type": "object",
   "properties": {
     "identifier": {
-      "type": "string"
+      "type": "string",
+      "limitDisclosure": true
     },
     "legalName": {
-      "type": "string"
+      "type": "string",
+      "limitDisclosure": true
     }
   },
-  "required": [
-    "identifier",
-    "legalName"
-  ]
-}
\ No newline at end of file
+  "required": ["identifier", "legalName"]
+}
diff --git a/credentialSchemas/paymentWalletAttestation/2024.12.1/schema.json b/credentialSchemas/paymentWalletAttestation/2024.12.1/schema.json
index 47e554f..d3d3afb 100644
--- a/credentialSchemas/paymentWalletAttestation/2024.12.1/schema.json
+++ b/credentialSchemas/paymentWalletAttestation/2024.12.1/schema.json
@@ -2,26 +2,28 @@
   "type": "object",
   "properties": {
     "account_holder_id": {
-      "type": "string"
+      "type": "string",
+      "limitDisclosure": true
     },
     "accounts": {
       "type": "array",
+      "limitDisclosure": true,
       "items": {
         "properties": {
           "card": {
-            "type": "string"
+            "type": "string",
+            "limitDisclosure": true
           },
           "iban": {
-            "type": "string"
+            "type": "string",
+            "limitDisclosure": true
           }
         },
         "required": [],
-        "type": "object"
+        "type": "object",
+        "limitDisclosure": true
       }
     }
   },
-  "required": [
-    "account_holder_id",
-    "accounts"
-  ]
-}
\ No newline at end of file
+  "required": ["account_holder_id", "accounts"]
+}
diff --git a/credentialSchemas/paymentWalletAttestationv2/2025.2.1/schema.json b/credentialSchemas/paymentWalletAttestationv2/2025.2.1/schema.json
index 951b8d0..66c37d9 100644
--- a/credentialSchemas/paymentWalletAttestationv2/2025.2.1/schema.json
+++ b/credentialSchemas/paymentWalletAttestationv2/2025.2.1/schema.json
@@ -3,40 +3,45 @@
   "properties": {
     "fundingSource": {
       "type": "object",
+      "limitDisclosure": true,
       "properties": {
-        "type": {
+        "aliasId": {
+          "description": "Unique identifier assigned for the funding source.",
           "type": "string",
-          "enum": [
-            "card"
-          ],
-          "description": "Type of funding source."
+          "limitDisclosure": true
         },
-        "panLastFour": {
+        "currency": {
+          "description": "Currency code (ISO 4217, e.g., EUR, USD).",
+          "pattern": "^[A-Z]{3}$",
           "type": "string",
-          "pattern": "^[0-9]{4}$",
-          "description": "Last four digits of the card number."
+          "limitDisclosure": true
         },
-        "iin": {
+        "icon": {
+          "description": "URI to card logo.",
+          "format": "uri",
           "type": "string",
-          "pattern": "^[0-9]{6,8}$",
-          "description": "Issuer Identification Number (IIN)."
+          "limitDisclosure": true
         },
-        "parLastFour": {
+        "iin": {
+          "description": "Issuer Identification Number (IIN).",
+          "pattern": "^[0-9]{6,8}$",
           "type": "string",
-          "maxLength": 4,
-          "description": "Last four characters of the Payment Account Reference (PAR)."
+          "limitDisclosure": true
         },
-        "aliasId": {
+        "panLastFour": {
+          "description": "Last four digits of the card number.",
+          "pattern": "^[0-9]{4}$",
           "type": "string",
-          "description": "Unique identifier assigned for the funding source."
+          "limitDisclosure": true
         },
-        "currency": {
+        "parLastFour": {
+          "description": "Last four characters of the Payment Account Reference (PAR).",
+          "maxLength": 4,
           "type": "string",
-          "pattern": "^[A-Z]{3}$",
-          "description": "Currency code (ISO 4217, e.g., EUR, USD)."
+          "limitDisclosure": true
         },
         "scheme": {
-          "type": "string",
+          "description": "Card scheme.",
           "enum": [
             "Visa",
             "American Express",
@@ -45,26 +50,26 @@
             "Mastercard",
             "UnionPay"
           ],
-          "description": "Card scheme."
+          "type": "string",
+          "limitDisclosure": true
         },
-        "icon": {
+        "type": {
+          "description": "Type of funding source.",
+          "enum": ["card"],
           "type": "string",
-          "format": "uri",
-          "description": "URI to card logo."
+          "limitDisclosure": true
         }
       },
       "required": [
-        "type",
-        "panLastFour",
-        "iin",
         "aliasId",
         "currency",
+        "icon",
+        "iin",
+        "panLastFour",
         "scheme",
-        "icon"
+        "type"
       ]
     }
   },
-  "required": [
-    "fundingSource"
-  ]
-}
\ No newline at end of file
+  "required": ["fundingSource"]
+}
diff --git a/credentialSchemas/pid/2025.2.1/schema.json b/credentialSchemas/pid/2025.2.1/schema.json
index 424522f..fd34367 100644
--- a/credentialSchemas/pid/2025.2.1/schema.json
+++ b/credentialSchemas/pid/2025.2.1/schema.json
@@ -1,65 +1,78 @@
 {
   "type": "object",
   "properties": {
-    "is_over_18": {
-      "type": "boolean"
-    },
-    "is_over_21": {
-      "type": "boolean"
-    },
-    "is_over_65": {
-      "type": "boolean"
-    },
     "address": {
       "type": "object",
+      "limitDisclosure": true,
       "properties": {
-        "street_address": {
-          "type": "string"
+        "country": {
+          "type": "string",
+          "limitDisclosure": true
         },
         "locality": {
-          "type": "string"
+          "type": "string",
+          "limitDisclosure": true
         },
         "region": {
-          "type": "string"
+          "type": "string",
+          "limitDisclosure": true
         },
-        "country": {
-          "type": "string"
+        "street_address": {
+          "type": "string",
+          "limitDisclosure": true
         }
       },
       "required": [
-        "street_address",
+        "country",
         "locality",
         "region",
-        "country"
+        "street_address"
       ]
     },
-    "email": {
+    "birthdate": {
+      "format": "date",
       "type": "string",
-      "format": "email"
+      "limitDisclosure": true
     },
-    "phone_number": {
-      "type": "string"
+    "email": {
+      "format": "email",
+      "type": "string",
+      "limitDisclosure": true
     },
     "family_name": {
-      "type": "string"
-    },
-    "birthdate": {
       "type": "string",
-      "format": "date"
+      "limitDisclosure": true
     },
     "given_name": {
-      "type": "string"
+      "type": "string",
+      "limitDisclosure": true
+    },
+    "is_over_18": {
+      "type": "boolean",
+      "limitDisclosure": true
+    },
+    "is_over_21": {
+      "type": "boolean",
+      "limitDisclosure": true
+    },
+    "is_over_65": {
+      "type": "boolean",
+      "limitDisclosure": true
+    },
+    "phone_number": {
+      "type": "string",
+      "limitDisclosure": true
     }
   },
   "required": [
-    "is_over_18",
-    "is_over_21",
-    "is_over_65",
     "address",
+    "birthdate",
     "email",
-    "phone_number",
     "family_name",
-    "birthdate",
-    "given_name"
+    "given_name",
+    "is_over_18",
+    "is_over_21",
+    "is_over_65",
+    "phone_number"
   ]
 }
\ No newline at end of file