diff --git a/plugins/auth0/pkg/app/assets/transform_template.tmpl b/plugins/auth0/pkg/app/assets/transform_template.tmpl
index 8f912945..52d96129 100644
--- a/plugins/auth0/pkg/app/assets/transform_template.tmpl
+++ b/plugins/auth0/pkg/app/assets/transform_template.tmpl
@@ -98,40 +98,40 @@
   "relations":[
   {{ if eq $object_type "user" }}
       {
+        "object_type": "user",
+        "object_id": "{{ $user_object_id }}",
         "relation": "identifier",
-        "subject_type": "user",
-        "subject_id": "{{ $user_object_id }}",
-        "object_type": "identity",
-        "object_id": "{{ $.user_id }}"
+        "subject_type": "identity",
+        "subject_id": "{{ $.user_id }}"
       }
     {{ if $.email }}
     ,
       {
+        "object_type": "user",
+        "object_id": "{{ $user_object_id }}",
         "relation": "identifier",
-        "subject_type": "user",
-        "subject_id": "{{ $user_object_id }}",
-        "object_type": "identity",
-        "object_id": "{{ $.email }}"
+        "subject_type": "identity",
+        "subject_id": "{{ $.email }}"
       }
     {{ end }}
     {{ if and ($.username) (ne $.username "") }}
     ,
       {
+        "object_type": "user",
+        "object_id": "{{ $user_object_id }}",
         "relation": "identifier",
-        "subject_type": "user",
-        "subject_id": "{{ $user_object_id }}",
-        "object_type": "identity",
-        "object_id": "{{ $.username }}"
+        "subject_type": "identity",
+        "subject_id": "{{ $.username }}"
       }
     {{ end }}
     {{ if and ($.phone_number) (ne $.phone_number "") ($.phone_verified) }}
     ,
       {
+        "object_type": "user",
+        "object_id": "{{ $user_object_id }}",
         "relation": "identifier",
-        "subject_type": "user",
-        "subject_id": "{{ $user_object_id }}",
-        "object_type": "identity",
-        "object_id": "{{ $.phone_number }}"
+        "subject_type": "identity",
+        "subject_id": "{{ $.phone_number }}"
       }
     {{ end }}
     {{ if $.roles }}, {{ end }}
diff --git a/plugins/azuread/pkg/app/assets/transform_template.tmpl b/plugins/azuread/pkg/app/assets/transform_template.tmpl
index c9544aac..44c0a752 100644
--- a/plugins/azuread/pkg/app/assets/transform_template.tmpl
+++ b/plugins/azuread/pkg/app/assets/transform_template.tmpl
@@ -86,27 +86,27 @@
   ],
   "relations":[  
     {
-      "object_type": "identity",
+      "object_type": "user",
       "object_id": "{{$.id}}",
       "relation": "identifier",
-      "subject_type": "user",
+      "subject_type": "identity",
       "subject_id": "{{$.id}}"
     },
     {
-      "object_type": "identity",
-      "object_id": "{{$email}}",
+      "object_type": "user",
+      "object_id": "{{$.id}}",
       "relation": "identifier",
-      "subject_type": "user",
-      "subject_id":  "{{$.id}}"
+      "subject_type": "identity",
+      "subject_id":  "{{$email}}"
     }
     {{ if $.mobilePhone }}
     ,
     {
-      "object_type": "identity",
-      "object_id": "{{$.mobilePhone}}",
+      "object_type": "user",
+      "object_id": "{{$.id}}",
       "relation": "identifier",
-      "subject_type": "user",
-      "subject_id": "{{$.id}}"
+      "subject_type": "identity",
+      "subject_id": "{{$.mobilePhone}}"
     }
     {{ end }}
     {{ if $.memberOf }}, {{ end }}
diff --git a/plugins/azureadb2c/pkg/app/assets/transform_template.tmpl b/plugins/azureadb2c/pkg/app/assets/transform_template.tmpl
index c9544aac..6dc14d96 100644
--- a/plugins/azureadb2c/pkg/app/assets/transform_template.tmpl
+++ b/plugins/azureadb2c/pkg/app/assets/transform_template.tmpl
@@ -85,28 +85,28 @@
     {{ end }}
   ],
   "relations":[  
-    {
-      "object_type": "identity",
+       {
+      "object_type": "user",
       "object_id": "{{$.id}}",
       "relation": "identifier",
-      "subject_type": "user",
+      "subject_type": "identity",
       "subject_id": "{{$.id}}"
     },
     {
-      "object_type": "identity",
-      "object_id": "{{$email}}",
+      "object_type": "user",
+      "object_id": "{{$.id}}",
       "relation": "identifier",
-      "subject_type": "user",
-      "subject_id":  "{{$.id}}"
+      "subject_type": "identity",
+      "subject_id":  "{{$email}}"
     }
     {{ if $.mobilePhone }}
     ,
     {
-      "object_type": "identity",
-      "object_id": "{{$.mobilePhone}}",
+      "object_type": "user",
+      "object_id": "{{$.id}}",
       "relation": "identifier",
-      "subject_type": "user",
-      "subject_id": "{{$.id}}"
+      "subject_type": "identity",
+      "subject_id": "{{$.mobilePhone}}"
     }
     {{ end }}
     {{ if $.memberOf }}, {{ end }}
diff --git a/plugins/cognito/pkg/app/assets/transform_template.tmpl b/plugins/cognito/pkg/app/assets/transform_template.tmpl
index db5b717d..b325dc70 100644
--- a/plugins/cognito/pkg/app/assets/transform_template.tmpl
+++ b/plugins/cognito/pkg/app/assets/transform_template.tmpl
@@ -58,18 +58,18 @@
   "relations":[
   {{ if eq $object_type "user" }}
     {
-      "object_type": "identity",
+      "object_type": "user",
       "object_id": "{{$.Username}}",
       "relation": "identifier",
-      "subject_type": "user",
+      "subject_type": "identity",
       "subject_id": "{{$.Username}}"
     },
     {
-      "object_type": "identity",
-      "object_id": "{{$email}}",
+      "object_type": "user",
+      "object_id": "{{$.Username}}",
       "relation": "identifier",
-      "subject_type": "user",
-      "subject_id": "{{$.Username}}"
+      "subject_type": "identity",
+      "subject_id": "{{$email}}"
     }
 
     {{ if $.Groups }}, {{ end }}
diff --git a/plugins/fusionauth/pkg/app/assets/transform_template.tmpl b/plugins/fusionauth/pkg/app/assets/transform_template.tmpl
index 0700e609..fdadaff4 100644
--- a/plugins/fusionauth/pkg/app/assets/transform_template.tmpl
+++ b/plugins/fusionauth/pkg/app/assets/transform_template.tmpl
@@ -68,17 +68,17 @@
   "relations":[  
     {{ if $.email }}
     {
-      "object_type": "identity",
-      "object_id": "{{ $.id }}",
+      "object_type": "user",
+      "object_id": "{{ $.email }}",
       "relation": "identifier",
-      "subject_type": "user",
-      "subject_id": "{{ $.email }}"
+      "subject_type": "identity",
+      "subject_id": "{{ $.id }}"
     },
     {
-      "object_type": "identity",
+      "object_type": "user",
       "object_id": "{{ $.email }}",
       "relation": "identifier",
-      "subject_type": "user",
+      "subject_type": "identity",
       "subject_id": "{{ $.email }}"
     }
 
diff --git a/plugins/google/pkg/app/assets/transform_template.tmpl b/plugins/google/pkg/app/assets/transform_template.tmpl
index 8ab56ee1..3edf4172 100644
--- a/plugins/google/pkg/app/assets/transform_template.tmpl
+++ b/plugins/google/pkg/app/assets/transform_template.tmpl
@@ -62,17 +62,17 @@
   "relations":[  
     {{ if contains $.kind "admin#directory#user" }}
     {
-      "object_type": "identity",
-      "object_id": "{{$.id}}",
+      "object_type": "user",
+      "object_id": "{{$email}}",
       "relation": "identifier",
-      "subject_type": "user",
-      "subject_id": "{{$email}}"
+      "subject_type": "identity",
+      "subject_id": "{{$.id}}"
     },
     {
-      "object_type": "identity",
+      "object_type": "user",
       "object_id": "{{$email}}",
       "relation": "identifier",
-      "subject_type": "user",
+      "subject_type": "identity",
       "subject_id": "{{$email}}"
     }
     {{ end }}
diff --git a/plugins/ldap/pkg/app/assets/transform_template.tmpl b/plugins/ldap/pkg/app/assets/transform_template.tmpl
index 6d0b4a19..66993e69 100644
--- a/plugins/ldap/pkg/app/assets/transform_template.tmpl
+++ b/plugins/ldap/pkg/app/assets/transform_template.tmpl
@@ -42,21 +42,21 @@
     ],
     "relations":[
       {
-        "object_type": "identity",
+        "object_type": "user",
         "object_id": "{{$.Key}}",
         "relation": "identifier",
-        "subject_type": "user",
+        "subject_type": "identity",
         "subject_id": "{{$.Key}}"
       }
       {{/* if there are emails, create an identity for each of them */}}
       {{ if $.Attributes.mail}}
         {{ range $email := $.Attributes.mail }}
           ,{
-            "object_type": "identity",
-            "object_id": "{{ $email }}",
+            "object_type": "user",
+            "object_id": "{{ $.Key }}",
             "relation": "identifier",
-            "subject_type": "user",
-            "subject_id": "{{$.Key}}"
+            "subject_type": "identity",
+            "subject_id": "{{ $email }}"
           }
         {{ end }}
       {{end}}
diff --git a/plugins/okta/pkg/app/assets/transform_template.tmpl b/plugins/okta/pkg/app/assets/transform_template.tmpl
index f1026fbd..62823d06 100644
--- a/plugins/okta/pkg/app/assets/transform_template.tmpl
+++ b/plugins/okta/pkg/app/assets/transform_template.tmpl
@@ -102,31 +102,31 @@
   {{ if eq $object_type "user" }}
     {
 
-      "object_type": "identity",
+      "object_type": "user",
       "object_id": "{{ $.id }}",
       "relation": "identifier",
-      "subject_type": "user",
+      "subject_type": "identity",
       "subject_id": "{{ $.id }}"
     }
     {{ if and (ne $.profile.email "") ($verified) }}
     ,
     {
-      "subject_type": "user",
-      "subject_id": "{{ $.id }}",
+      "object_type": "user",
+      "object_id": "{{ $.id }}",
       "relation": "identifier",
-      "object_type": "identity",
-      "object_id": "{{ $.profile.email }}"
+      "subject_type": "identity",
+      "subject_id": "{{ $.profile.email }}"
       }
     {{ end }}
 
     {{ if and ($.profile.mobilePhone) (ne $.profile.mobilePhone "") ($verified) }}
     ,
     {
-      "object_type": "identity",
-      "object_id": "{{ phoneIso3166 $.profile.mobilePhone }}
+      "object_type": "user",
+      "object_id": "{{ $.id }},
       "relation": "identifier",
-      "subject_type": "user",
-      "subject_id": "{{ $.id }}"
+      "subject_type": "identity",
+      "subject_id": "{{ phoneIso3166 $.profile.mobilePhone }}"
     }
     {{ end }}
     {{ if $.roles }}, {{ end }}