diff --git a/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/identity_providers/CreateProviderPage.ts b/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/identity_providers/CreateProviderPage.ts
index 266d2da3de..fd81a94f0c 100644
--- a/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/identity_providers/CreateProviderPage.ts
+++ b/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/identity_providers/CreateProviderPage.ts
@@ -5,7 +5,7 @@ export default class CreateProviderPage {
   #clientSecretField = "clientSecret";
   #displayName = "displayName";
   #discoveryEndpoint = "discoveryEndpoint";
-  #authorizationUrl = "authorizationUrl";
+  #authorizationUrl = "config.authorizationUrl";
   #addButton = "createProvider";
   #saveButton = "idp-details-save";
   #ssoServiceUrl = "sso-service-url";
diff --git a/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/identity_providers/ProviderBaseAdvancedSettingsPage.ts b/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/identity_providers/ProviderBaseAdvancedSettingsPage.ts
index b5aae37e1e..d70fdd615c 100644
--- a/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/identity_providers/ProviderBaseAdvancedSettingsPage.ts
+++ b/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/identity_providers/ProviderBaseAdvancedSettingsPage.ts
@@ -79,10 +79,10 @@ export default class ProviderBaseGeneralSettingsPage extends PageObject {
   #saveBtn = "idp-details-save";
   #revertBtn = "idp-details-revert";
 
-  #validateSignature = "#validateSignature";
-  #jwksSwitch = "#useJwksUrl";
-  #jwksUrl = "jwksUrl";
-  #pkceSwitch = "#pkceEnabled";
+  #validateSignature = "#config\\.validateSignature";
+  #jwksSwitch = "#config\\.useJwksUrl";
+  #jwksUrl = "config.jwksUrl";
+  #pkceSwitch = "#config\\.pkceEnabled";
   #pkceMethod = "#pkceMethod";
   #clientAuth = "#clientAuthentication";
   #clientAssertionSigningAlg = "#clientAssertionSigningAlg";
@@ -347,9 +347,8 @@ export default class ProviderBaseGeneralSettingsPage extends PageObject {
 
   public assertOIDCUrl(url: string) {
     cy.findByTestId("jump-link-openid-connect-settings").click();
-    cy.findByTestId(url + "Url")
-      .clear()
-      .type("invalidUrl");
+    cy.findByTestId(`config.${url}Url`).clear();
+    cy.findByTestId(`config.${url}Url`).type("invalidUrl");
     this.clickSaveBtn();
     masthead.checkNotificationMessage(
       "Could not update the provider The url [" + url + "_url] is malformed",
diff --git a/js/apps/admin-ui/src/identity-providers/add/DiscoverySettings.tsx b/js/apps/admin-ui/src/identity-providers/add/DiscoverySettings.tsx
index 659da332aa..de8124e2e6 100644
--- a/js/apps/admin-ui/src/identity-providers/add/DiscoverySettings.tsx
+++ b/js/apps/admin-ui/src/identity-providers/add/DiscoverySettings.tsx
@@ -1,22 +1,10 @@
 import IdentityProviderRepresentation from "@keycloak/keycloak-admin-client/lib/defs/identityProviderRepresentation";
-import {
-  ExpandableSection,
-  FormGroup,
-  Select,
-  SelectOption,
-  SelectVariant,
-  ValidatedOptions,
-} from "@patternfly/react-core";
+import { ExpandableSection } from "@patternfly/react-core";
 import { useState } from "react";
-import { Controller, useFormContext, useWatch } from "react-hook-form";
+import { useFormContext, useWatch } from "react-hook-form";
 import { useTranslation } from "react-i18next";
-
-import { HelpItem } from "ui-shared";
-import { KeycloakTextArea } from "../../components/keycloak-text-area/KeycloakTextArea";
-import { KeycloakTextInput } from "../../components/keycloak-text-input/KeycloakTextInput";
-import { FormGroupField } from "../component/FormGroupField";
-import { SwitchField } from "../component/SwitchField";
-import { TextField } from "../component/TextField";
+import { SelectControl, TextAreaControl, TextControl } from "ui-shared";
+import { DefaultSwitchControl } from "../../components/SwitchControl";
 
 import "./discovery-settings.css";
 
@@ -28,12 +16,7 @@ type DiscoverySettingsProps = {
 
 const Fields = ({ readOnly }: DiscoverySettingsProps) => {
   const { t } = useTranslation();
-  const [pkceMethodOpen, setPkceMethodOpen] = useState(false);
-  const {
-    register,
-    control,
-    formState: { errors },
-  } = useFormContext<IdentityProviderRepresentation>();
+  const { control } = useFormContext<IdentityProviderRepresentation>();
 
   const validateSignature = useWatch({
     control,
@@ -50,152 +33,93 @@ const Fields = ({ readOnly }: DiscoverySettingsProps) => {
 
   return (
     <div className="pf-c-form pf-m-horizontal">
-      <FormGroup
+      <TextControl
+        name="config.authorizationUrl"
         label={t("authorizationUrl")}
-        fieldId="kc-authorization-url"
-        isRequired
-        validated={
-          errors.config?.authorizationUrl
-            ? ValidatedOptions.error
-            : ValidatedOptions.default
-        }
-        helperTextInvalid={t("required")}
-      >
-        <KeycloakTextInput
-          type="url"
-          data-testid="authorizationUrl"
-          id="kc-authorization-url"
-          validated={
-            errors.config?.authorizationUrl
-              ? ValidatedOptions.error
-              : ValidatedOptions.default
-          }
-          isReadOnly={readOnly}
-          {...register("config.authorizationUrl", { required: true })}
-        />
-      </FormGroup>
-
-      <FormGroup
+        type="url"
+        readOnly={readOnly}
+        rules={{
+          required: t("required"),
+        }}
+      />
+      <TextControl
+        name="config.tokenUrl"
         label={t("tokenUrl")}
-        fieldId="tokenUrl"
-        isRequired
-        validated={
-          errors.config?.tokenUrl
-            ? ValidatedOptions.error
-            : ValidatedOptions.default
-        }
-        helperTextInvalid={t("required")}
-      >
-        <KeycloakTextInput
-          type="url"
-          id="tokenUrl"
-          data-testid="tokenUrl"
-          validated={
-            errors.config?.tokenUrl
-              ? ValidatedOptions.error
-              : ValidatedOptions.default
-          }
-          isReadOnly={readOnly}
-          {...register("config.tokenUrl", { required: true })}
-        />
-      </FormGroup>
-      <TextField
-        field="config.logoutUrl"
-        label="logoutUrl"
-        isReadOnly={readOnly}
+        type="url"
+        readOnly={readOnly}
+        rules={{
+          required: t("required"),
+        }}
       />
-      <TextField
-        field="config.userInfoUrl"
-        label="userInfoUrl"
-        isReadOnly={readOnly}
+      <TextControl
+        name="config.logoutUrl"
+        label={t("logoutUrl")}
+        readOnly={readOnly}
       />
-      <TextField field="config.issuer" label="issuer" isReadOnly={readOnly} />
-      <SwitchField
-        field="config.validateSignature"
-        label="validateSignature"
-        isReadOnly={readOnly}
+      <TextControl
+        name="config.userInfoUrl"
+        label={t("userInfoUrl")}
+        readOnly={readOnly}
+      />
+      <TextControl
+        name="config.issuer"
+        label={t("issuer")}
+        readOnly={readOnly}
+      />
+      <DefaultSwitchControl
+        name="config.validateSignature"
+        label={t("validateSignature")}
+        isDisabled={readOnly}
+        stringify
       />
       {validateSignature === "true" && (
         <>
-          <SwitchField
-            field="config.useJwksUrl"
-            label="useJwksUrl"
-            data-testid="useJwksUrl"
-            isReadOnly={readOnly}
+          <DefaultSwitchControl
+            name="config.useJwksUrl"
+            label={t("useJwksUrl")}
+            isDisabled={readOnly}
+            stringify
           />
           {useJwks === "true" ? (
-            <TextField
-              field="config.jwksUrl"
-              label="jwksUrl"
-              isReadOnly={readOnly}
+            <TextAreaControl
+              name="config.jwksUrl"
+              label={t("jwksUrl")}
+              readOnly={readOnly}
             />
           ) : (
             <>
-              <FormGroupField label="validatingPublicKey">
-                <KeycloakTextArea
-                  data-testid="validatingPublicKey"
-                  aria-label={t("validatingPublicKey")}
-                  {...register("config.publicKeySignatureVerifier")}
-                />
-              </FormGroupField>
-              <TextField
-                field="config.publicKeySignatureVerifierKeyId"
-                label="validatingPublicKeyId"
-                isReadOnly={readOnly}
+              <TextControl
+                name="config.publicKeySignatureVerifier"
+                label="validatingPublicKey"
+              />
+              <TextControl
+                name="config.publicKeySignatureVerifierKeyId"
+                label={t("validatingPublicKeyId")}
+                readOnly={readOnly}
               />
             </>
           )}
         </>
       )}
-      <SwitchField
-        field="config.pkceEnabled"
-        label="pkceEnabled"
-        isReadOnly={readOnly}
+      <DefaultSwitchControl
+        name="config.pkceEnabled"
+        label={t("pkceEnabled")}
+        isDisabled={readOnly}
+        stringify
       />
       {isPkceEnabled === "true" && (
-        <FormGroup
-          className="pf-u-pb-3xl"
+        <SelectControl
+          name="config.pkceMethod"
           label={t("pkceMethod")}
-          labelIcon={
-            <HelpItem
-              helpText={t("pkceMethodHelp")}
-              fieldLabelId="pkceMethod"
-            />
-          }
-          fieldId="pkceMethod"
-        >
-          <Controller
-            name="config.pkceMethod"
-            defaultValue={PKCE_METHODS[0]}
-            control={control}
-            render={({ field }) => (
-              <Select
-                toggleId="pkceMethod"
-                required
-                direction="down"
-                onToggle={() => setPkceMethodOpen(!pkceMethodOpen)}
-                onSelect={(_, value) => {
-                  field.onChange(value as string);
-                  setPkceMethodOpen(false);
-                }}
-                selections={t(`${field.value}`)}
-                variant={SelectVariant.single}
-                aria-label={t("pkceMethod")}
-                isOpen={pkceMethodOpen}
-              >
-                {PKCE_METHODS.map((option) => (
-                  <SelectOption
-                    selected={option === field.value}
-                    key={option}
-                    value={option}
-                  >
-                    {t(`${option}`)}
-                  </SelectOption>
-                ))}
-              </Select>
-            )}
-          />
-        </FormGroup>
+          labelIcon={t("pkceMethodHelp")}
+          controller={{
+            defaultValue: PKCE_METHODS[0],
+          }}
+          options={PKCE_METHODS.map((option) => ({
+            key: option,
+            value: t(`${option}`),
+          }))}
+        />
       )}
     </div>
   );
diff --git a/js/apps/admin-ui/src/identity-providers/add/OIDCGeneralSettings.tsx b/js/apps/admin-ui/src/identity-providers/add/OIDCGeneralSettings.tsx
index a77e1af828..917bbef64e 100644
--- a/js/apps/admin-ui/src/identity-providers/add/OIDCGeneralSettings.tsx
+++ b/js/apps/admin-ui/src/identity-providers/add/OIDCGeneralSettings.tsx
@@ -1,54 +1,33 @@
-import { FormGroup, ValidatedOptions } from "@patternfly/react-core";
-import { useWatch, useFormContext } from "react-hook-form";
+import { useFormContext, useWatch } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useParams } from "react-router-dom";
-
-import { HelpItem } from "ui-shared";
-import { KeycloakTextInput } from "../../components/keycloak-text-input/KeycloakTextInput";
+import { TextControl } from "ui-shared";
 import { DisplayOrder } from "../component/DisplayOrder";
 import { RedirectUrl } from "../component/RedirectUrl";
-import { TextField } from "../component/TextField";
 import type { IdentityProviderParams } from "../routes/IdentityProvider";
 
 export const OIDCGeneralSettings = () => {
   const { t } = useTranslation();
   const { tab } = useParams<IdentityProviderParams>();
 
-  const {
-    register,
-    control,
-    formState: { errors },
-  } = useFormContext();
-
+  const { control } = useFormContext();
   const alias = useWatch({ control, name: "alias" });
 
   return (
     <>
       <RedirectUrl id={alias} />
 
-      <FormGroup
+      <TextControl
+        name="alias"
         label={t("alias")}
-        labelIcon={<HelpItem helpText={t("aliasHelp")} fieldLabelId="alias" />}
-        fieldId="alias"
-        isRequired
-        validated={
-          errors.alias ? ValidatedOptions.error : ValidatedOptions.default
-        }
-        helperTextInvalid={t("required")}
-      >
-        <KeycloakTextInput
-          isReadOnly={tab === "settings"}
-          isRequired
-          id="alias"
-          data-testid="alias"
-          validated={
-            errors.alias ? ValidatedOptions.error : ValidatedOptions.default
-          }
-          {...register("alias", { required: true })}
-        />
-      </FormGroup>
+        labelIcon={t("aliasHelp")}
+        readOnly={tab === "settings"}
+        rules={{
+          required: t("required"),
+        }}
+      />
 
-      <TextField field="displayName" label="displayName" />
+      <TextControl name="displayName" label={t("displayName")} />
       <DisplayOrder />
     </>
   );
diff --git a/js/apps/admin-ui/src/identity-providers/add/SamlConnectSettings.tsx b/js/apps/admin-ui/src/identity-providers/add/SamlConnectSettings.tsx
index ad5541f185..3111906b03 100644
--- a/js/apps/admin-ui/src/identity-providers/add/SamlConnectSettings.tsx
+++ b/js/apps/admin-ui/src/identity-providers/add/SamlConnectSettings.tsx
@@ -3,11 +3,9 @@ import type IdentityProviderRepresentation from "@keycloak/keycloak-admin-client
 import { FormGroup, Title } from "@patternfly/react-core";
 import { useFormContext } from "react-hook-form";
 import { useTranslation } from "react-i18next";
-import { HelpItem } from "ui-shared";
-
+import { HelpItem, TextControl } from "ui-shared";
 import { adminClient } from "../../admin-client";
 import { FileUploadForm } from "../../components/json-file-upload/FileUploadForm";
-import { KeycloakTextInput } from "../../components/keycloak-text-input/KeycloakTextInput";
 import { useRealm } from "../../context/realm-context/RealmContext";
 import environment from "../../environment";
 import { addTrailingSlash } from "../../util";
@@ -26,7 +24,6 @@ export const SamlConnectSettings = () => {
   const { realm } = useRealm();
   const {
     setValue,
-    register,
     setError,
     clearErrors,
     formState: { errors },
@@ -81,27 +78,15 @@ export const SamlConnectSettings = () => {
         {t("samlSettings")}
       </Title>
 
-      <FormGroup
+      <TextControl
+        name="config.entityId"
         label={t("serviceProviderEntityId")}
-        fieldId="kc-service-provider-entity-id"
-        labelIcon={
-          <HelpItem
-            helpText={t("serviceProviderEntityIdHelp")}
-            fieldLabelId="serviceProviderEntityId"
-          />
-        }
-        isRequired
-        helperTextInvalid={t("required")}
-        validated={errors.config?.entityId ? "error" : "default"}
-      >
-        <KeycloakTextInput
-          data-testid="serviceProviderEntityId"
-          id="kc-service-provider-entity-id"
-          validated={errors.config?.entityId ? "error" : "default"}
-          defaultValue={`${environment.authServerUrl}/realms/${realm}`}
-          {...register("config.entityId", { required: true })}
-        />
-      </FormGroup>
+        labelIcon={t("serviceProviderEntityIdHelp")}
+        defaultValue={`${environment.authServerUrl}/realms/${realm}`}
+        rules={{
+          required: t("required"),
+        }}
+      />
 
       <DiscoveryEndpointField
         id="saml"
diff --git a/js/apps/admin-ui/src/identity-providers/add/SamlGeneralSettings.tsx b/js/apps/admin-ui/src/identity-providers/add/SamlGeneralSettings.tsx
index f9f4b172fc..75c93a8617 100644
--- a/js/apps/admin-ui/src/identity-providers/add/SamlGeneralSettings.tsx
+++ b/js/apps/admin-ui/src/identity-providers/add/SamlGeneralSettings.tsx
@@ -1,15 +1,12 @@
-import { FormGroup, ValidatedOptions } from "@patternfly/react-core";
-import { useWatch, useFormContext } from "react-hook-form";
+import { FormGroup } from "@patternfly/react-core";
+import { useFormContext, useWatch } from "react-hook-form";
 import { useTranslation } from "react-i18next";
-
+import { HelpItem, TextControl } from "ui-shared";
 import { FormattedLink } from "../../components/external-link/FormattedLink";
-import { HelpItem } from "ui-shared";
-import { KeycloakTextInput } from "../../components/keycloak-text-input/KeycloakTextInput";
 import { useRealm } from "../../context/realm-context/RealmContext";
 import environment from "../../environment";
 import { DisplayOrder } from "../component/DisplayOrder";
 import { RedirectUrl } from "../component/RedirectUrl";
-import { TextField } from "../component/TextField";
 
 import "./saml-general-settings.css";
 
@@ -23,47 +20,26 @@ export const SamlGeneralSettings = ({
   const { t } = useTranslation();
   const { realm } = useRealm();
 
-  const {
-    register,
-    control,
-    formState: { errors },
-  } = useFormContext();
-
+  const { control } = useFormContext();
   const alias = useWatch({ control, name: "alias" });
 
   return (
     <>
       <RedirectUrl id={alias} />
 
-      <FormGroup
+      <TextControl
+        name="alias"
         label={t("alias")}
-        labelIcon={<HelpItem helpText={t("aliasHelp")} fieldLabelId="alias" />}
-        fieldId="alias"
-        isRequired
-        validated={
-          errors.alias ? ValidatedOptions.error : ValidatedOptions.default
-        }
-        helperTextInvalid={t("required")}
-      >
-        <KeycloakTextInput
-          isRequired
-          id="alias"
-          data-testid="alias"
-          isReadOnly={isAliasReadonly}
-          validated={
-            errors.alias ? ValidatedOptions.error : ValidatedOptions.default
-          }
-          {...register("alias", { required: true })}
-        />
-      </FormGroup>
-
-      <TextField
-        field="displayName"
-        label="displayName"
-        data-testid="displayName"
+        labelIcon={t("aliasHelp")}
+        readOnly={isAliasReadonly}
+        rules={{
+          required: t("required"),
+        }}
       />
+
+      <TextControl name="displayName" label={t("displayName")} />
       <DisplayOrder />
-      {isAliasReadonly ? (
+      {isAliasReadonly && (
         <FormGroup
           label={t("endpoints")}
           fieldId="endpoints"
@@ -78,7 +54,7 @@ export const SamlGeneralSettings = ({
             isInline
           />
         </FormGroup>
-      ) : null}
+      )}
     </>
   );
 };
diff --git a/js/libs/ui-shared/src/controls/SelectControl.tsx b/js/libs/ui-shared/src/controls/SelectControl.tsx
index b900c35233..6d0671a615 100644
--- a/js/libs/ui-shared/src/controls/SelectControl.tsx
+++ b/js/libs/ui-shared/src/controls/SelectControl.tsx
@@ -44,7 +44,7 @@ export const SelectControl = <
   label,
   options,
   controller,
-  variant,
+  variant = SelectVariant.single,
   labelIcon,
   ...rest
 }: SelectControlProps<T, P>) => {
diff --git a/js/libs/ui-shared/src/controls/TextAreaControl.tsx b/js/libs/ui-shared/src/controls/TextAreaControl.tsx
index 86955ef651..c42bf24ba2 100644
--- a/js/libs/ui-shared/src/controls/TextAreaControl.tsx
+++ b/js/libs/ui-shared/src/controls/TextAreaControl.tsx
@@ -1,4 +1,4 @@
-import { ValidatedOptions } from "@patternfly/react-core";
+import { TextAreaProps, ValidatedOptions } from "@patternfly/react-core";
 import {
   FieldPath,
   FieldValues,
@@ -13,11 +13,12 @@ import { KeycloakTextArea } from "./keycloak-text-area/KeycloakTextArea";
 export type TextAreaControlProps<
   T extends FieldValues,
   P extends FieldPath<T> = FieldPath<T>,
-> = UseControllerProps<T, P> & {
-  label: string;
-  labelIcon?: string;
-  isDisabled?: boolean;
-};
+> = UseControllerProps<T, P> &
+  TextAreaProps & {
+    label: string;
+    labelIcon?: string;
+    isDisabled?: boolean;
+  };
 
 export const TextAreaControl = <
   T extends FieldValues,