diff --git a/gf-test-2026/test/eOverdracht-policy.json b/gf-test-2026/test/eOverdracht-policy.json
index 64bd26e..dc131cf 100644
--- a/gf-test-2026/test/eOverdracht-policy.json
+++ b/gf-test-2026/test/eOverdracht-policy.json
@@ -21,11 +21,25 @@
       "id": "pd_any_care_organization",
       "name": "Care organization",
       "purpose": "Finding a care organization",
+      "submission_requirements": [
+        {
+          "name": "Required credentials",
+          "rule": "all",
+          "from": "required"
+        },
+        {
+          "name": "Optional credentials",
+          "rule": "pick",
+          "min": 0,
+          "from": "optional"
+        }
+      ],
       "input_descriptors": [
         {
           "id": "id_uzicert_uracredential",
           "name": "Care organization identity from fake UZI-server certificate",
           "purpose": "Finding a care organization for authorizing access to medical metadata.",
+          "group": ["required"],
           "constraints": {
             "fields": [
               {
@@ -66,6 +80,77 @@
               }
             ]
           }
+        },
+        {
+          "id": "id_dezicredential",
+          "group": ["optional"],
+          "constraints": {
+            "fields": [
+              {
+                "path": [
+                  "$.type"
+                ],
+                "filter": {
+                  "type": "string",
+                  "const": "DeziUserCredential"
+                }
+              },
+              {
+                "id": "organization_ura_dezi",
+                "path": [
+                  "$.credentialSubject.identifier"
+                ],
+                "filter": {
+                  "type": "string"
+                }
+              },
+              {
+                "id": "user_id",
+                "path": [
+                  "$.credentialSubject.employee.identifier"
+                ],
+                "filter": {
+                  "type": "string"
+                }
+              },
+              {
+                "id": "user_initials",
+                "path": [
+                  "$.credentialSubject.employee.initials"
+                ],
+                "filter": {
+                  "type": "string"
+                }
+              },
+              {
+                "id": "user_surname",
+                "path": [
+                  "$.credentialSubject.employee.surname"
+                ],
+                "filter": {
+                  "type": "string"
+                }
+              },
+              {
+                "id": "user_surname_prefix",
+                "path": [
+                  "$.credentialSubject.employee.surnamePrefix"
+                ],
+                "filter": {
+                  "type": "string"
+                }
+              },
+              {
+                "id": "user_role",
+                "path": [
+                  "$.credentialSubject.employee.role"
+                ],
+                "filter": {
+                  "type": "string"
+                }
+              }
+            ]
+          }
         }
       ]
     }
@@ -92,11 +177,25 @@
       "id": "pd_any_care_organization",
       "name": "Care organization",
       "purpose": "Finding a care organization",
+      "submission_requirements": [
+        {
+          "name": "Required credentials",
+          "rule": "all",
+          "from": "required"
+        },
+        {
+          "name": "User identity",
+          "rule": "pick",
+          "min": 0,
+          "from": "user-identity"
+        }
+      ],
       "input_descriptors": [
         {
           "id": "id_uzicert_uracredential",
           "name": "Care organization identity from fake UZI-server certificate",
           "purpose": "Finding a care organization for authorizing access to medical metadata.",
+          "group": ["required"],
           "constraints": {
             "fields": [
               {
@@ -137,6 +236,77 @@
               }
             ]
           }
+        },
+        {
+          "id": "id_dezicredential",
+          "group": ["user-identity"],
+          "constraints": {
+            "fields": [
+              {
+                "path": [
+                  "$.type"
+                ],
+                "filter": {
+                  "type": "string",
+                  "const": "DeziUserCredential"
+                }
+              },
+              {
+                "id": "organization_ura_dezi",
+                "path": [
+                  "$.credentialSubject.identifier"
+                ],
+                "filter": {
+                  "type": "string"
+                }
+              },
+              {
+                "id": "user_id",
+                "path": [
+                  "$.credentialSubject.employee.identifier"
+                ],
+                "filter": {
+                  "type": "string"
+                }
+              },
+              {
+                "id": "user_initials",
+                "path": [
+                  "$.credentialSubject.employee.initials"
+                ],
+                "filter": {
+                  "type": "string"
+                }
+              },
+              {
+                "id": "user_surname",
+                "path": [
+                  "$.credentialSubject.employee.surname"
+                ],
+                "filter": {
+                  "type": "string"
+                }
+              },
+              {
+                "id": "user_surname_prefix",
+                "path": [
+                  "$.credentialSubject.employee.surnamePrefix"
+                ],
+                "filter": {
+                  "type": "string"
+                }
+              },
+              {
+                "id": "user_role",
+                "path": [
+                  "$.credentialSubject.employee.role"
+                ],
+                "filter": {
+                  "type": "string"
+                }
+              }
+            ]
+          }
         }
       ]
     }
diff --git a/gf-test-2026/test/medicatieoverdracht-policy.json b/gf-test-2026/test/medicatieoverdracht-policy.json
index 320edc3..ccce6cb 100644
--- a/gf-test-2026/test/medicatieoverdracht-policy.json
+++ b/gf-test-2026/test/medicatieoverdracht-policy.json
@@ -22,11 +22,25 @@
       "id": "pd_any_care_organization",
       "name": "Care organization",
       "purpose": "Finding a care organization and practitioner",
+      "submission_requirements": [
+        {
+          "name": "Required credentials",
+          "rule": "all",
+          "from": "required"
+        },
+        {
+          "name": "User identity",
+          "rule": "pick",
+          "min": 0,
+          "from": "user-identity"
+        }
+      ],
       "input_descriptors": [
         {
           "id": "id_uzicert_uracredential",
           "name": "Care organization identity from fake UZI-server certificate",
           "purpose": "Finding a care organization for authorizing access to medical metadata.",
+          "group": ["required"],
           "constraints": {
             "fields": [
               {
@@ -76,6 +90,7 @@
         {
           "id": "id_patient_enrollment",
           "name": "The patient enrollment credential",
+          "group": ["required"],
           "constraints": {
             "fields": [
               {
@@ -123,6 +138,7 @@
         {
           "id": "id_healthcare_professional_delegation",
           "name": "The healthcare professional delegation credential",
+          "group": ["required"],
           "constraints": {
             "fields": [
               {
@@ -169,6 +185,7 @@
         },
         {
           "id": "id_dezicredential",
+          "group": ["user-identity"],
           "constraints": {
             "fields": [
               {
@@ -177,7 +194,7 @@
                 ],
                 "filter": {
                   "type": "string",
-                  "const": "DeziIDTokenCredential"
+                  "const": "DeziUserCredential"
                 }
               },
               {
@@ -228,8 +245,7 @@
               {
                 "id": "user_role",
                 "path": [
-                  "$.credentialSubject.employee.roles[0]",
-                  "$.credentialSubject.employee.roles"
+                  "$.credentialSubject.employee.role"
                 ],
                 "filter": {
                   "type": "string"