diff --git a/common/src/main/java/org/keycloak/common/Profile.java b/common/src/main/java/org/keycloak/common/Profile.java
index 57f41ca77857..3212e3e9bd80 100755
--- a/common/src/main/java/org/keycloak/common/Profile.java
+++ b/common/src/main/java/org/keycloak/common/Profile.java
@@ -104,6 +104,8 @@ public enum Feature {
 
         MULTI_SITE("Multi-site support", Type.PREVIEW),
 
+        CLIENT_TYPES("Client Types", Type.EXPERIMENTAL),
+
         OFFLINE_SESSION_PRELOADING("Offline session preloading", Type.DEPRECATED),
 
         HOSTNAME_V1("Hostname Options V1", Type.DEFAULT),
diff --git a/common/src/test/java/org/keycloak/common/ProfileTest.java b/common/src/test/java/org/keycloak/common/ProfileTest.java
index 0e09657edf97..78ce8b93cb27 100644
--- a/common/src/test/java/org/keycloak/common/ProfileTest.java
+++ b/common/src/test/java/org/keycloak/common/ProfileTest.java
@@ -85,7 +85,8 @@ public void checkDefaults() {
             Profile.Feature.CLIENT_SECRET_ROTATION,
             Profile.Feature.UPDATE_EMAIL,
             Profile.Feature.LINKEDIN_OAUTH,
-            Profile.Feature.OFFLINE_SESSION_PRELOADING
+            Profile.Feature.OFFLINE_SESSION_PRELOADING,
+            Profile.Feature.CLIENT_TYPES
         ));
 
         // KERBEROS can be disabled (i.e. FIPS mode disables SunJGSS provider)
diff --git a/js/apps/admin-ui/src/context/server-info/__tests__/mock.json b/js/apps/admin-ui/src/context/server-info/__tests__/mock.json
index b19531789969..fb68699134f0 100644
--- a/js/apps/admin-ui/src/context/server-info/__tests__/mock.json
+++ b/js/apps/admin-ui/src/context/server-info/__tests__/mock.json
@@ -39,7 +39,8 @@
       "SCRIPTS",
       "OPENSHIFT_INTEGRATION",
       "ADMIN_FINE_GRAINED_AUTHZ",
-      "TOKEN_EXCHANGE"
+      "TOKEN_EXCHANGE",
+      "CLIENT_TYPES"
     ],
     "previewFeatures": [
       "DECLARATIVE_USER_PROFILE",
@@ -48,7 +49,7 @@
       "ADMIN_FINE_GRAINED_AUTHZ",
       "TOKEN_EXCHANGE"
     ],
-    "experimentalFeatures": ["ADMIN2", "MAP_STORAGE", "DYNAMIC_SCOPES"]
+    "experimentalFeatures": ["ADMIN2", "MAP_STORAGE", "DYNAMIC_SCOPES", "CLIENT_TYPES"]
   },
   "themes": {
     "common": [{ "name": "keycloak" }],
diff --git a/js/apps/admin-ui/src/utils/useIsFeatureEnabled.ts b/js/apps/admin-ui/src/utils/useIsFeatureEnabled.ts
index ab0fca70e6d0..3b59a421bd2e 100644
--- a/js/apps/admin-ui/src/utils/useIsFeatureEnabled.ts
+++ b/js/apps/admin-ui/src/utils/useIsFeatureEnabled.ts
@@ -8,6 +8,7 @@ export enum Feature {
   DPoP = "DPOP",
   DeviceFlow = "DEVICE_FLOW",
   TransientUsers = "TRANSIENT_USERS",
+  ClientTypes = "CLIENT_TYPES",
 }
 
 export default function useIsFeatureEnabled() {
diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.unix.approved.txt
index c965b912fdde..65f13839e5f2 100644
--- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.unix.approved.txt
+++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.unix.approved.txt
@@ -64,16 +64,17 @@ Feature:
 --features <feature> Enables a set of one or more features. Possible values are: account-api[:v1],
                        account2[:v1], account3[:v1], admin-api[:v1], admin-fine-grained-authz[:v1],
                        admin2[:v1], authorization[:v1], ciba[:v1], client-policies[:v1],
-                       client-secret-rotation[:v1], declarative-ui[:v1], device-flow[:v1], docker[:
-                       v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1], hostname[:v1], impersonation
-                       [:v1], js-adapter[:v1], kerberos[:v1], linkedin-oauth[:v1], multi-site[:v1],
-                       offline-session-preloading[:v1], par[:v1], preview, recovery-codes[:v1],
-                       scripts[:v1], step-up-authentication[:v1], token-exchange[:v1],
-                       transient-users[:v1], update-email[:v1], web-authn[:v1].
+                       client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
+                       device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
+                       hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1], par[:
+                       v1], preview, recovery-codes[:v1], scripts[:v1], step-up-authentication[:
+                       v1], token-exchange[:v1], transient-users[:v1], update-email[:v1], web-authn
+                       [:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
-                       authorization, ciba, client-policies, client-secret-rotation,
+                       authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
                        offline-session-preloading, par, preview, recovery-codes, scripts,
diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.windows.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.windows.approved.txt
index c9cb3c5b9d81..896e6f62c113 100644
--- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.windows.approved.txt
+++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.windows.approved.txt
@@ -64,16 +64,17 @@ Feature:
 --features <feature> Enables a set of one or more features. Possible values are: account-api[:v1],
                        account2[:v1], account3[:v1], admin-api[:v1], admin-fine-grained-authz[:v1],
                        admin2[:v1], authorization[:v1], ciba[:v1], client-policies[:v1],
-                       client-secret-rotation[:v1], declarative-ui[:v1], device-flow[:v1], docker[:
-                       v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1], hostname[:v1], impersonation
-                       [:v1], js-adapter[:v1], kerberos[:v1], linkedin-oauth[:v1], multi-site[:v1],
-                       offline-session-preloading[:v1], par[:v1], preview, recovery-codes[:v1],
-                       scripts[:v1], step-up-authentication[:v1], token-exchange[:v1],
-                       transient-users[:v1], update-email[:v1], web-authn[:v1].
+                       client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
+                       device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
+                       hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1], par[:
+                       v1], preview, recovery-codes[:v1], scripts[:v1], step-up-authentication[:
+                       v1], token-exchange[:v1], transient-users[:v1], update-email[:v1], web-authn
+                       [:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
-                       authorization, ciba, client-policies, client-secret-rotation,
+                       authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
                        offline-session-preloading, par, preview, recovery-codes, scripts,
diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelp.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelp.unix.approved.txt
index af3b7659cbb1..aa71080ac080 100644
--- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelp.unix.approved.txt
+++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelp.unix.approved.txt
@@ -59,16 +59,17 @@ Feature:
 --features <feature> Enables a set of one or more features. Possible values are: account-api[:v1],
                        account2[:v1], account3[:v1], admin-api[:v1], admin-fine-grained-authz[:v1],
                        admin2[:v1], authorization[:v1], ciba[:v1], client-policies[:v1],
-                       client-secret-rotation[:v1], declarative-ui[:v1], device-flow[:v1], docker[:
-                       v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1], hostname[:v1], impersonation
-                       [:v1], js-adapter[:v1], kerberos[:v1], linkedin-oauth[:v1], multi-site[:v1],
-                       offline-session-preloading[:v1], par[:v1], preview, recovery-codes[:v1],
-                       scripts[:v1], step-up-authentication[:v1], token-exchange[:v1],
-                       transient-users[:v1], update-email[:v1], web-authn[:v1].
+                       client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
+                       device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
+                       hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1], par[:
+                       v1], preview, recovery-codes[:v1], scripts[:v1], step-up-authentication[:
+                       v1], token-exchange[:v1], transient-users[:v1], update-email[:v1], web-authn
+                       [:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
-                       authorization, ciba, client-policies, client-secret-rotation,
+                       authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
                        offline-session-preloading, par, preview, recovery-codes, scripts,
diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelpAll.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelpAll.unix.approved.txt
index af3b7659cbb1..aa71080ac080 100644
--- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelpAll.unix.approved.txt
+++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelpAll.unix.approved.txt
@@ -59,16 +59,17 @@ Feature:
 --features <feature> Enables a set of one or more features. Possible values are: account-api[:v1],
                        account2[:v1], account3[:v1], admin-api[:v1], admin-fine-grained-authz[:v1],
                        admin2[:v1], authorization[:v1], ciba[:v1], client-policies[:v1],
-                       client-secret-rotation[:v1], declarative-ui[:v1], device-flow[:v1], docker[:
-                       v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1], hostname[:v1], impersonation
-                       [:v1], js-adapter[:v1], kerberos[:v1], linkedin-oauth[:v1], multi-site[:v1],
-                       offline-session-preloading[:v1], par[:v1], preview, recovery-codes[:v1],
-                       scripts[:v1], step-up-authentication[:v1], token-exchange[:v1],
-                       transient-users[:v1], update-email[:v1], web-authn[:v1].
+                       client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
+                       device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
+                       hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1], par[:
+                       v1], preview, recovery-codes[:v1], scripts[:v1], step-up-authentication[:
+                       v1], token-exchange[:v1], transient-users[:v1], update-email[:v1], web-authn
+                       [:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
-                       authorization, ciba, client-policies, client-secret-rotation,
+                       authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
                        offline-session-preloading, par, preview, recovery-codes, scripts,
diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelp.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelp.unix.approved.txt
index ae700b669500..3fc607e3d6fc 100644
--- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelp.unix.approved.txt
+++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelp.unix.approved.txt
@@ -59,16 +59,17 @@ Feature:
 --features <feature> Enables a set of one or more features. Possible values are: account-api[:v1],
                        account2[:v1], account3[:v1], admin-api[:v1], admin-fine-grained-authz[:v1],
                        admin2[:v1], authorization[:v1], ciba[:v1], client-policies[:v1],
-                       client-secret-rotation[:v1], declarative-ui[:v1], device-flow[:v1], docker[:
-                       v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1], hostname[:v1], impersonation
-                       [:v1], js-adapter[:v1], kerberos[:v1], linkedin-oauth[:v1], multi-site[:v1],
-                       offline-session-preloading[:v1], par[:v1], preview, recovery-codes[:v1],
-                       scripts[:v1], step-up-authentication[:v1], token-exchange[:v1],
-                       transient-users[:v1], update-email[:v1], web-authn[:v1].
+                       client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
+                       device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
+                       hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1], par[:
+                       v1], preview, recovery-codes[:v1], scripts[:v1], step-up-authentication[:
+                       v1], token-exchange[:v1], transient-users[:v1], update-email[:v1], web-authn
+                       [:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
-                       authorization, ciba, client-policies, client-secret-rotation,
+                       authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
                        offline-session-preloading, par, preview, recovery-codes, scripts,
diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelpAll.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelpAll.unix.approved.txt
index ae700b669500..3fc607e3d6fc 100644
--- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelpAll.unix.approved.txt
+++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelpAll.unix.approved.txt
@@ -59,16 +59,17 @@ Feature:
 --features <feature> Enables a set of one or more features. Possible values are: account-api[:v1],
                        account2[:v1], account3[:v1], admin-api[:v1], admin-fine-grained-authz[:v1],
                        admin2[:v1], authorization[:v1], ciba[:v1], client-policies[:v1],
-                       client-secret-rotation[:v1], declarative-ui[:v1], device-flow[:v1], docker[:
-                       v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1], hostname[:v1], impersonation
-                       [:v1], js-adapter[:v1], kerberos[:v1], linkedin-oauth[:v1], multi-site[:v1],
-                       offline-session-preloading[:v1], par[:v1], preview, recovery-codes[:v1],
-                       scripts[:v1], step-up-authentication[:v1], token-exchange[:v1],
-                       transient-users[:v1], update-email[:v1], web-authn[:v1].
+                       client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
+                       device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
+                       hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1], par[:
+                       v1], preview, recovery-codes[:v1], scripts[:v1], step-up-authentication[:
+                       v1], token-exchange[:v1], transient-users[:v1], update-email[:v1], web-authn
+                       [:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
-                       authorization, ciba, client-policies, client-secret-rotation,
+                       authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
                        offline-session-preloading, par, preview, recovery-codes, scripts,
diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.unix.approved.txt
index 805a9729a715..a6d0042392ae 100644
--- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.unix.approved.txt
+++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.unix.approved.txt
@@ -89,16 +89,17 @@ Feature:
 --features <feature> Enables a set of one or more features. Possible values are: account-api[:v1],
                        account2[:v1], account3[:v1], admin-api[:v1], admin-fine-grained-authz[:v1],
                        admin2[:v1], authorization[:v1], ciba[:v1], client-policies[:v1],
-                       client-secret-rotation[:v1], declarative-ui[:v1], device-flow[:v1], docker[:
-                       v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1], hostname[:v1], impersonation
-                       [:v1], js-adapter[:v1], kerberos[:v1], linkedin-oauth[:v1], multi-site[:v1],
-                       offline-session-preloading[:v1], par[:v1], preview, recovery-codes[:v1],
-                       scripts[:v1], step-up-authentication[:v1], token-exchange[:v1],
-                       transient-users[:v1], update-email[:v1], web-authn[:v1].
+                       client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
+                       device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
+                       hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1], par[:
+                       v1], preview, recovery-codes[:v1], scripts[:v1], step-up-authentication[:
+                       v1], token-exchange[:v1], transient-users[:v1], update-email[:v1], web-authn
+                       [:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
-                       authorization, ciba, client-policies, client-secret-rotation,
+                       authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
                        offline-session-preloading, par, preview, recovery-codes, scripts,
diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.windows.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.windows.approved.txt
index bd1a3f37955d..cda67ffd7cd8 100644
--- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.windows.approved.txt
+++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.windows.approved.txt
@@ -89,16 +89,17 @@ Feature:
 --features <feature> Enables a set of one or more features. Possible values are: account-api[:v1],
                        account2[:v1], account3[:v1], admin-api[:v1], admin-fine-grained-authz[:v1],
                        admin2[:v1], authorization[:v1], ciba[:v1], client-policies[:v1],
-                       client-secret-rotation[:v1], declarative-ui[:v1], device-flow[:v1], docker[:
-                       v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1], hostname[:v1], impersonation
-                       [:v1], js-adapter[:v1], kerberos[:v1], linkedin-oauth[:v1], multi-site[:v1],
-                       offline-session-preloading[:v1], par[:v1], preview, recovery-codes[:v1],
-                       scripts[:v1], step-up-authentication[:v1], token-exchange[:v1],
-                       transient-users[:v1], update-email[:v1], web-authn[:v1].
+                       client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
+                       device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
+                       hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1], par[:
+                       v1], preview, recovery-codes[:v1], scripts[:v1], step-up-authentication[:
+                       v1], token-exchange[:v1], transient-users[:v1], update-email[:v1], web-authn
+                       [:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
-                       authorization, ciba, client-policies, client-secret-rotation,
+                       authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
                        offline-session-preloading, par, preview, recovery-codes, scripts,
diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.unix.approved.txt
index 805a9729a715..a6d0042392ae 100644
--- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.unix.approved.txt
+++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.unix.approved.txt
@@ -89,16 +89,17 @@ Feature:
 --features <feature> Enables a set of one or more features. Possible values are: account-api[:v1],
                        account2[:v1], account3[:v1], admin-api[:v1], admin-fine-grained-authz[:v1],
                        admin2[:v1], authorization[:v1], ciba[:v1], client-policies[:v1],
-                       client-secret-rotation[:v1], declarative-ui[:v1], device-flow[:v1], docker[:
-                       v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1], hostname[:v1], impersonation
-                       [:v1], js-adapter[:v1], kerberos[:v1], linkedin-oauth[:v1], multi-site[:v1],
-                       offline-session-preloading[:v1], par[:v1], preview, recovery-codes[:v1],
-                       scripts[:v1], step-up-authentication[:v1], token-exchange[:v1],
-                       transient-users[:v1], update-email[:v1], web-authn[:v1].
+                       client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
+                       device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
+                       hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1], par[:
+                       v1], preview, recovery-codes[:v1], scripts[:v1], step-up-authentication[:
+                       v1], token-exchange[:v1], transient-users[:v1], update-email[:v1], web-authn
+                       [:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
-                       authorization, ciba, client-policies, client-secret-rotation,
+                       authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
                        offline-session-preloading, par, preview, recovery-codes, scripts,
diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.windows.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.windows.approved.txt
index bd1a3f37955d..cda67ffd7cd8 100644
--- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.windows.approved.txt
+++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.windows.approved.txt
@@ -89,16 +89,17 @@ Feature:
 --features <feature> Enables a set of one or more features. Possible values are: account-api[:v1],
                        account2[:v1], account3[:v1], admin-api[:v1], admin-fine-grained-authz[:v1],
                        admin2[:v1], authorization[:v1], ciba[:v1], client-policies[:v1],
-                       client-secret-rotation[:v1], declarative-ui[:v1], device-flow[:v1], docker[:
-                       v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1], hostname[:v1], impersonation
-                       [:v1], js-adapter[:v1], kerberos[:v1], linkedin-oauth[:v1], multi-site[:v1],
-                       offline-session-preloading[:v1], par[:v1], preview, recovery-codes[:v1],
-                       scripts[:v1], step-up-authentication[:v1], token-exchange[:v1],
-                       transient-users[:v1], update-email[:v1], web-authn[:v1].
+                       client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
+                       device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
+                       hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1], par[:
+                       v1], preview, recovery-codes[:v1], scripts[:v1], step-up-authentication[:
+                       v1], token-exchange[:v1], transient-users[:v1], update-email[:v1], web-authn
+                       [:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
-                       authorization, ciba, client-policies, client-secret-rotation,
+                       authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
                        offline-session-preloading, par, preview, recovery-codes, scripts,
diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.unix.approved.txt
index 31a64523ba77..f67412632687 100644
--- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.unix.approved.txt
+++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.unix.approved.txt
@@ -90,16 +90,17 @@ Feature:
 --features <feature> Enables a set of one or more features. Possible values are: account-api[:v1],
                        account2[:v1], account3[:v1], admin-api[:v1], admin-fine-grained-authz[:v1],
                        admin2[:v1], authorization[:v1], ciba[:v1], client-policies[:v1],
-                       client-secret-rotation[:v1], declarative-ui[:v1], device-flow[:v1], docker[:
-                       v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1], hostname[:v1], impersonation
-                       [:v1], js-adapter[:v1], kerberos[:v1], linkedin-oauth[:v1], multi-site[:v1],
-                       offline-session-preloading[:v1], par[:v1], preview, recovery-codes[:v1],
-                       scripts[:v1], step-up-authentication[:v1], token-exchange[:v1],
-                       transient-users[:v1], update-email[:v1], web-authn[:v1].
+                       client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
+                       device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
+                       hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1], par[:
+                       v1], preview, recovery-codes[:v1], scripts[:v1], step-up-authentication[:
+                       v1], token-exchange[:v1], transient-users[:v1], update-email[:v1], web-authn
+                       [:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
-                       authorization, ciba, client-policies, client-secret-rotation,
+                       authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
                        offline-session-preloading, par, preview, recovery-codes, scripts,
diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.windows.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.windows.approved.txt
index 9c14fd37df7a..fa6768c8aef6 100644
--- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.windows.approved.txt
+++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.windows.approved.txt
@@ -90,16 +90,17 @@ Feature:
 --features <feature> Enables a set of one or more features. Possible values are: account-api[:v1],
                        account2[:v1], account3[:v1], admin-api[:v1], admin-fine-grained-authz[:v1],
                        admin2[:v1], authorization[:v1], ciba[:v1], client-policies[:v1],
-                       client-secret-rotation[:v1], declarative-ui[:v1], device-flow[:v1], docker[:
-                       v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1], hostname[:v1], impersonation
-                       [:v1], js-adapter[:v1], kerberos[:v1], linkedin-oauth[:v1], multi-site[:v1],
-                       offline-session-preloading[:v1], par[:v1], preview, recovery-codes[:v1],
-                       scripts[:v1], step-up-authentication[:v1], token-exchange[:v1],
-                       transient-users[:v1], update-email[:v1], web-authn[:v1].
+                       client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
+                       device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
+                       hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1], par[:
+                       v1], preview, recovery-codes[:v1], scripts[:v1], step-up-authentication[:
+                       v1], token-exchange[:v1], transient-users[:v1], update-email[:v1], web-authn
+                       [:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
-                       authorization, ciba, client-policies, client-secret-rotation,
+                       authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
                        offline-session-preloading, par, preview, recovery-codes, scripts,
diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.unix.approved.txt
index 31a64523ba77..f67412632687 100644
--- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.unix.approved.txt
+++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.unix.approved.txt
@@ -90,16 +90,17 @@ Feature:
 --features <feature> Enables a set of one or more features. Possible values are: account-api[:v1],
                        account2[:v1], account3[:v1], admin-api[:v1], admin-fine-grained-authz[:v1],
                        admin2[:v1], authorization[:v1], ciba[:v1], client-policies[:v1],
-                       client-secret-rotation[:v1], declarative-ui[:v1], device-flow[:v1], docker[:
-                       v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1], hostname[:v1], impersonation
-                       [:v1], js-adapter[:v1], kerberos[:v1], linkedin-oauth[:v1], multi-site[:v1],
-                       offline-session-preloading[:v1], par[:v1], preview, recovery-codes[:v1],
-                       scripts[:v1], step-up-authentication[:v1], token-exchange[:v1],
-                       transient-users[:v1], update-email[:v1], web-authn[:v1].
+                       client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
+                       device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
+                       hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1], par[:
+                       v1], preview, recovery-codes[:v1], scripts[:v1], step-up-authentication[:
+                       v1], token-exchange[:v1], transient-users[:v1], update-email[:v1], web-authn
+                       [:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
-                       authorization, ciba, client-policies, client-secret-rotation,
+                       authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
                        offline-session-preloading, par, preview, recovery-codes, scripts,
diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.windows.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.windows.approved.txt
index 9c14fd37df7a..e88980a71370 100644
--- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.windows.approved.txt
+++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.windows.approved.txt
@@ -90,8 +90,8 @@ Feature:
 --features <feature> Enables a set of one or more features. Possible values are: account-api[:v1],
                        account2[:v1], account3[:v1], admin-api[:v1], admin-fine-grained-authz[:v1],
                        admin2[:v1], authorization[:v1], ciba[:v1], client-policies[:v1],
-                       client-secret-rotation[:v1], declarative-ui[:v1], device-flow[:v1], docker[:
-                       v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1], hostname[:v1], impersonation
+                       client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1], device-flow[:v1],
+                       docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1], hostname[:v1], impersonation
                        [:v1], js-adapter[:v1], kerberos[:v1], linkedin-oauth[:v1], multi-site[:v1],
                        offline-session-preloading[:v1], par[:v1], preview, recovery-codes[:v1],
                        scripts[:v1], step-up-authentication[:v1], token-exchange[:v1],
@@ -99,7 +99,7 @@ Feature:
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
-                       authorization, ciba, client-policies, client-secret-rotation,
+                       authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
                        offline-session-preloading, par, preview, recovery-codes, scripts,