diff --git a/cypress/support/pages/admin_console/manage/realm_settings/RealmSettingsPage.ts b/cypress/support/pages/admin_console/manage/realm_settings/RealmSettingsPage.ts
index 6364fa4653..56e1994b50 100644
--- a/cypress/support/pages/admin_console/manage/realm_settings/RealmSettingsPage.ts
+++ b/cypress/support/pages/admin_console/manage/realm_settings/RealmSettingsPage.ts
@@ -1,3 +1,5 @@
+import ListingPage from "../../ListingPage";
+
 const expect = chai.expect;
 export default class RealmSettingsPage {
   generalSaveBtn = "general-tab-save";
@@ -182,6 +184,7 @@ export default class RealmSettingsPage {
   private addExecutorDrpDwnOption = "executorType-select";
   private addExecutorCancelBtn = "addExecutor-cancelBtn";
   private addExecutorSaveBtn = "addExecutor-saveBtn";
+  private listingPage = new ListingPage();
 
   selectLoginThemeType(themeType: string) {
     cy.get(this.selectLoginTheme).click();
@@ -548,8 +551,8 @@ export default class RealmSettingsPage {
   }
 
   shouldDeleteClientProfileDialog() {
-    cy.get(this.moreDrpDwn).last().click();
-    cy.get(this.moreDrpDwnItems).click();
+    this.listingPage.searchItem("Test", false);
+    this.listingPage.clickRowDetails("Test").clickDetailMenu("Delete");
     cy.findByTestId("modalConfirm").contains("Delete").click();
     cy.get(this.alertMessage).should("be.visible", "Client profile deleted");
     cy.get("table").should("not.have.text", "Test");
@@ -829,8 +832,8 @@ export default class RealmSettingsPage {
   }
 
   shouldDisplayDeleteClientProfileDialog() {
-    cy.get(this.moreDrpDwn).last().click();
-    cy.get(this.moreDrpDwnItems).click();
+    this.listingPage.searchItem("Test", false);
+    this.listingPage.clickRowDetails("Test").clickDetailMenu("Delete");
     cy.get(this.deleteDialogTitle).contains("Delete profile?");
     cy.get(this.deleteDialogBodyText).contains(
       "This action will permanently delete the profile Test. This cannot be undone."
@@ -841,8 +844,8 @@ export default class RealmSettingsPage {
   }
 
   shouldDeleteClientPolicyDialog() {
-    cy.get(this.moreDrpDwn).last().click();
-    cy.get(this.moreDrpDwnItems).click();
+    this.listingPage.searchItem("Test", false);
+    this.listingPage.clickRowDetails("Test").clickDetailMenu("Delete");
     cy.findByTestId("modalConfirm").contains("Delete").click();
     cy.get(this.alertMessage).should("be.visible", "Client profile deleted");
     cy.get("table").should("not.have.text", "Test");
diff --git a/src/client-scopes/add/components/MultivaluedStringComponent.tsx b/src/client-scopes/add/components/MultivaluedStringComponent.tsx
deleted file mode 100644
index 9561638613..0000000000
--- a/src/client-scopes/add/components/MultivaluedStringComponent.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from "react";
-import { useTranslation } from "react-i18next";
-import { FormGroup } from "@patternfly/react-core";
-import { camelCase } from "lodash";
-
-import { HelpItem } from "../../../components/help-enabler/HelpItem";
-import type { ComponentProps } from "./components";
-import { MultiLineInput } from "../../../components/multi-line-input/MultiLineInput";
-import { convertToHyphens } from "../../../util";
-
-export const MultiValuedStringComponent = ({
-  name,
-  label,
-  helpText,
-}: ComponentProps) => {
-  const { t } = useTranslation("realm-settings");
-
-  const convertToString = (s: string) =>
-    camelCase(convertToHyphens(s).replaceAll("-", " "));
-
-  return (
-    <FormGroup
-      label={t(convertToString(label!).replace("Label", ""))}
-      labelIcon={
-        <HelpItem
-          helpText={t(`realm-settings-help:${convertToString(helpText!)}`)}
-          forLabel={t(label!)}
-          forID={name!}
-        />
-      }
-      fieldId={name!}
-    >
-      <MultiLineInput
-        name={`config.${convertToHyphens(name!)}`}
-        aria-label={name}
-        addButtonLabel={t("addMultivaluedLabel", {
-          fieldLabel: t(
-            camelCase(
-              convertToHyphens(label!).replaceAll("-", " ").replace("label", "")
-            )
-          ).toLowerCase(),
-        })}
-      />
-    </FormGroup>
-  );
-};
diff --git a/src/client-scopes/details/MappingDetails.tsx b/src/client-scopes/details/MappingDetails.tsx
index f76f25115c..a18057b5d5 100644
--- a/src/client-scopes/details/MappingDetails.tsx
+++ b/src/client-scopes/details/MappingDetails.tsx
@@ -25,9 +25,9 @@ import { useServerInfo } from "../../context/server-info/ServerInfoProvider";
 import { convertFormValuesToObject, convertToFormValues } from "../../util";
 import { FormAccess } from "../../components/form-access/FormAccess";
 import { useRealm } from "../../context/realm-context/RealmContext";
-import { COMPONENTS, isValidComponentType } from "../add/components/components";
 import { MapperParams, MapperRoute } from "../routes/Mapper";
 import { toClientScope } from "../routes/ClientScope";
+import { DynamicComponents } from "../../components/dynamic/DynamicComponents";
 
 import "./mapping-details.css";
 
@@ -242,17 +242,7 @@ export default function MappingDetails() {
             />
           </FormGroup>
           <FormProvider {...form}>
-            {mapping?.properties.map((property) => {
-              const componentType = property.type!;
-              if (isValidComponentType(componentType)) {
-                const Component = COMPONENTS[componentType];
-                return <Component key={property.name} {...property} />;
-              } else {
-                console.warn(
-                  `There is no editor registered for ${componentType}`
-                );
-              }
-            })}
+            <DynamicComponents properties={mapping?.properties || []} />
           </FormProvider>
           <ActionGroup>
             <Button variant="primary" type="submit">
diff --git a/src/client-scopes/messages.ts b/src/client-scopes/messages.ts
index 5ac4c280e2..61c195c14a 100644
--- a/src/client-scopes/messages.ts
+++ b/src/client-scopes/messages.ts
@@ -61,151 +61,5 @@ export default {
       saml: "SAML",
       "openid-connect": "openid-connect",
     },
-
-    usermodel: {
-      prop: {
-        label: "Property",
-        tooltip:
-          "Name of the property method in the UserModel interface. For example, a value of 'email' would reference the UserModel.getEmail() method.",
-      },
-      attr: {
-        label: "User Attribute",
-        tooltip:
-          "Name of stored user attribute which is the name of an attribute within the UserModel.attribute map.",
-      },
-      clientRoleMapping: {
-        client: {
-          label: "Client ID",
-          tooltip:
-            "Client ID for role mappings. Just client roles of this client will be added to the token. If this is unset, client roles of all clients will be added to the token.",
-        },
-        rolePrefix: {
-          label: "Client Role prefix",
-          tooltip: "A prefix for each client role (optional).",
-        },
-        tokenClaimName: {
-          tooltip:
-            "Name of the claim to insert into the token. This can be a fully qualified name like 'address.street'. In this case, a nested json object will be created. To prevent nesting and use dot literally, escape the dot with backslash (\\.). The special token ${client_id} can be used and this will be replaced by the actual client ID. Example usage is 'resource_access.${client_id}.roles'. This is useful especially when you are adding roles from all the clients (Hence 'Client ID' switch is unset) and you want client roles of each client stored separately.",
-        },
-      },
-      realmRoleMapping: {
-        rolePrefix: {
-          label: "Realm Role prefix",
-          tooltip: "A prefix for each Realm Role (optional).",
-        },
-      },
-    },
-    userSession: {
-      modelNote: {
-        label: "User Session Note",
-        tooltip:
-          "Name of stored user session note within the UserSessionModel.note map.",
-      },
-    },
-    multivalued: {
-      label: "Multivalued",
-      tooltip:
-        "Indicates if attribute supports multiple values. If true, the list of all values of this attribute will be set as claim. If false, just first value will be set as claim",
-    },
-    aggregate: {
-      attrs: {
-        label: "Aggregate attribute values",
-        tooltip:
-          "Indicates if attribute values should be aggregated with the group attributes. If using OpenID Connect mapper the multivalued option needs to be enabled too in order to get all the values. Duplicated values are discarded and the order of values is not guaranteed with this option.",
-      },
-    },
-    selectRole: {
-      label: "Select Role",
-      tooltip:
-        "Enter role in the textbox to the left, or click this button to browse and select the role you want.",
-    },
-    tokenClaimName: {
-      label: "Token Claim Name",
-      tooltip:
-        "Name of the claim to insert into the token. This can be a fully qualified name like 'address.street'. In this case, a nested json object will be created. To prevent nesting and use dot literally, escape the dot with backslash (\\.).",
-    },
-    jsonType: {
-      label: "Claim JSON Type",
-      tooltip:
-        "JSON type that should be used to populate the json claim in the token. long, int, boolean, String and JSON are valid values.",
-    },
-    includeInIdToken: {
-      label: "Add to ID token",
-      tooltip: "Should the claim be added to the ID token?",
-    },
-    includeInAccessToken: {
-      label: "Add to access token",
-      tooltip: "Should the claim be added to the access token?",
-    },
-    includeInUserInfo: {
-      label: "Add to userinfo",
-      tooltip: "Should the claim be added to the userinfo?",
-    },
-    sectorIdentifierUri: {
-      label: "Sector Identifier URI",
-      tooltip:
-        "Providers that use pairwise sub values and support Dynamic Client Registration SHOULD use the sector_identifier_uri parameter. It provides a way for a group of websites under common administrative control to have consistent pairwise sub values independent of the individual domain names. It also provides a way for Clients to change redirect_uri domains without having to reregister all their users.",
-    },
-    pairwiseSubAlgorithmSalt: {
-      label: "Salt",
-      tooltip:
-        "Salt used when calculating the pairwise subject identifier. If left blank, a salt will be generated.",
-    },
-    addressClaim: {
-      street: {
-        label: "User Attribute Name for Street",
-        tooltip:
-          "Name of User Attribute, which will be used to map to 'street_address' subclaim inside 'address' token claim. Defaults to 'street' .",
-      },
-      locality: {
-        label: "User Attribute Name for Locality",
-        tooltip:
-          "Name of User Attribute, which will be used to map to 'locality' subclaim inside 'address' token claim. Defaults to 'locality' .",
-      },
-      region: {
-        label: "User Attribute Name for Region",
-        tooltip:
-          "Name of User Attribute, which will be used to map to 'region' subclaim inside 'address' token claim. Defaults to 'region' .",
-      },
-      postal_code: {
-        label: "User Attribute Name for Postal Code",
-        tooltip:
-          "Name of User Attribute, which will be used to map to 'postal_code' subclaim inside 'address' token claim. Defaults to 'postal_code' .",
-      },
-      country: {
-        label: "User Attribute Name for Country",
-        tooltip:
-          "Name of User Attribute, which will be used to map to 'country' subclaim inside 'address' token claim. Defaults to 'country' .",
-      },
-      formatted: {
-        label: "User Attribute Name for Formatted Address",
-        tooltip:
-          "Name of User Attribute, which will be used to map to 'formatted' subclaim inside 'address' token claim. Defaults to 'formatted' .",
-      },
-    },
-    included: {
-      client: {
-        audience: {
-          label: "Included Client Audience",
-          tooltip:
-            "The Client ID of the specified audience client will be included in audience (aud) field of the token. If there are existing audiences in the token, the specified value is just added to them. It won't override existing audiences.",
-        },
-      },
-      custom: {
-        audience: {
-          label: "Included Custom Audience",
-          tooltip:
-            "This is used just if 'Included Client Audience' is not filled. The specified value will be included in audience (aud) field of the token. If there are existing audiences in the token, the specified value is just added to them. It won't override existing audiences.",
-        },
-      },
-    },
-    "name-id-format": "Name ID Format",
-    mapper: {
-      nameid: {
-        format: {
-          tooltip: "Name ID Format using Mapper",
-        },
-      },
-    },
   },
 };
diff --git a/src/client-scopes/add/components/BooleanComponent.tsx b/src/components/dynamic/BooleanComponent.tsx
similarity index 90%
rename from src/client-scopes/add/components/BooleanComponent.tsx
rename to src/components/dynamic/BooleanComponent.tsx
index 4b08dcb3f0..10eddcd301 100644
--- a/src/client-scopes/add/components/BooleanComponent.tsx
+++ b/src/components/dynamic/BooleanComponent.tsx
@@ -4,8 +4,8 @@ import { useTranslation } from "react-i18next";
 import { FormGroup, Switch } from "@patternfly/react-core";
 
 import type { ComponentProps } from "./components";
-import { HelpItem } from "../../../components/help-enabler/HelpItem";
-import { convertToHyphens } from "../../../util";
+import { HelpItem } from "../help-enabler/HelpItem";
+import { convertToHyphens } from "../../util";
 
 export const BooleanComponent = ({
   name,
diff --git a/src/client-scopes/add/components/ClientSelectComponent.tsx b/src/components/dynamic/ClientSelectComponent.tsx
similarity index 89%
rename from src/client-scopes/add/components/ClientSelectComponent.tsx
rename to src/components/dynamic/ClientSelectComponent.tsx
index 5ca88b4314..cf9327a174 100644
--- a/src/client-scopes/add/components/ClientSelectComponent.tsx
+++ b/src/components/dynamic/ClientSelectComponent.tsx
@@ -9,10 +9,10 @@ import {
 } from "@patternfly/react-core";
 
 import type { ClientQuery } from "@keycloak/keycloak-admin-client/lib/resources/clients";
-import { useAdminClient, useFetch } from "../../../context/auth/AdminClient";
-import { HelpItem } from "../../../components/help-enabler/HelpItem";
+import { useAdminClient, useFetch } from "../../context/auth/AdminClient";
+import { HelpItem } from "../help-enabler/HelpItem";
 import type { ComponentProps } from "./components";
-import { convertToHyphens } from "../../../util";
+import { convertToHyphens } from "../../util";
 
 export const ClientSelectComponent = ({
   name,
@@ -20,7 +20,7 @@ export const ClientSelectComponent = ({
   helpText,
   defaultValue,
 }: ComponentProps) => {
-  const { t } = useTranslation("client-scopes");
+  const { t } = useTranslation("dynamic");
   const { control } = useFormContext();
 
   const [open, setOpen] = useState(false);
diff --git a/src/components/dynamic/DynamicComponents.tsx b/src/components/dynamic/DynamicComponents.tsx
new file mode 100644
index 0000000000..5dd8825ca5
--- /dev/null
+++ b/src/components/dynamic/DynamicComponents.tsx
@@ -0,0 +1,22 @@
+import React from "react";
+import type { ConfigPropertyRepresentation } from "@keycloak/keycloak-admin-client/lib/defs/authenticatorConfigInfoRepresentation";
+
+import { COMPONENTS, isValidComponentType } from "./components";
+
+type DynamicComponentProps = {
+  properties: ConfigPropertyRepresentation[];
+};
+
+export const DynamicComponents = ({ properties }: DynamicComponentProps) => (
+  <>
+    {properties.map((property) => {
+      const componentType = property.type!;
+      if (isValidComponentType(componentType)) {
+        const Component = COMPONENTS[componentType];
+        return <Component key={property.name} {...property} />;
+      } else {
+        console.warn(`There is no editor registered for ${componentType}`);
+      }
+    })}
+  </>
+);
diff --git a/src/client-scopes/add/components/ListComponent.tsx b/src/components/dynamic/ListComponent.tsx
similarity index 90%
rename from src/client-scopes/add/components/ListComponent.tsx
rename to src/components/dynamic/ListComponent.tsx
index 0019604e97..65090beecc 100644
--- a/src/client-scopes/add/components/ListComponent.tsx
+++ b/src/components/dynamic/ListComponent.tsx
@@ -9,8 +9,8 @@ import {
 } from "@patternfly/react-core";
 
 import type { ComponentProps } from "./components";
-import { HelpItem } from "../../../components/help-enabler/HelpItem";
-import { convertToHyphens } from "../../../util";
+import { HelpItem } from "../help-enabler/HelpItem";
+import { convertToHyphens } from "../../util";
 
 export const ListComponent = ({
   name,
@@ -19,7 +19,7 @@ export const ListComponent = ({
   defaultValue,
   options,
 }: ComponentProps) => {
-  const { t } = useTranslation("client-scopes");
+  const { t } = useTranslation("dynamic");
   const { control } = useFormContext();
   const [open, setOpen] = useState(false);
 
diff --git a/src/client-scopes/add/components/MultivaluedListComponent.tsx b/src/components/dynamic/MultivaluedListComponent.tsx
similarity index 53%
rename from src/client-scopes/add/components/MultivaluedListComponent.tsx
rename to src/components/dynamic/MultivaluedListComponent.tsx
index 18964737ed..ae5e0f0c5a 100644
--- a/src/client-scopes/add/components/MultivaluedListComponent.tsx
+++ b/src/components/dynamic/MultivaluedListComponent.tsx
@@ -8,47 +8,32 @@ import {
   SelectVariant,
 } from "@patternfly/react-core";
 
-import { HelpItem } from "../../../components/help-enabler/HelpItem";
+import { HelpItem } from "../help-enabler/HelpItem";
 import type { ComponentProps } from "./components";
-import { camelCase } from "lodash";
-import { convertToHyphens } from "../../../util";
+import { convertToHyphens } from "../../util";
 
-export const MultivaluedListComponent = ({
+export const MultiValuedListComponent = ({
   name,
   label,
   helpText,
   defaultValue,
   options,
 }: ComponentProps) => {
-  const { t } = useTranslation("realm-settings-help");
+  const { t } = useTranslation("dynamic");
   const { control } = useFormContext();
   const [open, setOpen] = useState(false);
-  const [selectedItems, setSelectedItems] = useState<string[]>([defaultValue]);
-
-  const convertToString = (s: string) =>
-    camelCase(convertToHyphens(s).replaceAll("-", " "));
 
   return (
     <FormGroup
-      label={t(
-        `realm-settings:${convertToString(label!).replace("Label", "")}`
-      )}
+      label={t(label!)}
       labelIcon={
-        <HelpItem
-          helpText={
-            name === "update-client-source"
-              ? t(helpText!)
-              : t(convertToString(helpText!))
-          }
-          forLabel={t(label!)}
-          forID={name!}
-        />
+        <HelpItem helpText={t(helpText!)} forLabel={label!} forID={name!} />
       }
       fieldId={name!}
     >
       <Controller
-        name={label!}
-        defaultValue={defaultValue || []}
+        name={`config.${convertToHyphens(name!)}`}
+        defaultValue={defaultValue ? [defaultValue] : []}
         control={control}
         render={({ onChange, value }) => (
           <Select
@@ -62,26 +47,20 @@ export const MultivaluedListComponent = ({
             variant={SelectVariant.typeaheadMulti}
             typeAheadAriaLabel={t("common:select")}
             onToggle={(isOpen) => setOpen(isOpen)}
-            selections={selectedItems}
+            selections={value}
             onSelect={(_, v) => {
-              const option = v as string;
+              const option = v.toString();
               if (!value) {
-                setSelectedItems([option]);
                 onChange([option]);
-              } else if (selectedItems.includes(option)) {
-                setSelectedItems(
-                  selectedItems.filter((item: string) => item !== option)
-                );
-                onChange(selectedItems);
+              } else if (value.includes(option)) {
+                onChange(value.filter((item: string) => item !== option));
               } else {
-                setSelectedItems([...selectedItems, option]);
-                onChange([...selectedItems, option]);
+                onChange([...value, option]);
               }
             }}
             onClear={(event) => {
               event.stopPropagation();
               onChange([]);
-              setSelectedItems([]);
             }}
             isOpen={open}
             aria-label={t(label!)}
diff --git a/src/components/dynamic/MultivaluedStringComponent.tsx b/src/components/dynamic/MultivaluedStringComponent.tsx
new file mode 100644
index 0000000000..fffad62797
--- /dev/null
+++ b/src/components/dynamic/MultivaluedStringComponent.tsx
@@ -0,0 +1,34 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { FormGroup } from "@patternfly/react-core";
+
+import { HelpItem } from "../../components/help-enabler/HelpItem";
+import type { ComponentProps } from "./components";
+import { MultiLineInput } from "../../components/multi-line-input/MultiLineInput";
+import { convertToHyphens } from "../../util";
+
+export const MultiValuedStringComponent = ({
+  name,
+  label,
+  helpText,
+}: ComponentProps) => {
+  const { t } = useTranslation("dynamic");
+
+  return (
+    <FormGroup
+      label={t(label!)}
+      labelIcon={
+        <HelpItem helpText={t(helpText!)} forLabel={t(label!)} forID={name!} />
+      }
+      fieldId={name!}
+    >
+      <MultiLineInput
+        name={`config.${convertToHyphens(name!)}`}
+        aria-label={name}
+        addButtonLabel={t("addMultivaluedLabel", {
+          fieldLabel: t(label!).toLowerCase(),
+        })}
+      />
+    </FormGroup>
+  );
+};
diff --git a/src/client-scopes/add/components/RoleComponent.tsx b/src/components/dynamic/RoleComponent.tsx
similarity index 95%
rename from src/client-scopes/add/components/RoleComponent.tsx
rename to src/components/dynamic/RoleComponent.tsx
index 4d1e113fe1..68c71ac7bd 100644
--- a/src/client-scopes/add/components/RoleComponent.tsx
+++ b/src/components/dynamic/RoleComponent.tsx
@@ -14,14 +14,14 @@ import {
 
 import type ClientRepresentation from "@keycloak/keycloak-admin-client/lib/defs/clientRepresentation";
 import type RoleRepresentation from "@keycloak/keycloak-admin-client/lib/defs/roleRepresentation";
-import { useAdminClient, useFetch } from "../../../context/auth/AdminClient";
-import { useRealm } from "../../../context/realm-context/RealmContext";
-import { HelpItem } from "../../../components/help-enabler/HelpItem";
+import { useAdminClient, useFetch } from "../../context/auth/AdminClient";
+import { useRealm } from "../../context/realm-context/RealmContext";
+import { HelpItem } from "../help-enabler/HelpItem";
 import type { ComponentProps } from "./components";
-import { convertToHyphens } from "../../../util";
+import { convertToHyphens } from "../../util";
 
 export const RoleComponent = ({ name, label, helpText }: ComponentProps) => {
-  const { t } = useTranslation("client-scopes");
+  const { t } = useTranslation("dynamic");
 
   const adminClient = useAdminClient();
   const { realm } = useRealm();
@@ -122,7 +122,7 @@ export const RoleComponent = ({ name, label, helpText }: ComponentProps) => {
 
   return (
     <FormGroup
-      label={label!}
+      label={t(label!)}
       labelIcon={
         <HelpItem helpText={t(helpText!)} forLabel={name!} forID={name!} />
       }
diff --git a/src/client-scopes/add/components/ScriptComponent.tsx b/src/components/dynamic/ScriptComponent.tsx
similarity index 87%
rename from src/client-scopes/add/components/ScriptComponent.tsx
rename to src/components/dynamic/ScriptComponent.tsx
index 0c9968818e..218af67b95 100644
--- a/src/client-scopes/add/components/ScriptComponent.tsx
+++ b/src/components/dynamic/ScriptComponent.tsx
@@ -4,9 +4,9 @@ import { useTranslation } from "react-i18next";
 import { FormGroup } from "@patternfly/react-core";
 import { CodeEditor, Language } from "@patternfly/react-code-editor";
 
-import { HelpItem } from "../../../components/help-enabler/HelpItem";
+import { HelpItem } from "../help-enabler/HelpItem";
 import type { ComponentProps } from "./components";
-import { convertToHyphens } from "../../../util";
+import { convertToHyphens } from "../../util";
 
 export const ScriptComponent = ({
   name,
@@ -14,7 +14,7 @@ export const ScriptComponent = ({
   helpText,
   defaultValue,
 }: ComponentProps) => {
-  const { t } = useTranslation("client-scopes");
+  const { t } = useTranslation("dynamic");
   const { control } = useFormContext();
 
   return (
diff --git a/src/client-scopes/add/components/StringComponent.tsx b/src/components/dynamic/StringComponent.tsx
similarity index 82%
rename from src/client-scopes/add/components/StringComponent.tsx
rename to src/components/dynamic/StringComponent.tsx
index 8d6c99d0ff..3be183e627 100644
--- a/src/client-scopes/add/components/StringComponent.tsx
+++ b/src/components/dynamic/StringComponent.tsx
@@ -3,9 +3,9 @@ import { useTranslation } from "react-i18next";
 import { useFormContext } from "react-hook-form";
 import { FormGroup, TextInput } from "@patternfly/react-core";
 
-import { HelpItem } from "../../../components/help-enabler/HelpItem";
+import { HelpItem } from "../help-enabler/HelpItem";
 import type { ComponentProps } from "./components";
-import { convertToHyphens } from "../../../util";
+import { convertToHyphens } from "../../util";
 
 export const StringComponent = ({
   name,
@@ -13,7 +13,7 @@ export const StringComponent = ({
   helpText,
   defaultValue,
 }: ComponentProps) => {
-  const { t } = useTranslation("client-scopes");
+  const { t } = useTranslation("dynamic");
   const { register } = useFormContext();
 
   return (
diff --git a/src/client-scopes/add/components/components.ts b/src/components/dynamic/components.ts
similarity index 92%
rename from src/client-scopes/add/components/components.ts
rename to src/components/dynamic/components.ts
index 7bced3043f..f09855ee21 100644
--- a/src/client-scopes/add/components/components.ts
+++ b/src/components/dynamic/components.ts
@@ -8,7 +8,7 @@ import { RoleComponent } from "./RoleComponent";
 import { ScriptComponent } from "./ScriptComponent";
 import { ClientSelectComponent } from "./ClientSelectComponent";
 import { MultiValuedStringComponent } from "./MultivaluedStringComponent";
-import { MultivaluedListComponent } from "./MultivaluedListComponent";
+import { MultiValuedListComponent } from "./MultivaluedListComponent";
 
 export type ComponentProps = Omit<ConfigPropertyRepresentation, "type">;
 const ComponentTypes = [
@@ -32,8 +32,8 @@ export const COMPONENTS: {
   List: ListComponent,
   Role: RoleComponent,
   Script: ScriptComponent,
-  MultivaluedList: MultivaluedListComponent,
   ClientList: ClientSelectComponent,
+  MultivaluedList: MultiValuedListComponent,
   MultivaluedString: MultiValuedStringComponent,
 } as const;
 
diff --git a/src/components/dynamic/labels.ts b/src/components/dynamic/labels.ts
new file mode 100644
index 0000000000..fb29ab14a6
--- /dev/null
+++ b/src/components/dynamic/labels.ts
@@ -0,0 +1,183 @@
+export default {
+  dynamic: {
+    addMultivaluedLabel: "Add {{fieldLabel}}",
+    usermodel: {
+      prop: {
+        label: "Property",
+        tooltip:
+          "Name of the property method in the UserModel interface. For example, a value of 'email' would reference the UserModel.getEmail() method.",
+      },
+      attr: {
+        label: "User Attribute",
+        tooltip:
+          "Name of stored user attribute which is the name of an attribute within the UserModel.attribute map.",
+      },
+      clientRoleMapping: {
+        client: {
+          label: "Client ID",
+          tooltip:
+            "Client ID for role mappings. Just client roles of this client will be added to the token. If this is unset, client roles of all clients will be added to the token.",
+        },
+        rolePrefix: {
+          label: "Client Role prefix",
+          tooltip: "A prefix for each client role (optional).",
+        },
+        tokenClaimName: {
+          tooltip:
+            "Name of the claim to insert into the token. This can be a fully qualified name like 'address.street'. In this case, a nested json object will be created. To prevent nesting and use dot literally, escape the dot with backslash (\\.). The special token ${client_id} can be used and this will be replaced by the actual client ID. Example usage is 'resource_access.${client_id}.roles'. This is useful especially when you are adding roles from all the clients (Hence 'Client ID' switch is unset) and you want client roles of each client stored separately.",
+        },
+      },
+      realmRoleMapping: {
+        rolePrefix: {
+          label: "Realm Role prefix",
+          tooltip: "A prefix for each Realm Role (optional).",
+        },
+      },
+    },
+    userSession: {
+      modelNote: {
+        label: "User Session Note",
+        tooltip:
+          "Name of stored user session note within the UserSessionModel.note map.",
+      },
+    },
+    multivalued: {
+      label: "Multivalued",
+      tooltip:
+        "Indicates if attribute supports multiple values. If true, the list of all values of this attribute will be set as claim. If false, just first value will be set as claim",
+    },
+    aggregate: {
+      attrs: {
+        label: "Aggregate attribute values",
+        tooltip:
+          "Indicates if attribute values should be aggregated with the group attributes. If using OpenID Connect mapper the multivalued option needs to be enabled too in order to get all the values. Duplicated values are discarded and the order of values is not guaranteed with this option.",
+      },
+    },
+    selectRole: {
+      label: "Select Role",
+      tooltip:
+        "Enter role in the textbox to the left, or click this button to browse and select the role you want.",
+    },
+    tokenClaimName: {
+      label: "Token Claim Name",
+      tooltip:
+        "Name of the claim to insert into the token. This can be a fully qualified name like 'address.street'. In this case, a nested json object will be created. To prevent nesting and use dot literally, escape the dot with backslash (\\.).",
+    },
+    jsonType: {
+      label: "Claim JSON Type",
+      tooltip:
+        "JSON type that should be used to populate the json claim in the token. long, int, boolean, String and JSON are valid values.",
+    },
+    includeInIdToken: {
+      label: "Add to ID token",
+      tooltip: "Should the claim be added to the ID token?",
+    },
+    includeInAccessToken: {
+      label: "Add to access token",
+      tooltip: "Should the claim be added to the access token?",
+    },
+    includeInUserInfo: {
+      label: "Add to userinfo",
+      tooltip: "Should the claim be added to the userinfo?",
+    },
+    sectorIdentifierUri: {
+      label: "Sector Identifier URI",
+      tooltip:
+        "Providers that use pairwise sub values and support Dynamic Client Registration SHOULD use the sector_identifier_uri parameter. It provides a way for a group of websites under common administrative control to have consistent pairwise sub values independent of the individual domain names. It also provides a way for Clients to change redirect_uri domains without having to reregister all their users.",
+    },
+    pairwiseSubAlgorithmSalt: {
+      label: "Salt",
+      tooltip:
+        "Salt used when calculating the pairwise subject identifier. If left blank, a salt will be generated.",
+    },
+    addressClaim: {
+      street: {
+        label: "User Attribute Name for Street",
+        tooltip:
+          "Name of User Attribute, which will be used to map to 'street_address' subclaim inside 'address' token claim. Defaults to 'street' .",
+      },
+      locality: {
+        label: "User Attribute Name for Locality",
+        tooltip:
+          "Name of User Attribute, which will be used to map to 'locality' subclaim inside 'address' token claim. Defaults to 'locality' .",
+      },
+      region: {
+        label: "User Attribute Name for Region",
+        tooltip:
+          "Name of User Attribute, which will be used to map to 'region' subclaim inside 'address' token claim. Defaults to 'region' .",
+      },
+      postal_code: {
+        label: "User Attribute Name for Postal Code",
+        tooltip:
+          "Name of User Attribute, which will be used to map to 'postal_code' subclaim inside 'address' token claim. Defaults to 'postal_code' .",
+      },
+      country: {
+        label: "User Attribute Name for Country",
+        tooltip:
+          "Name of User Attribute, which will be used to map to 'country' subclaim inside 'address' token claim. Defaults to 'country' .",
+      },
+      formatted: {
+        label: "User Attribute Name for Formatted Address",
+        tooltip:
+          "Name of User Attribute, which will be used to map to 'formatted' subclaim inside 'address' token claim. Defaults to 'formatted' .",
+      },
+    },
+    included: {
+      client: {
+        audience: {
+          label: "Included Client Audience",
+          tooltip:
+            "The Client ID of the specified audience client will be included in audience (aud) field of the token. If there are existing audiences in the token, the specified value is just added to them. It won't override existing audiences.",
+        },
+      },
+      custom: {
+        audience: {
+          label: "Included Custom Audience",
+          tooltip:
+            "This is used just if 'Included Client Audience' is not filled. The specified value will be included in audience (aud) field of the token. If there are existing audiences in the token, the specified value is just added to them. It won't override existing audiences.",
+        },
+      },
+    },
+    "name-id-format": "Name ID Format",
+    mapper: {
+      nameid: {
+        format: {
+          tooltip: "Name ID Format using Mapper",
+        },
+      },
+    },
+
+    "client-scopes-condition": {
+      label: "Expected Scopes",
+      tooltip:
+        "The list of expected client scopes. Condition evaluates to true if specified client request matches some of the client scopes. It depends also whether it should be default or optional client scope based on the 'Scope Type' configured.",
+    },
+    "client-accesstype": {
+      label: "Client Access Type",
+      tooltip:
+        "Access Type of the client, for which the condition will be applied.",
+    },
+    "client-roles": {
+      label: "Client Roles",
+    },
+    "client-roles-condition": {
+      tooltip:
+        "Client roles, which will be checked during this condition evaluation. Condition evaluates to true if client has at least one client role with the name as the client roles specified in the configuration.",
+    },
+    "client-updater-source-groups": {
+      label: "Groups",
+      tooltip:
+        "Name of groups to check. Condition evaluates to true if the entity, who creates/updates client is member of some of the specified groups. Configured groups are specified by their simple name, which must match to the name of the Keycloak group. No support for group hierarchy is used here.}",
+    },
+    "client-updater-trusted-hosts": {
+      label: "Trusted hosts",
+      tooltip:
+        "List of Hosts, which are trusted. In case that client registration/update request comes from the host/domain specified in this configuration, condition evaluates to true. You can use hostnames or IP addresses. If you use star at the beginning (for example '*.example.com' ) then whole domain example.com will be trusted.",
+    },
+    "client-updater-source-roles": {
+      label: "Updating entity role",
+      tooltip:
+        "The condition is checked during client registration/update requests and it evaluates to true if the entity (usually user), who is creating/updating client is member of the specified role. For reference the realm role, you can use the realm role name like 'my_realm_role' . For reference client role, you can use the client_id.role_name for example 'my_client.my_client_role' will refer to client role 'my_client_role' of client 'my_client'.",
+    },
+  },
+};
diff --git a/src/i18n.ts b/src/i18n.ts
index d13a837527..0bd1df6398 100644
--- a/src/i18n.ts
+++ b/src/i18n.ts
@@ -25,6 +25,8 @@ import userFederationHelp from "./user-federation/help";
 import identityProviders from "./identity-providers/messages";
 import identityProvidersHelp from "./identity-providers/help";
 
+import dynamicLabels from "./components/dynamic/labels";
+
 export const DEFAULT_LOCALE = "en";
 
 const initOptions = {
@@ -55,6 +57,7 @@ const initOptions = {
       ...identityProvidersHelp,
       ...userFederation,
       ...userFederationHelp,
+      ...dynamicLabels,
     },
   },
   lng: DEFAULT_LOCALE,
diff --git a/src/realm-settings/ExecutorForm.tsx b/src/realm-settings/ExecutorForm.tsx
index 23968bd92a..64c16a9da7 100644
--- a/src/realm-settings/ExecutorForm.tsx
+++ b/src/realm-settings/ExecutorForm.tsx
@@ -22,11 +22,8 @@ import type ComponentTypeRepresentation from "@keycloak/keycloak-admin-client/li
 import type { ConfigPropertyRepresentation } from "@keycloak/keycloak-admin-client/lib/defs/authenticatorConfigInfoRepresentation";
 import type ClientProfileRepresentation from "@keycloak/keycloak-admin-client/lib/defs/clientProfileRepresentation";
 import { ClientProfileParams, toClientProfile } from "./routes/ClientProfile";
-import {
-  COMPONENTS,
-  isValidComponentType,
-} from "../client-scopes/add/components/components";
 import type ClientPolicyExecutorRepresentation from "@keycloak/keycloak-admin-client/lib/defs/clientPolicyExecutorRepresentation";
+import { DynamicComponents } from "../components/dynamic/DynamicComponents";
 
 type ExecutorForm = Required<ClientPolicyExecutorRepresentation>;
 
@@ -68,9 +65,6 @@ export default function ExecutorForm() {
     []
   );
 
-  const fldNameFormatter = (name: string) =>
-    name.toLowerCase().trim().split(/\s+/).join("-");
-
   const save = async () => {
     const formValues = form.getValues();
     const updatedProfiles = profiles.map((profile) => {
@@ -160,24 +154,7 @@ export default function ExecutorForm() {
             />
           </FormGroup>
           <FormProvider {...form}>
-            {executorProperties.map((option) => {
-              const componentType = option.type!;
-              if (isValidComponentType(componentType)) {
-                const Component = COMPONENTS[componentType];
-                return (
-                  <Component
-                    key={option.name}
-                    {...option}
-                    name={fldNameFormatter(option.label!)}
-                    label={option.label}
-                  />
-                );
-              } else {
-                console.warn(
-                  `There is no editor registered for ${componentType}`
-                );
-              }
-            })}
+            <DynamicComponents properties={executorProperties} />
           </FormProvider>
           <ActionGroup>
             <Button
diff --git a/src/realm-settings/NewClientPolicyCondition.tsx b/src/realm-settings/NewClientPolicyCondition.tsx
index e6f8d43fb1..5a6f255bae 100644
--- a/src/realm-settings/NewClientPolicyCondition.tsx
+++ b/src/realm-settings/NewClientPolicyCondition.tsx
@@ -24,12 +24,9 @@ import { useHistory, useParams } from "react-router";
 import type ComponentTypeRepresentation from "@keycloak/keycloak-admin-client/lib/defs/componentTypeRepresentation";
 import { useRealm } from "../context/realm-context/RealmContext";
 import type { EditClientPolicyParams } from "./routes/EditClientPolicy";
-import {
-  COMPONENTS,
-  isValidComponentType,
-} from "../client-scopes/add/components/components";
 import type { ConfigPropertyRepresentation } from "@keycloak/keycloak-admin-client/lib/defs/authenticatorConfigInfoRepresentation";
 import type ClientPolicyConditionRepresentation from "@keycloak/keycloak-admin-client/lib/defs/clientPolicyConditionRepresentation";
+import { DynamicComponents } from "../components/dynamic/DynamicComponents";
 
 export type ItemType = { value: string };
 
@@ -208,24 +205,7 @@ export default function NewClientPolicyCondition() {
             />
           </FormGroup>
           <FormProvider {...form}>
-            {conditionProperties.map((option) => {
-              const componentType = option.type!;
-              if (isValidComponentType(componentType)) {
-                const Component = COMPONENTS[componentType];
-                return (
-                  <Component
-                    key={option.name}
-                    {...option}
-                    name={option.name}
-                    label={option.label}
-                  />
-                );
-              } else {
-                console.warn(
-                  `There is no editor registered for ${componentType}`
-                );
-              }
-            })}
+            <DynamicComponents properties={conditionProperties} />
           </FormProvider>
           <ActionGroup>
             <Button
diff --git a/src/realm-settings/messages.ts b/src/realm-settings/messages.ts
index a463778abb..72e3d80358 100644
--- a/src/realm-settings/messages.ts
+++ b/src/realm-settings/messages.ts
@@ -322,7 +322,6 @@ export default {
     clientProfilesHelpItem: "Client profiles help item",
     addClientProfile: "Add client profile",
     emptyProfiles: "No client profiles configured",
-    addMultivaluedLabel: "Add {{fieldLabel}}",
     tokens: "Tokens",
     key: "Key",
     value: "Value",
diff --git a/src/util.ts b/src/util.ts
index e9040cbad4..ae31979813 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -54,13 +54,17 @@ export const exportClient = (client: ClientRepresentation): void => {
 export const toUpperCase = <T extends string>(name: T) =>
   (name.charAt(0).toUpperCase() + name.slice(1)) as Capitalize<T>;
 
+export const convertToHyphens = (s: string) => {
+  return s.replaceAll(".", "-");
+};
+
 export const convertToFormValues = (
   obj: any,
   prefix: string,
   setValue: (name: string, value: any) => void
 ) => {
   return Object.keys(obj).map((key) => {
-    const newKey = key.replace(/\./g, "-");
+    const newKey = convertToHyphens(key);
     setValue(prefix + "." + newKey, obj[key]);
   });
 };
@@ -189,10 +193,6 @@ export const interpolateTimespan = (forHumans: string) => {
   }
 };
 
-export const convertToHyphens = (s: string) => {
-  return s.replaceAll(".", "-");
-};
-
 export const KEY_PROVIDER_TYPE = "org.keycloak.keys.KeyProvider";
 
 export const prettyPrintJSON = (value: any) => JSON.stringify(value, null, 2);