diff --git a/api/openapi-spec/v1.0.yaml b/api/openapi-spec/v1.0.yaml
index 7ef7a5e..5670c71 100644
--- a/api/openapi-spec/v1.0.yaml
+++ b/api/openapi-spec/v1.0.yaml
@@ -1957,6 +1957,7 @@ paths:
                   displayName: Max Mustermann
                   mail: max.musterman@example.org
                   primaryRole: student
+                  userType: Member
                   identities:
                     - issuer: idp.school.com
                       issuerAssignedId: max.mustermann
@@ -2076,6 +2077,7 @@ paths:
                 givenName: Max
                 mail: max.musterman@new.domain
                 primaryRole: student
+                userType: Member
                 identities:
                   - issuer: idp.school.com
                     issuerAssignedId: max.mustermann
@@ -2290,6 +2292,7 @@ paths:
                   givenName: Max
                   mail: max.musterman@example.org
                   primariyRole: student
+                  userType: Member
                   identities:
                     - issuer: idp.school.com
                       issuerAssignedId: max.mustermann
@@ -2644,6 +2647,7 @@ paths:
                   givenName: Max
                   mail: max.musterman@example.org
                   primariyRole: student
+                  userType: Member
                   identities:
                     - issuer: idp.school.com
                       issuerAssignedId: max.mustermann
@@ -2746,6 +2750,7 @@ paths:
                   givenName: Max
                   mail: max.musterman@example.org
                   primariyRole: teacher
+                  userType: Member
                   identities:
                     - issuer: idp.school.com
                       issuerAssignedId: max.mustermann
@@ -3149,6 +3154,9 @@ components:
         displayName:
           type: string
           description: 'The name displayed in the address book for the user. This value is usually the combination of the user''s first name, middle initial, and last name. This property is required when a user is created and it cannot be cleared during updates. Returned by default. Supports $orderby.'
+        givenName:
+          type: string
+          description: The user's givenName. Returned by default.
         drives:
           type: array
           items:
@@ -3181,15 +3189,14 @@ components:
         surname:
           type: string
           description: The user's surname (family name or last name). Returned by default.
-        givenName:
-          type: string
-          description: The user's givenName. Returned by default.
         primaryRole:
           type: string
+          enum: [student, teacher]
           description: 'The user`s default role. Such as "student" or "teacher"'
         userType:
           type: string
-          description: 'The user`s type. This can be either "Member" for regular user, or "Guest" for guest users.'
+          enum: [Member, Guest]
+          description: 'A string value that can be used to classify user types in your directory, such as ''Member'' and ''Guest''. Returned only on $select. Supports $filter.'
     drive:
       description: The drive represents a space on the storage.
       type: object
@@ -4684,6 +4691,7 @@ components:
         givenName: Max
         mail: max.musterman@example.org
         primaryRole: student
+        userType: Member
         identities:
           - issuer: idp.school.com
             issuerAssignedId: max.mustermann
@@ -4695,6 +4703,7 @@ components:
         givenName: Max
         mail: max.musterman@example.org
         primaryRole: student
+        userType: Member
         identities:
           - issuer: idp.school.com
             issuerAssignedId: max.mustermann