diff --git a/charts/scim/templates/config.yaml b/charts/scim/templates/config.yaml
index e7a66a2..fa9512c 100644
--- a/charts/scim/templates/config.yaml
+++ b/charts/scim/templates/config.yaml
@@ -29,14 +29,20 @@ stringData:
     directory:
       {{- include "aserto-lib.controllerClient" . | nindent 6 }}
     scim:
-      create_email_identities: {{ .Values.createEmailIdentities | default "true" }}
-      create_role_groups: {{ .Values.createRoleGroups | default "false" }}
-      user_object_type: {{ .Values.userObjectType | default "user" }}
-      identity_object_type: {{ .Values.identityObjectType | default "identity" }}
-      identity_relation: {{ .Values.identityRelation | default "user#identifier" }}
-      group_object_type: {{ .Values.groupObjectType | default "group" }}
-      group_member_relation: {{ .Values.groupMemberRelation | default "member" }}
-      group_mappings:
-        {{- .Values.groupMappings | default list | toYaml | nindent 8 }}
-      user_mappings:
-        {{- .Values.userMappings | default list | toYaml | nindent 8 }}
+      user:
+        object_type: {{ .Values.user.objectType | default "user" }}
+        identity_object_type: {{ .Values.user.identityObjectType | default "identity" }}
+        identity_relation: {{ .Values.user.identityRelation | default "user#identifier" }}
+        property_mapping:
+          {{- .Values.user.propertyMapping | default list | toYaml | nindent 10 }}
+        source_object_type: {{ .Values.user.sourceObjectType | default "scim_user" }}
+        manager_relation: {{ .Values.user.managerRelation | default "manager" }}
+      group:
+        object_type: {{ .Values.group.objectType | default "group" }}
+        group_member_relation: {{ .Values.group.groupMemberRelation | default "member" }}
+        source_object_type: {{ .Values.group.sourceObjectType | default "scim_group" }}
+      role:
+        object_type: {{ .Values.role.objectType | default "group" }}
+        role_relation: {{ .Values.role.roleRelation | default "member" }}
+      relations:
+        {{- .Values.relations | default list | toYaml | nindent 8 }}
diff --git a/charts/scim/values.yaml b/charts/scim/values.yaml
index 04740ee..c245525 100644
--- a/charts/scim/values.yaml
+++ b/charts/scim/values.yaml
@@ -28,15 +28,31 @@ certSecret:
 #   bearer:
 #     enabled: true
 
-# createEmailIdentities: true
-# createRoleGroups: false
-# userObjectType: user
-# identityObjectType: identity
-# identityRelation: "user#identifier"
-# groupObjectType: group
-# groupMemberRelation: memeber
-# groupMappings: []
-# userMappings: []
+user:
+  # objectType: user
+  # identityObjectType: identifier
+  # identityRelation: "user#identifier"
+  # sourceObjectType: scim_user
+  # managerRelation: manager
+  # propertyMapping:
+  #   enabled: active
+
+group:
+  # objectType: group
+  # groupMemberRelation: member
+  # sourceObjectType: scim_group
+
+role:
+  # objectType: group
+  # roleRelation: member
+
+relations:
+  # - object_id: system
+  #   object_type: system
+  #   relation: admin
+  #   subject_id: aserto-admin
+  #   subject_type: group
+  #   subject_relation: member
 
 # controller:
 #   # Address and port of the controller's gRPC service.