diff --git a/apis/management.cattle.io/v3/authn_types.go b/apis/management.cattle.io/v3/authn_types.go
index 01bd0019..3a84ea0f 100644
--- a/apis/management.cattle.io/v3/authn_types.go
+++ b/apis/management.cattle.io/v3/authn_types.go
@@ -8,16 +8,18 @@ type Token struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	TokenID                  string `json:"tokenId,omitempty"`
-	TokenValue               string `json:"tokenValue,omitempty"`
-	User                     string `json:"user,omitempty"`
-	ExternalID               string `json:"externalId,omitempty"`
-	AuthProvider             string `json:"authProvider,omitempty"`
-	TTLMillis                string `json:"ttl,omitempty"`
-	IdentityRefreshTTLMillis string `json:"identityRefreshTTL,omitempty"`
-	LastUpdateTime           string `json:"lastUpdateTime,omitempty"`
-	IsDerived                bool   `json:"isDerived,omitempty"`
-	Description              string `json:"description,omitempty"`
+	TokenID                  string            `json:"tokenId,omitempty"`
+	UserIdentity             Identity          `json:"userIdentity,omitempty"`
+	GroupIdentities          []Identity        `json:"groupIdentities,omitempty"`
+	ProviderInfo             map[string]string `json:"providerInfo,omitempty"`
+	User                     string            `json:"user,omitempty"`
+	ExternalID               string            `json:"externalId,omitempty"`
+	AuthProvider             string            `json:"authProvider,omitempty"`
+	TTLMillis                string            `json:"ttl,omitempty"`
+	IdentityRefreshTTLMillis string            `json:"identityRefreshTTL,omitempty"`
+	LastUpdateTime           string            `json:"lastUpdateTime,omitempty"`
+	IsDerived                bool              `json:"isDerived,omitempty"`
+	Description              string            `json:"description,omitempty"`
 }
 
 type User struct {
diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go
index a8d6bb19..3497f823 100644
--- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go
+++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go
@@ -2308,6 +2308,21 @@ func (in *Token) DeepCopyInto(out *Token) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.UserIdentity.DeepCopyInto(&out.UserIdentity)
+	if in.GroupIdentities != nil {
+		in, out := &in.GroupIdentities, &out.GroupIdentities
+		*out = make([]Identity, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	if in.ProviderInfo != nil {
+		in, out := &in.ProviderInfo, &out.ProviderInfo
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
 	return
 }
 
diff --git a/apis/management.cattle.io/v3/zz_generated_k8s_client.go b/apis/management.cattle.io/v3/zz_generated_k8s_client.go
index 66309ef4..b7bb0709 100644
--- a/apis/management.cattle.io/v3/zz_generated_k8s_client.go
+++ b/apis/management.cattle.io/v3/zz_generated_k8s_client.go
@@ -28,11 +28,11 @@ type Interface interface {
 	CatalogsGetter
 	TemplatesGetter
 	TemplateVersionsGetter
+	IdentitiesGetter
 	TokensGetter
 	UsersGetter
 	GroupsGetter
 	GroupMembersGetter
-	IdentitiesGetter
 	DynamicSchemasGetter
 }
 
@@ -55,11 +55,11 @@ type Client struct {
 	catalogControllers                    map[string]CatalogController
 	templateControllers                   map[string]TemplateController
 	templateVersionControllers            map[string]TemplateVersionController
+	identityControllers                   map[string]IdentityController
 	tokenControllers                      map[string]TokenController
 	userControllers                       map[string]UserController
 	groupControllers                      map[string]GroupController
 	groupMemberControllers                map[string]GroupMemberController
-	identityControllers                   map[string]IdentityController
 	dynamicSchemaControllers              map[string]DynamicSchemaController
 }
 
@@ -91,11 +91,11 @@ func NewForConfig(config rest.Config) (Interface, error) {
 		catalogControllers:                    map[string]CatalogController{},
 		templateControllers:                   map[string]TemplateController{},
 		templateVersionControllers:            map[string]TemplateVersionController{},
+		identityControllers:                   map[string]IdentityController{},
 		tokenControllers:                      map[string]TokenController{},
 		userControllers:                       map[string]UserController{},
 		groupControllers:                      map[string]GroupController{},
 		groupMemberControllers:                map[string]GroupMemberController{},
-		identityControllers:                   map[string]IdentityController{},
 		dynamicSchemaControllers:              map[string]DynamicSchemaController{},
 	}, nil
 }
@@ -294,6 +294,19 @@ func (c *Client) TemplateVersions(namespace string) TemplateVersionInterface {
 	}
 }
 
+type IdentitiesGetter interface {
+	Identities(namespace string) IdentityInterface
+}
+
+func (c *Client) Identities(namespace string) IdentityInterface {
+	objectClient := clientbase.NewObjectClient(namespace, c.restClient, &IdentityResource, IdentityGroupVersionKind, identityFactory{})
+	return &identityClient{
+		ns:           namespace,
+		client:       c,
+		objectClient: objectClient,
+	}
+}
+
 type TokensGetter interface {
 	Tokens(namespace string) TokenInterface
 }
@@ -346,19 +359,6 @@ func (c *Client) GroupMembers(namespace string) GroupMemberInterface {
 	}
 }
 
-type IdentitiesGetter interface {
-	Identities(namespace string) IdentityInterface
-}
-
-func (c *Client) Identities(namespace string) IdentityInterface {
-	objectClient := clientbase.NewObjectClient(namespace, c.restClient, &IdentityResource, IdentityGroupVersionKind, identityFactory{})
-	return &identityClient{
-		ns:           namespace,
-		client:       c,
-		objectClient: objectClient,
-	}
-}
-
 type DynamicSchemasGetter interface {
 	DynamicSchemas(namespace string) DynamicSchemaInterface
 }
diff --git a/client/management/v3/zz_generated_client.go b/client/management/v3/zz_generated_client.go
index f36ffc87..f19979c6 100644
--- a/client/management/v3/zz_generated_client.go
+++ b/client/management/v3/zz_generated_client.go
@@ -22,11 +22,11 @@ type Client struct {
 	Catalog                    CatalogOperations
 	Template                   TemplateOperations
 	TemplateVersion            TemplateVersionOperations
+	Identity                   IdentityOperations
 	Token                      TokenOperations
 	User                       UserOperations
 	Group                      GroupOperations
 	GroupMember                GroupMemberOperations
-	Identity                   IdentityOperations
 	DynamicSchema              DynamicSchemaOperations
 }
 
@@ -55,11 +55,11 @@ func NewClient(opts *clientbase.ClientOpts) (*Client, error) {
 	client.Catalog = newCatalogClient(client)
 	client.Template = newTemplateClient(client)
 	client.TemplateVersion = newTemplateVersionClient(client)
+	client.Identity = newIdentityClient(client)
 	client.Token = newTokenClient(client)
 	client.User = newUserClient(client)
 	client.Group = newGroupClient(client)
 	client.GroupMember = newGroupMemberClient(client)
-	client.Identity = newIdentityClient(client)
 	client.DynamicSchema = newDynamicSchemaClient(client)
 
 	return client, nil
diff --git a/client/management/v3/zz_generated_token.go b/client/management/v3/zz_generated_token.go
index a941a226..91155cba 100644
--- a/client/management/v3/zz_generated_token.go
+++ b/client/management/v3/zz_generated_token.go
@@ -12,18 +12,20 @@ const (
 	TokenFieldDescription              = "description"
 	TokenFieldExternalID               = "externalId"
 	TokenFieldFinalizers               = "finalizers"
+	TokenFieldGroupIdentities          = "groupIdentities"
 	TokenFieldIdentityRefreshTTLMillis = "identityRefreshTTL"
 	TokenFieldIsDerived                = "isDerived"
 	TokenFieldLabels                   = "labels"
 	TokenFieldLastUpdateTime           = "lastUpdateTime"
 	TokenFieldName                     = "name"
 	TokenFieldOwnerReferences          = "ownerReferences"
+	TokenFieldProviderInfo             = "providerInfo"
 	TokenFieldRemoved                  = "removed"
 	TokenFieldResourcePath             = "resourcePath"
 	TokenFieldTTLMillis                = "ttl"
 	TokenFieldTokenID                  = "tokenId"
-	TokenFieldTokenValue               = "tokenValue"
 	TokenFieldUser                     = "user"
+	TokenFieldUserIdentity             = "userIdentity"
 	TokenFieldUuid                     = "uuid"
 )
 
@@ -35,18 +37,20 @@ type Token struct {
 	Description              string            `json:"description,omitempty"`
 	ExternalID               string            `json:"externalId,omitempty"`
 	Finalizers               []string          `json:"finalizers,omitempty"`
+	GroupIdentities          []Identity        `json:"groupIdentities,omitempty"`
 	IdentityRefreshTTLMillis string            `json:"identityRefreshTTL,omitempty"`
 	IsDerived                *bool             `json:"isDerived,omitempty"`
 	Labels                   map[string]string `json:"labels,omitempty"`
 	LastUpdateTime           string            `json:"lastUpdateTime,omitempty"`
 	Name                     string            `json:"name,omitempty"`
 	OwnerReferences          []OwnerReference  `json:"ownerReferences,omitempty"`
+	ProviderInfo             map[string]string `json:"providerInfo,omitempty"`
 	Removed                  string            `json:"removed,omitempty"`
 	ResourcePath             string            `json:"resourcePath,omitempty"`
 	TTLMillis                string            `json:"ttl,omitempty"`
 	TokenID                  string            `json:"tokenId,omitempty"`
-	TokenValue               string            `json:"tokenValue,omitempty"`
 	User                     string            `json:"user,omitempty"`
+	UserIdentity             *Identity         `json:"userIdentity,omitempty"`
 	Uuid                     string            `json:"uuid,omitempty"`
 }
 type TokenCollection struct {