diff --git a/handler/account/account.go b/handler/account/account.go
index 7efb22b..1081b56 100644
--- a/handler/account/account.go
+++ b/handler/account/account.go
@@ -551,44 +551,36 @@ type EventOut struct {
 type MemberType string
 
 const (
-	MemberTypeAdmin                        MemberType = "admin"
-	MemberTypeDeveloper                    MemberType = "developer"
-	MemberTypeOperator                     MemberType = "operator"
-	MemberTypeOrganizationAppUsersWrite    MemberType = "organization:app_users:write"
-	MemberTypeOrganizationAuditLogsRead    MemberType = "organization:audit_logs:read"
-	MemberTypeOrganizationBillingRead      MemberType = "organization:billing:read"
-	MemberTypeOrganizationBillingWrite     MemberType = "organization:billing:write"
-	MemberTypeOrganizationDomainsWrite     MemberType = "organization:domains:write"
-	MemberTypeOrganizationGroupsWrite      MemberType = "organization:groups:write"
-	MemberTypeOrganizationIdpsWrite        MemberType = "organization:idps:write"
-	MemberTypeOrganizationNetworkRead      MemberType = "organization:network:read"
-	MemberTypeOrganizationNetworkWrite     MemberType = "organization:network:write"
-	MemberTypeOrganizationPermissionsRead  MemberType = "organization:permissions:read"
-	MemberTypeOrganizationPermissionsWrite MemberType = "organization:permissions:write"
-	MemberTypeOrganizationProjectsRead     MemberType = "organization:projects:read"
-	MemberTypeOrganizationProjectsWrite    MemberType = "organization:projects:write"
-	MemberTypeOrganizationUsersWrite       MemberType = "organization:users:write"
-	MemberTypeProjectAuditLogsRead         MemberType = "project:audit_logs:read"
-	MemberTypeProjectIntegrationsRead      MemberType = "project:integrations:read"
-	MemberTypeProjectIntegrationsWrite     MemberType = "project:integrations:write"
-	MemberTypeProjectNetworkingRead        MemberType = "project:networking:read"
-	MemberTypeProjectNetworkingWrite       MemberType = "project:networking:write"
-	MemberTypeProjectPermissionsRead       MemberType = "project:permissions:read"
-	MemberTypeProjectServicesRead          MemberType = "project:services:read"
-	MemberTypeProjectServicesWrite         MemberType = "project:services:write"
-	MemberTypeReadOnly                     MemberType = "read_only"
-	MemberTypeRoleOrganizationAdmin        MemberType = "role:organization:admin"
-	MemberTypeRoleServicesMaintenance      MemberType = "role:services:maintenance"
-	MemberTypeRoleServicesRecover          MemberType = "role:services:recover"
-	MemberTypeServiceConfigurationWrite    MemberType = "service:configuration:write"
-	MemberTypeServiceDataWrite             MemberType = "service:data:write"
-	MemberTypeServiceLogsRead              MemberType = "service:logs:read"
-	MemberTypeServiceSecretsRead           MemberType = "service:secrets:read"
-	MemberTypeServiceUsersWrite            MemberType = "service:users:write"
+	MemberTypeAdmin                     MemberType = "admin"
+	MemberTypeDeveloper                 MemberType = "developer"
+	MemberTypeOperator                  MemberType = "operator"
+	MemberTypeOrganizationAppUsersWrite MemberType = "organization:app_users:write"
+	MemberTypeOrganizationAuditLogsRead MemberType = "organization:audit_logs:read"
+	MemberTypeOrganizationDomainsWrite  MemberType = "organization:domains:write"
+	MemberTypeOrganizationGroupsWrite   MemberType = "organization:groups:write"
+	MemberTypeOrganizationIdpsWrite     MemberType = "organization:idps:write"
+	MemberTypeOrganizationUsersWrite    MemberType = "organization:users:write"
+	MemberTypeProjectAuditLogsRead      MemberType = "project:audit_logs:read"
+	MemberTypeProjectIntegrationsRead   MemberType = "project:integrations:read"
+	MemberTypeProjectIntegrationsWrite  MemberType = "project:integrations:write"
+	MemberTypeProjectNetworkingRead     MemberType = "project:networking:read"
+	MemberTypeProjectNetworkingWrite    MemberType = "project:networking:write"
+	MemberTypeProjectPermissionsRead    MemberType = "project:permissions:read"
+	MemberTypeProjectServicesRead       MemberType = "project:services:read"
+	MemberTypeProjectServicesWrite      MemberType = "project:services:write"
+	MemberTypeReadOnly                  MemberType = "read_only"
+	MemberTypeRoleOrganizationAdmin     MemberType = "role:organization:admin"
+	MemberTypeRoleServicesMaintenance   MemberType = "role:services:maintenance"
+	MemberTypeRoleServicesRecover       MemberType = "role:services:recover"
+	MemberTypeServiceConfigurationWrite MemberType = "service:configuration:write"
+	MemberTypeServiceDataWrite          MemberType = "service:data:write"
+	MemberTypeServiceLogsRead           MemberType = "service:logs:read"
+	MemberTypeServiceSecretsRead        MemberType = "service:secrets:read"
+	MemberTypeServiceUsersWrite         MemberType = "service:users:write"
 )
 
 func MemberTypeChoices() []string {
-	return []string{"admin", "developer", "operator", "organization:app_users:write", "organization:audit_logs:read", "organization:billing:read", "organization:billing:write", "organization:domains:write", "organization:groups:write", "organization:idps:write", "organization:network:read", "organization:network:write", "organization:permissions:read", "organization:permissions:write", "organization:projects:read", "organization:projects:write", "organization:users:write", "project:audit_logs:read", "project:integrations:read", "project:integrations:write", "project:networking:read", "project:networking:write", "project:permissions:read", "project:services:read", "project:services:write", "read_only", "role:organization:admin", "role:services:maintenance", "role:services:recover", "service:configuration:write", "service:data:write", "service:logs:read", "service:secrets:read", "service:users:write"}
+	return []string{"admin", "developer", "operator", "organization:app_users:write", "organization:audit_logs:read", "organization:domains:write", "organization:groups:write", "organization:idps:write", "organization:users:write", "project:audit_logs:read", "project:integrations:read", "project:integrations:write", "project:networking:read", "project:networking:write", "project:permissions:read", "project:services:read", "project:services:write", "read_only", "role:organization:admin", "role:services:maintenance", "role:services:recover", "service:configuration:write", "service:data:write", "service:logs:read", "service:secrets:read", "service:users:write"}
 }
 
 type OrderByType string
@@ -664,44 +656,36 @@ type TeamOut struct {
 type TeamType string
 
 const (
-	TeamTypeAdmin                        TeamType = "admin"
-	TeamTypeOperator                     TeamType = "operator"
-	TeamTypeDeveloper                    TeamType = "developer"
-	TeamTypeReadOnly                     TeamType = "read_only"
-	TeamTypeProjectIntegrationsRead      TeamType = "project:integrations:read"
-	TeamTypeProjectIntegrationsWrite     TeamType = "project:integrations:write"
-	TeamTypeProjectNetworkingRead        TeamType = "project:networking:read"
-	TeamTypeProjectNetworkingWrite       TeamType = "project:networking:write"
-	TeamTypeProjectPermissionsRead       TeamType = "project:permissions:read"
-	TeamTypeServiceConfigurationWrite    TeamType = "service:configuration:write"
-	TeamTypeServiceLogsRead              TeamType = "service:logs:read"
-	TeamTypeProjectServicesRead          TeamType = "project:services:read"
-	TeamTypeProjectServicesWrite         TeamType = "project:services:write"
-	TeamTypeProjectAuditLogsRead         TeamType = "project:audit_logs:read"
-	TeamTypeServiceDataWrite             TeamType = "service:data:write"
-	TeamTypeServiceSecretsRead           TeamType = "service:secrets:read"
-	TeamTypeRoleServicesMaintenance      TeamType = "role:services:maintenance"
-	TeamTypeRoleServicesRecover          TeamType = "role:services:recover"
-	TeamTypeOrganizationBillingRead      TeamType = "organization:billing:read"
-	TeamTypeOrganizationBillingWrite     TeamType = "organization:billing:write"
-	TeamTypeOrganizationAuditLogsRead    TeamType = "organization:audit_logs:read"
-	TeamTypeOrganizationProjectsRead     TeamType = "organization:projects:read"
-	TeamTypeOrganizationProjectsWrite    TeamType = "organization:projects:write"
-	TeamTypeOrganizationUsersWrite       TeamType = "organization:users:write"
-	TeamTypeOrganizationPermissionsRead  TeamType = "organization:permissions:read"
-	TeamTypeOrganizationPermissionsWrite TeamType = "organization:permissions:write"
-	TeamTypeOrganizationAppUsersWrite    TeamType = "organization:app_users:write"
-	TeamTypeOrganizationGroupsWrite      TeamType = "organization:groups:write"
-	TeamTypeOrganizationIdpsWrite        TeamType = "organization:idps:write"
-	TeamTypeOrganizationDomainsWrite     TeamType = "organization:domains:write"
-	TeamTypeOrganizationNetworkRead      TeamType = "organization:network:read"
-	TeamTypeOrganizationNetworkWrite     TeamType = "organization:network:write"
-	TeamTypeRoleOrganizationAdmin        TeamType = "role:organization:admin"
-	TeamTypeServiceUsersWrite            TeamType = "service:users:write"
+	TeamTypeAdmin                     TeamType = "admin"
+	TeamTypeOperator                  TeamType = "operator"
+	TeamTypeDeveloper                 TeamType = "developer"
+	TeamTypeReadOnly                  TeamType = "read_only"
+	TeamTypeProjectIntegrationsRead   TeamType = "project:integrations:read"
+	TeamTypeProjectIntegrationsWrite  TeamType = "project:integrations:write"
+	TeamTypeProjectNetworkingRead     TeamType = "project:networking:read"
+	TeamTypeProjectNetworkingWrite    TeamType = "project:networking:write"
+	TeamTypeProjectPermissionsRead    TeamType = "project:permissions:read"
+	TeamTypeServiceConfigurationWrite TeamType = "service:configuration:write"
+	TeamTypeServiceLogsRead           TeamType = "service:logs:read"
+	TeamTypeProjectServicesRead       TeamType = "project:services:read"
+	TeamTypeProjectServicesWrite      TeamType = "project:services:write"
+	TeamTypeProjectAuditLogsRead      TeamType = "project:audit_logs:read"
+	TeamTypeServiceDataWrite          TeamType = "service:data:write"
+	TeamTypeServiceSecretsRead        TeamType = "service:secrets:read"
+	TeamTypeServiceUsersWrite         TeamType = "service:users:write"
+	TeamTypeRoleServicesMaintenance   TeamType = "role:services:maintenance"
+	TeamTypeRoleServicesRecover       TeamType = "role:services:recover"
+	TeamTypeOrganizationAuditLogsRead TeamType = "organization:audit_logs:read"
+	TeamTypeOrganizationUsersWrite    TeamType = "organization:users:write"
+	TeamTypeOrganizationAppUsersWrite TeamType = "organization:app_users:write"
+	TeamTypeOrganizationGroupsWrite   TeamType = "organization:groups:write"
+	TeamTypeOrganizationIdpsWrite     TeamType = "organization:idps:write"
+	TeamTypeOrganizationDomainsWrite  TeamType = "organization:domains:write"
+	TeamTypeRoleOrganizationAdmin     TeamType = "role:organization:admin"
 )
 
 func TeamTypeChoices() []string {
-	return []string{"admin", "operator", "developer", "read_only", "project:integrations:read", "project:integrations:write", "project:networking:read", "project:networking:write", "project:permissions:read", "service:configuration:write", "service:logs:read", "project:services:read", "project:services:write", "project:audit_logs:read", "service:data:write", "service:secrets:read", "role:services:maintenance", "role:services:recover", "organization:billing:read", "organization:billing:write", "organization:audit_logs:read", "organization:projects:read", "organization:projects:write", "organization:users:write", "organization:permissions:read", "organization:permissions:write", "organization:app_users:write", "organization:groups:write", "organization:idps:write", "organization:domains:write", "organization:network:read", "organization:network:write", "role:organization:admin", "service:users:write"}
+	return []string{"admin", "operator", "developer", "read_only", "project:integrations:read", "project:integrations:write", "project:networking:read", "project:networking:write", "project:permissions:read", "service:configuration:write", "service:logs:read", "project:services:read", "project:services:write", "project:audit_logs:read", "service:data:write", "service:secrets:read", "service:users:write", "role:services:maintenance", "role:services:recover", "organization:audit_logs:read", "organization:users:write", "organization:app_users:write", "organization:groups:write", "organization:idps:write", "organization:domains:write", "role:organization:admin"}
 }
 
 type TechEmailOut struct {
diff --git a/handler/accountteam/accountteam.go b/handler/accountteam/accountteam.go
index bf67645..f6eccf2 100644
--- a/handler/accountteam/accountteam.go
+++ b/handler/accountteam/accountteam.go
@@ -244,44 +244,36 @@ type TeamOut struct {
 type TeamType string
 
 const (
-	TeamTypeAdmin                        TeamType = "admin"
-	TeamTypeOperator                     TeamType = "operator"
-	TeamTypeDeveloper                    TeamType = "developer"
-	TeamTypeReadOnly                     TeamType = "read_only"
-	TeamTypeProjectIntegrationsRead      TeamType = "project:integrations:read"
-	TeamTypeProjectIntegrationsWrite     TeamType = "project:integrations:write"
-	TeamTypeProjectNetworkingRead        TeamType = "project:networking:read"
-	TeamTypeProjectNetworkingWrite       TeamType = "project:networking:write"
-	TeamTypeProjectPermissionsRead       TeamType = "project:permissions:read"
-	TeamTypeServiceConfigurationWrite    TeamType = "service:configuration:write"
-	TeamTypeServiceLogsRead              TeamType = "service:logs:read"
-	TeamTypeProjectServicesRead          TeamType = "project:services:read"
-	TeamTypeProjectServicesWrite         TeamType = "project:services:write"
-	TeamTypeProjectAuditLogsRead         TeamType = "project:audit_logs:read"
-	TeamTypeServiceDataWrite             TeamType = "service:data:write"
-	TeamTypeServiceSecretsRead           TeamType = "service:secrets:read"
-	TeamTypeRoleServicesMaintenance      TeamType = "role:services:maintenance"
-	TeamTypeRoleServicesRecover          TeamType = "role:services:recover"
-	TeamTypeOrganizationBillingRead      TeamType = "organization:billing:read"
-	TeamTypeOrganizationBillingWrite     TeamType = "organization:billing:write"
-	TeamTypeOrganizationAuditLogsRead    TeamType = "organization:audit_logs:read"
-	TeamTypeOrganizationProjectsRead     TeamType = "organization:projects:read"
-	TeamTypeOrganizationProjectsWrite    TeamType = "organization:projects:write"
-	TeamTypeOrganizationUsersWrite       TeamType = "organization:users:write"
-	TeamTypeOrganizationPermissionsRead  TeamType = "organization:permissions:read"
-	TeamTypeOrganizationPermissionsWrite TeamType = "organization:permissions:write"
-	TeamTypeOrganizationAppUsersWrite    TeamType = "organization:app_users:write"
-	TeamTypeOrganizationGroupsWrite      TeamType = "organization:groups:write"
-	TeamTypeOrganizationIdpsWrite        TeamType = "organization:idps:write"
-	TeamTypeOrganizationDomainsWrite     TeamType = "organization:domains:write"
-	TeamTypeOrganizationNetworkRead      TeamType = "organization:network:read"
-	TeamTypeOrganizationNetworkWrite     TeamType = "organization:network:write"
-	TeamTypeRoleOrganizationAdmin        TeamType = "role:organization:admin"
-	TeamTypeServiceUsersWrite            TeamType = "service:users:write"
+	TeamTypeAdmin                     TeamType = "admin"
+	TeamTypeOperator                  TeamType = "operator"
+	TeamTypeDeveloper                 TeamType = "developer"
+	TeamTypeReadOnly                  TeamType = "read_only"
+	TeamTypeProjectIntegrationsRead   TeamType = "project:integrations:read"
+	TeamTypeProjectIntegrationsWrite  TeamType = "project:integrations:write"
+	TeamTypeProjectNetworkingRead     TeamType = "project:networking:read"
+	TeamTypeProjectNetworkingWrite    TeamType = "project:networking:write"
+	TeamTypeProjectPermissionsRead    TeamType = "project:permissions:read"
+	TeamTypeServiceConfigurationWrite TeamType = "service:configuration:write"
+	TeamTypeServiceLogsRead           TeamType = "service:logs:read"
+	TeamTypeProjectServicesRead       TeamType = "project:services:read"
+	TeamTypeProjectServicesWrite      TeamType = "project:services:write"
+	TeamTypeProjectAuditLogsRead      TeamType = "project:audit_logs:read"
+	TeamTypeServiceDataWrite          TeamType = "service:data:write"
+	TeamTypeServiceSecretsRead        TeamType = "service:secrets:read"
+	TeamTypeServiceUsersWrite         TeamType = "service:users:write"
+	TeamTypeRoleServicesMaintenance   TeamType = "role:services:maintenance"
+	TeamTypeRoleServicesRecover       TeamType = "role:services:recover"
+	TeamTypeOrganizationAuditLogsRead TeamType = "organization:audit_logs:read"
+	TeamTypeOrganizationUsersWrite    TeamType = "organization:users:write"
+	TeamTypeOrganizationAppUsersWrite TeamType = "organization:app_users:write"
+	TeamTypeOrganizationGroupsWrite   TeamType = "organization:groups:write"
+	TeamTypeOrganizationIdpsWrite     TeamType = "organization:idps:write"
+	TeamTypeOrganizationDomainsWrite  TeamType = "organization:domains:write"
+	TeamTypeRoleOrganizationAdmin     TeamType = "role:organization:admin"
 )
 
 func TeamTypeChoices() []string {
-	return []string{"admin", "operator", "developer", "read_only", "project:integrations:read", "project:integrations:write", "project:networking:read", "project:networking:write", "project:permissions:read", "service:configuration:write", "service:logs:read", "project:services:read", "project:services:write", "project:audit_logs:read", "service:data:write", "service:secrets:read", "role:services:maintenance", "role:services:recover", "organization:billing:read", "organization:billing:write", "organization:audit_logs:read", "organization:projects:read", "organization:projects:write", "organization:users:write", "organization:permissions:read", "organization:permissions:write", "organization:app_users:write", "organization:groups:write", "organization:idps:write", "organization:domains:write", "organization:network:read", "organization:network:write", "role:organization:admin", "service:users:write"}
+	return []string{"admin", "operator", "developer", "read_only", "project:integrations:read", "project:integrations:write", "project:networking:read", "project:networking:write", "project:permissions:read", "service:configuration:write", "service:logs:read", "project:services:read", "project:services:write", "project:audit_logs:read", "service:data:write", "service:secrets:read", "service:users:write", "role:services:maintenance", "role:services:recover", "organization:audit_logs:read", "organization:users:write", "organization:app_users:write", "organization:groups:write", "organization:idps:write", "organization:domains:write", "role:organization:admin"}
 }
 
 // accountTeamCreateOut AccountTeamCreateResponse
diff --git a/handler/project/project.go b/handler/project/project.go
index f8e470b..739b77f 100644
--- a/handler/project/project.go
+++ b/handler/project/project.go
@@ -447,44 +447,36 @@ type AlloydbomniOut struct {
 type AnyType string
 
 const (
-	AnyTypeAdmin                        AnyType = "admin"
-	AnyTypeDeveloper                    AnyType = "developer"
-	AnyTypeOperator                     AnyType = "operator"
-	AnyTypeOrganizationAppUsersWrite    AnyType = "organization:app_users:write"
-	AnyTypeOrganizationAuditLogsRead    AnyType = "organization:audit_logs:read"
-	AnyTypeOrganizationBillingRead      AnyType = "organization:billing:read"
-	AnyTypeOrganizationBillingWrite     AnyType = "organization:billing:write"
-	AnyTypeOrganizationDomainsWrite     AnyType = "organization:domains:write"
-	AnyTypeOrganizationGroupsWrite      AnyType = "organization:groups:write"
-	AnyTypeOrganizationIdpsWrite        AnyType = "organization:idps:write"
-	AnyTypeOrganizationNetworkRead      AnyType = "organization:network:read"
-	AnyTypeOrganizationNetworkWrite     AnyType = "organization:network:write"
-	AnyTypeOrganizationPermissionsRead  AnyType = "organization:permissions:read"
-	AnyTypeOrganizationPermissionsWrite AnyType = "organization:permissions:write"
-	AnyTypeOrganizationProjectsRead     AnyType = "organization:projects:read"
-	AnyTypeOrganizationProjectsWrite    AnyType = "organization:projects:write"
-	AnyTypeOrganizationUsersWrite       AnyType = "organization:users:write"
-	AnyTypeProjectAuditLogsRead         AnyType = "project:audit_logs:read"
-	AnyTypeProjectIntegrationsRead      AnyType = "project:integrations:read"
-	AnyTypeProjectIntegrationsWrite     AnyType = "project:integrations:write"
-	AnyTypeProjectNetworkingRead        AnyType = "project:networking:read"
-	AnyTypeProjectNetworkingWrite       AnyType = "project:networking:write"
-	AnyTypeProjectPermissionsRead       AnyType = "project:permissions:read"
-	AnyTypeProjectServicesRead          AnyType = "project:services:read"
-	AnyTypeProjectServicesWrite         AnyType = "project:services:write"
-	AnyTypeReadOnly                     AnyType = "read_only"
-	AnyTypeRoleOrganizationAdmin        AnyType = "role:organization:admin"
-	AnyTypeRoleServicesMaintenance      AnyType = "role:services:maintenance"
-	AnyTypeRoleServicesRecover          AnyType = "role:services:recover"
-	AnyTypeServiceConfigurationWrite    AnyType = "service:configuration:write"
-	AnyTypeServiceDataWrite             AnyType = "service:data:write"
-	AnyTypeServiceLogsRead              AnyType = "service:logs:read"
-	AnyTypeServiceSecretsRead           AnyType = "service:secrets:read"
-	AnyTypeServiceUsersWrite            AnyType = "service:users:write"
+	AnyTypeAdmin                     AnyType = "admin"
+	AnyTypeDeveloper                 AnyType = "developer"
+	AnyTypeOperator                  AnyType = "operator"
+	AnyTypeOrganizationAppUsersWrite AnyType = "organization:app_users:write"
+	AnyTypeOrganizationAuditLogsRead AnyType = "organization:audit_logs:read"
+	AnyTypeOrganizationDomainsWrite  AnyType = "organization:domains:write"
+	AnyTypeOrganizationGroupsWrite   AnyType = "organization:groups:write"
+	AnyTypeOrganizationIdpsWrite     AnyType = "organization:idps:write"
+	AnyTypeOrganizationUsersWrite    AnyType = "organization:users:write"
+	AnyTypeProjectAuditLogsRead      AnyType = "project:audit_logs:read"
+	AnyTypeProjectIntegrationsRead   AnyType = "project:integrations:read"
+	AnyTypeProjectIntegrationsWrite  AnyType = "project:integrations:write"
+	AnyTypeProjectNetworkingRead     AnyType = "project:networking:read"
+	AnyTypeProjectNetworkingWrite    AnyType = "project:networking:write"
+	AnyTypeProjectPermissionsRead    AnyType = "project:permissions:read"
+	AnyTypeProjectServicesRead       AnyType = "project:services:read"
+	AnyTypeProjectServicesWrite      AnyType = "project:services:write"
+	AnyTypeReadOnly                  AnyType = "read_only"
+	AnyTypeRoleOrganizationAdmin     AnyType = "role:organization:admin"
+	AnyTypeRoleServicesMaintenance   AnyType = "role:services:maintenance"
+	AnyTypeRoleServicesRecover       AnyType = "role:services:recover"
+	AnyTypeServiceConfigurationWrite AnyType = "service:configuration:write"
+	AnyTypeServiceDataWrite          AnyType = "service:data:write"
+	AnyTypeServiceLogsRead           AnyType = "service:logs:read"
+	AnyTypeServiceSecretsRead        AnyType = "service:secrets:read"
+	AnyTypeServiceUsersWrite         AnyType = "service:users:write"
 )
 
 func AnyTypeChoices() []string {
-	return []string{"admin", "developer", "operator", "organization:app_users:write", "organization:audit_logs:read", "organization:billing:read", "organization:billing:write", "organization:domains:write", "organization:groups:write", "organization:idps:write", "organization:network:read", "organization:network:write", "organization:permissions:read", "organization:permissions:write", "organization:projects:read", "organization:projects:write", "organization:users:write", "project:audit_logs:read", "project:integrations:read", "project:integrations:write", "project:networking:read", "project:networking:write", "project:permissions:read", "project:services:read", "project:services:write", "read_only", "role:organization:admin", "role:services:maintenance", "role:services:recover", "service:configuration:write", "service:data:write", "service:logs:read", "service:secrets:read", "service:users:write"}
+	return []string{"admin", "developer", "operator", "organization:app_users:write", "organization:audit_logs:read", "organization:domains:write", "organization:groups:write", "organization:idps:write", "organization:users:write", "project:audit_logs:read", "project:integrations:read", "project:integrations:write", "project:networking:read", "project:networking:write", "project:permissions:read", "project:services:read", "project:services:write", "read_only", "role:organization:admin", "role:services:maintenance", "role:services:recover", "service:configuration:write", "service:data:write", "service:logs:read", "service:secrets:read", "service:users:write"}
 }
 
 // BackupConfigOut Backup configuration for this service plan
@@ -651,44 +643,36 @@ type KafkaOut struct {
 type MemberType string
 
 const (
-	MemberTypeAdmin                        MemberType = "admin"
-	MemberTypeDeveloper                    MemberType = "developer"
-	MemberTypeOperator                     MemberType = "operator"
-	MemberTypeOrganizationAppUsersWrite    MemberType = "organization:app_users:write"
-	MemberTypeOrganizationAuditLogsRead    MemberType = "organization:audit_logs:read"
-	MemberTypeOrganizationBillingRead      MemberType = "organization:billing:read"
-	MemberTypeOrganizationBillingWrite     MemberType = "organization:billing:write"
-	MemberTypeOrganizationDomainsWrite     MemberType = "organization:domains:write"
-	MemberTypeOrganizationGroupsWrite      MemberType = "organization:groups:write"
-	MemberTypeOrganizationIdpsWrite        MemberType = "organization:idps:write"
-	MemberTypeOrganizationNetworkRead      MemberType = "organization:network:read"
-	MemberTypeOrganizationNetworkWrite     MemberType = "organization:network:write"
-	MemberTypeOrganizationPermissionsRead  MemberType = "organization:permissions:read"
-	MemberTypeOrganizationPermissionsWrite MemberType = "organization:permissions:write"
-	MemberTypeOrganizationProjectsRead     MemberType = "organization:projects:read"
-	MemberTypeOrganizationProjectsWrite    MemberType = "organization:projects:write"
-	MemberTypeOrganizationUsersWrite       MemberType = "organization:users:write"
-	MemberTypeProjectAuditLogsRead         MemberType = "project:audit_logs:read"
-	MemberTypeProjectIntegrationsRead      MemberType = "project:integrations:read"
-	MemberTypeProjectIntegrationsWrite     MemberType = "project:integrations:write"
-	MemberTypeProjectNetworkingRead        MemberType = "project:networking:read"
-	MemberTypeProjectNetworkingWrite       MemberType = "project:networking:write"
-	MemberTypeProjectPermissionsRead       MemberType = "project:permissions:read"
-	MemberTypeProjectServicesRead          MemberType = "project:services:read"
-	MemberTypeProjectServicesWrite         MemberType = "project:services:write"
-	MemberTypeReadOnly                     MemberType = "read_only"
-	MemberTypeRoleOrganizationAdmin        MemberType = "role:organization:admin"
-	MemberTypeRoleServicesMaintenance      MemberType = "role:services:maintenance"
-	MemberTypeRoleServicesRecover          MemberType = "role:services:recover"
-	MemberTypeServiceConfigurationWrite    MemberType = "service:configuration:write"
-	MemberTypeServiceDataWrite             MemberType = "service:data:write"
-	MemberTypeServiceLogsRead              MemberType = "service:logs:read"
-	MemberTypeServiceSecretsRead           MemberType = "service:secrets:read"
-	MemberTypeServiceUsersWrite            MemberType = "service:users:write"
+	MemberTypeAdmin                     MemberType = "admin"
+	MemberTypeDeveloper                 MemberType = "developer"
+	MemberTypeOperator                  MemberType = "operator"
+	MemberTypeOrganizationAppUsersWrite MemberType = "organization:app_users:write"
+	MemberTypeOrganizationAuditLogsRead MemberType = "organization:audit_logs:read"
+	MemberTypeOrganizationDomainsWrite  MemberType = "organization:domains:write"
+	MemberTypeOrganizationGroupsWrite   MemberType = "organization:groups:write"
+	MemberTypeOrganizationIdpsWrite     MemberType = "organization:idps:write"
+	MemberTypeOrganizationUsersWrite    MemberType = "organization:users:write"
+	MemberTypeProjectAuditLogsRead      MemberType = "project:audit_logs:read"
+	MemberTypeProjectIntegrationsRead   MemberType = "project:integrations:read"
+	MemberTypeProjectIntegrationsWrite  MemberType = "project:integrations:write"
+	MemberTypeProjectNetworkingRead     MemberType = "project:networking:read"
+	MemberTypeProjectNetworkingWrite    MemberType = "project:networking:write"
+	MemberTypeProjectPermissionsRead    MemberType = "project:permissions:read"
+	MemberTypeProjectServicesRead       MemberType = "project:services:read"
+	MemberTypeProjectServicesWrite      MemberType = "project:services:write"
+	MemberTypeReadOnly                  MemberType = "read_only"
+	MemberTypeRoleOrganizationAdmin     MemberType = "role:organization:admin"
+	MemberTypeRoleServicesMaintenance   MemberType = "role:services:maintenance"
+	MemberTypeRoleServicesRecover       MemberType = "role:services:recover"
+	MemberTypeServiceConfigurationWrite MemberType = "service:configuration:write"
+	MemberTypeServiceDataWrite          MemberType = "service:data:write"
+	MemberTypeServiceLogsRead           MemberType = "service:logs:read"
+	MemberTypeServiceSecretsRead        MemberType = "service:secrets:read"
+	MemberTypeServiceUsersWrite         MemberType = "service:users:write"
 )
 
 func MemberTypeChoices() []string {
-	return []string{"admin", "developer", "operator", "organization:app_users:write", "organization:audit_logs:read", "organization:billing:read", "organization:billing:write", "organization:domains:write", "organization:groups:write", "organization:idps:write", "organization:network:read", "organization:network:write", "organization:permissions:read", "organization:permissions:write", "organization:projects:read", "organization:projects:write", "organization:users:write", "project:audit_logs:read", "project:integrations:read", "project:integrations:write", "project:networking:read", "project:networking:write", "project:permissions:read", "project:services:read", "project:services:write", "read_only", "role:organization:admin", "role:services:maintenance", "role:services:recover", "service:configuration:write", "service:data:write", "service:logs:read", "service:secrets:read", "service:users:write"}
+	return []string{"admin", "developer", "operator", "organization:app_users:write", "organization:audit_logs:read", "organization:domains:write", "organization:groups:write", "organization:idps:write", "organization:users:write", "project:audit_logs:read", "project:integrations:read", "project:integrations:write", "project:networking:read", "project:networking:write", "project:permissions:read", "project:services:read", "project:services:write", "read_only", "role:organization:admin", "role:services:maintenance", "role:services:recover", "service:configuration:write", "service:data:write", "service:logs:read", "service:secrets:read", "service:users:write"}
 }
 
 // MysqlOut Service type information
diff --git a/handler/user/user.go b/handler/user/user.go
index 6d70a8d..5cc2af9 100644
--- a/handler/user/user.go
+++ b/handler/user/user.go
@@ -515,44 +515,36 @@ func ActionTypeChoices() []string {
 type AnyType string
 
 const (
-	AnyTypeAdmin                        AnyType = "admin"
-	AnyTypeDeveloper                    AnyType = "developer"
-	AnyTypeOperator                     AnyType = "operator"
-	AnyTypeOrganizationAppUsersWrite    AnyType = "organization:app_users:write"
-	AnyTypeOrganizationAuditLogsRead    AnyType = "organization:audit_logs:read"
-	AnyTypeOrganizationBillingRead      AnyType = "organization:billing:read"
-	AnyTypeOrganizationBillingWrite     AnyType = "organization:billing:write"
-	AnyTypeOrganizationDomainsWrite     AnyType = "organization:domains:write"
-	AnyTypeOrganizationGroupsWrite      AnyType = "organization:groups:write"
-	AnyTypeOrganizationIdpsWrite        AnyType = "organization:idps:write"
-	AnyTypeOrganizationNetworkRead      AnyType = "organization:network:read"
-	AnyTypeOrganizationNetworkWrite     AnyType = "organization:network:write"
-	AnyTypeOrganizationPermissionsRead  AnyType = "organization:permissions:read"
-	AnyTypeOrganizationPermissionsWrite AnyType = "organization:permissions:write"
-	AnyTypeOrganizationProjectsRead     AnyType = "organization:projects:read"
-	AnyTypeOrganizationProjectsWrite    AnyType = "organization:projects:write"
-	AnyTypeOrganizationUsersWrite       AnyType = "organization:users:write"
-	AnyTypeProjectAuditLogsRead         AnyType = "project:audit_logs:read"
-	AnyTypeProjectIntegrationsRead      AnyType = "project:integrations:read"
-	AnyTypeProjectIntegrationsWrite     AnyType = "project:integrations:write"
-	AnyTypeProjectNetworkingRead        AnyType = "project:networking:read"
-	AnyTypeProjectNetworkingWrite       AnyType = "project:networking:write"
-	AnyTypeProjectPermissionsRead       AnyType = "project:permissions:read"
-	AnyTypeProjectServicesRead          AnyType = "project:services:read"
-	AnyTypeProjectServicesWrite         AnyType = "project:services:write"
-	AnyTypeReadOnly                     AnyType = "read_only"
-	AnyTypeRoleOrganizationAdmin        AnyType = "role:organization:admin"
-	AnyTypeRoleServicesMaintenance      AnyType = "role:services:maintenance"
-	AnyTypeRoleServicesRecover          AnyType = "role:services:recover"
-	AnyTypeServiceConfigurationWrite    AnyType = "service:configuration:write"
-	AnyTypeServiceDataWrite             AnyType = "service:data:write"
-	AnyTypeServiceLogsRead              AnyType = "service:logs:read"
-	AnyTypeServiceSecretsRead           AnyType = "service:secrets:read"
-	AnyTypeServiceUsersWrite            AnyType = "service:users:write"
+	AnyTypeAdmin                     AnyType = "admin"
+	AnyTypeDeveloper                 AnyType = "developer"
+	AnyTypeOperator                  AnyType = "operator"
+	AnyTypeOrganizationAppUsersWrite AnyType = "organization:app_users:write"
+	AnyTypeOrganizationAuditLogsRead AnyType = "organization:audit_logs:read"
+	AnyTypeOrganizationDomainsWrite  AnyType = "organization:domains:write"
+	AnyTypeOrganizationGroupsWrite   AnyType = "organization:groups:write"
+	AnyTypeOrganizationIdpsWrite     AnyType = "organization:idps:write"
+	AnyTypeOrganizationUsersWrite    AnyType = "organization:users:write"
+	AnyTypeProjectAuditLogsRead      AnyType = "project:audit_logs:read"
+	AnyTypeProjectIntegrationsRead   AnyType = "project:integrations:read"
+	AnyTypeProjectIntegrationsWrite  AnyType = "project:integrations:write"
+	AnyTypeProjectNetworkingRead     AnyType = "project:networking:read"
+	AnyTypeProjectNetworkingWrite    AnyType = "project:networking:write"
+	AnyTypeProjectPermissionsRead    AnyType = "project:permissions:read"
+	AnyTypeProjectServicesRead       AnyType = "project:services:read"
+	AnyTypeProjectServicesWrite      AnyType = "project:services:write"
+	AnyTypeReadOnly                  AnyType = "read_only"
+	AnyTypeRoleOrganizationAdmin     AnyType = "role:organization:admin"
+	AnyTypeRoleServicesMaintenance   AnyType = "role:services:maintenance"
+	AnyTypeRoleServicesRecover       AnyType = "role:services:recover"
+	AnyTypeServiceConfigurationWrite AnyType = "service:configuration:write"
+	AnyTypeServiceDataWrite          AnyType = "service:data:write"
+	AnyTypeServiceLogsRead           AnyType = "service:logs:read"
+	AnyTypeServiceSecretsRead        AnyType = "service:secrets:read"
+	AnyTypeServiceUsersWrite         AnyType = "service:users:write"
 )
 
 func AnyTypeChoices() []string {
-	return []string{"admin", "developer", "operator", "organization:app_users:write", "organization:audit_logs:read", "organization:billing:read", "organization:billing:write", "organization:domains:write", "organization:groups:write", "organization:idps:write", "organization:network:read", "organization:network:write", "organization:permissions:read", "organization:permissions:write", "organization:projects:read", "organization:projects:write", "organization:users:write", "project:audit_logs:read", "project:integrations:read", "project:integrations:write", "project:networking:read", "project:networking:write", "project:permissions:read", "project:services:read", "project:services:write", "read_only", "role:organization:admin", "role:services:maintenance", "role:services:recover", "service:configuration:write", "service:data:write", "service:logs:read", "service:secrets:read", "service:users:write"}
+	return []string{"admin", "developer", "operator", "organization:app_users:write", "organization:audit_logs:read", "organization:domains:write", "organization:groups:write", "organization:idps:write", "organization:users:write", "project:audit_logs:read", "project:integrations:read", "project:integrations:write", "project:networking:read", "project:networking:write", "project:permissions:read", "project:services:read", "project:services:write", "read_only", "role:organization:admin", "role:services:maintenance", "role:services:recover", "service:configuration:write", "service:data:write", "service:logs:read", "service:secrets:read", "service:users:write"}
 }
 
 type AuthenticationMethodOut struct {