diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConfig/ConnectionConfigForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConfig/ConnectionConfigForm.tsx
index c95b5e11baee..499f76722e9f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConfig/ConnectionConfigForm.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConfig/ConnectionConfigForm.tsx
@@ -12,7 +12,7 @@
  */
 
 import Form, { IChangeEvent } from '@rjsf/core';
-import { RegistryFieldsType } from '@rjsf/utils';
+import { RegistryFieldsType, RJSFSchema } from '@rjsf/utils';
 import validator from '@rjsf/validator-ajv8';
 import { Alert } from 'antd';
 
@@ -30,6 +30,7 @@ import { useApplicationStore } from '../../../../hooks/useApplicationStore';
 import { ConfigData } from '../../../../interface/service.interface';
 import { getPipelineServiceHostIp } from '../../../../rest/ingestionPipelineAPI';
 import brandClassBase from '../../../../utils/BrandData/BrandClassBase';
+import connectionsRouterClassBase from '../../../../utils/ConnectionsRouterClassBase';
 import i18n, { Transi18next } from '../../../../utils/i18next/LocalUtil';
 import { formatFormDataForSubmit } from '../../../../utils/JSONSchemaFormUtils';
 import {
@@ -41,6 +42,7 @@ import AirflowMessageBanner from '../../../common/AirflowMessageBanner/AirflowMe
 import BooleanFieldTemplate from '../../../common/Form/JSONSchema/JSONSchemaTemplate/BooleanFieldTemplate';
 import WorkflowArrayFieldTemplate from '../../../common/Form/JSONSchema/JSONSchemaTemplate/WorkflowArrayFieldTemplate';
 import FormBuilder from '../../../common/FormBuilder/FormBuilder';
+import FormBuilderV1 from '../../../common/FormBuilderV1/FormBuilderV1';
 import InlineAlert from '../../../common/InlineAlert/InlineAlert';
 import TestConnection from '../../../common/TestConnection/TestConnection';
 import { ConnectionConfigFormProps } from './ConnectionConfigForm.interface';
@@ -66,6 +68,8 @@ const ConnectionConfigForm = ({
   const { isAirflowAvailable, platform } = useAirflowStatus();
   const [hostIp, setHostIp] = useState<string>();
 
+  const isEmbeddedMode = connectionsRouterClassBase.isEmbeddedMode();
+
   const fetchHostIp = async () => {
     try {
       const { status, data } = await getPipelineServiceHostIp();
@@ -96,8 +100,8 @@ const ConnectionConfigForm = ({
   };
 
   const customFields: RegistryFieldsType = {
-    BooleanField: BooleanFieldTemplate,
-    ArrayField: WorkflowArrayFieldTemplate,
+    ...(isEmbeddedMode ? {} : { BooleanField: BooleanFieldTemplate }),
+    ...(isEmbeddedMode ? {} : { ArrayField: WorkflowArrayFieldTemplate }),
   };
 
   const { connSch, validConfig } = useMemo(
@@ -109,6 +113,7 @@ const ConnectionConfigForm = ({
       }),
     [data, serviceCategory, serviceType]
   );
+  const connectionSchema = connSch.schema as RJSFSchema;
 
   const shouldShowIPAlert = useMemo(() => {
     return (
@@ -124,16 +129,20 @@ const ConnectionConfigForm = ({
   // Remove the filters property from the schema
   // Since it'll have a separate form in the next step
   const propertiesWithoutDefaultFilterPatternFields = useMemo(
-    () => getFilteredSchema(connSch.schema.properties),
-    [connSch.schema.properties]
+    () =>
+      getFilteredSchema(
+        connectionSchema.properties as Record<string, unknown> | undefined
+      ),
+    [connectionSchema.properties]
   );
 
-  const schemaWithoutDefaultFilterPatternFields = useMemo(
+  const schemaWithoutDefaultFilterPatternFields = useMemo<RJSFSchema>(
     () => ({
-      ...connSch.schema,
-      properties: propertiesWithoutDefaultFilterPatternFields,
+      ...connectionSchema,
+      properties:
+        propertiesWithoutDefaultFilterPatternFields as RJSFSchema['properties'],
     }),
-    [connSch.schema, propertiesWithoutDefaultFilterPatternFields]
+    [connectionSchema, propertiesWithoutDefaultFilterPatternFields]
   );
 
   // UI Schema to hide the nested default filter pattern fields
@@ -153,61 +162,86 @@ const ConnectionConfigForm = ({
     }
   }, [formRef.current?.state?.formData]);
 
+  const formChildren = (
+    <>
+      {isEmpty(connSch.schema) && (
+        <div
+          className="text-grey-muted text-center"
+          data-testid="no-config-available">
+          {t('message.no-config-available')}
+        </div>
+      )}
+      {shouldShowIPAlert && (
+        <Alert
+          className="tw:mt-2 tw:rounded-lg"
+          data-testid="ip-address"
+          description={
+            <Transi18next
+              i18nKey="message.airflow-host-ip-address"
+              renderElement={<strong />}
+              values={{ hostIp, brandName: brandClassBase.getPageTitle() }}
+            />
+          }
+          type="info"
+        />
+      )}
+      {!isEmpty(connSch.schema) &&
+        isAirflowAvailable &&
+        formRef.current?.state?.formData && (
+          <TestConnection
+            connectionType={serviceType}
+            getData={() => formRef.current?.state?.formData}
+            hostIp={hostIp}
+            isTestingDisabled={disableTestConnection}
+            serviceCategory={serviceCategory}
+            serviceName={data?.name}
+            onValidateFormRequiredFields={handleRequiredFieldsValidation}
+          />
+        )}
+      {!isUndefined(inlineAlertDetails) && (
+        <InlineAlert alertClassName="m-t-xs" {...inlineAlertDetails} />
+      )}
+    </>
+  );
+
   return (
     <Fragment>
       <AirflowMessageBanner />
-      <FormBuilder
-        useSelectWidget
-        cancelText={cancelText ?? ''}
-        fields={customFields}
-        formData={validConfig}
-        okText={okText ?? ''}
-        ref={formRef}
-        schema={schemaWithoutDefaultFilterPatternFields}
-        serviceCategory={serviceCategory}
-        status={status}
-        uiSchema={uiSchema}
-        validator={validator}
-        onCancel={onCancel}
-        onFocus={onFocus}
-        onSubmit={handleSave}>
-        {isEmpty(connSch.schema) && (
-          <div
-            className="text-grey-muted text-center"
-            data-testid="no-config-available">
-            {t('message.no-config-available')}
-          </div>
-        )}
-        {shouldShowIPAlert && (
-          <Alert
-            data-testid="ip-address"
-            description={
-              <Transi18next
-                i18nKey="message.airflow-host-ip-address"
-                renderElement={<strong />}
-                values={{ hostIp, brandName: brandClassBase.getPageTitle() }}
-              />
-            }
-            type="info"
-          />
-        )}
-        {!isEmpty(connSch.schema) &&
-          isAirflowAvailable &&
-          formRef.current?.state?.formData && (
-            <TestConnection
-              connectionType={serviceType}
-              getData={() => formRef.current?.state?.formData}
-              hostIp={hostIp}
-              isTestingDisabled={disableTestConnection}
-              serviceCategory={serviceCategory}
-              serviceName={data?.name}
-              onValidateFormRequiredFields={handleRequiredFieldsValidation}
-            />
-          )}
-        {!isUndefined(inlineAlertDetails) && (
-          <InlineAlert alertClassName="m-t-xs" {...inlineAlertDetails} />
-        )}
-      </FormBuilder>
+      {isEmbeddedMode ? (
+        <FormBuilderV1
+          cancelText={cancelText ?? ''}
+          fields={customFields}
+          formContext={{ handleFocus: onFocus }}
+          formData={validConfig}
+          okText={okText ?? ''}
+          ref={formRef}
+          schema={schemaWithoutDefaultFilterPatternFields}
+          status={status}
+          uiSchema={uiSchema}
+          onCancel={onCancel}
+          onFocus={onFocus}
+          onSubmit={handleSave}>
+          {formChildren}
+        </FormBuilderV1>
+      ) : (
+        <FormBuilder
+          useSelectWidget
+          cancelText={cancelText ?? ''}
+          fields={customFields}
+          formData={validConfig}
+          okText={okText ?? ''}
+          ref={formRef}
+          schema={schemaWithoutDefaultFilterPatternFields}
+          serviceCategory={serviceCategory}
+          status={status}
+          uiSchema={uiSchema}
+          validator={validator}
+          onCancel={onCancel}
+          onFocus={onFocus}
+          onSubmit={handleSave}>
+          {formChildren}
+        </FormBuilder>
+      )}
     </Fragment>
   );
 };
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx
index c93242728c8e..ee82fa24902f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx
@@ -44,16 +44,14 @@ import { DatabaseServiceSearchSource } from '../../../interface/search.interface
 import { ServicesType } from '../../../interface/service.interface';
 import { getServices, searchService } from '../../../rest/serviceAPI';
 import { getServiceLogo } from '../../../utils/CommonUtils';
+import connectionsRouterClassBase from '../../../utils/ConnectionsRouterClassBase';
 import {
   getColumnSorter,
   getEntityName,
   highlightSearchText,
 } from '../../../utils/EntityUtils';
 import { checkPermission } from '../../../utils/PermissionsUtils';
-import {
-  getAddServicePath,
-  getServiceDetailsPath,
-} from '../../../utils/RouterUtils';
+import { getServiceDetailsPath } from '../../../utils/RouterUtils';
 import serviceUtilClassBase from '../../../utils/ServiceUtilClassBase';
 import {
   getOptionalFields,
@@ -85,7 +83,7 @@ const Services = ({ serviceName }: ServicesProps) => {
 
   const navigate = useNavigate();
   const handleAddServiceClick = () => {
-    navigate(getAddServicePath(serviceName));
+    navigate(connectionsRouterClassBase.getAddServicePath(serviceName));
   };
 
   const [isLoading, setIsLoading] = useState(true);
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/FormBuilderV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/FormBuilderV1.test.tsx
index b53d3492c6fb..1052cf3f5df7 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/FormBuilderV1.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/FormBuilderV1.test.tsx
@@ -100,6 +100,10 @@ describe('FormBuilderV1', () => {
     jest.clearAllMocks();
   });
 
+  it('sets a displayName for React DevTools and linting', () => {
+    expect(FormBuilderV1.displayName).toBe('FormBuilderV1');
+  });
+
   it('renders with formatted form data and default actions', () => {
     render(<FormBuilderV1 formData={{ name: 'value' }} schema={schema} />);
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/FormBuilderV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/FormBuilderV1.tsx
index 3e0ef6c46ef6..374d70ea788a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/FormBuilderV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/FormBuilderV1.tsx
@@ -15,124 +15,158 @@ import { Button } from '@openmetadata/ui-core-components';
 import Form, { IChangeEvent } from '@rjsf/core';
 import { RJSFSchema } from '@rjsf/utils';
 import validator from '@rjsf/validator-ajv8';
-import { useEffect, useState } from 'react';
+import { forwardRef, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { transformErrors } from '../../../utils/formUtils';
 import { formatFormDataForRender } from '../../../utils/JSONSchemaFormUtils';
+import CoreArrayField from './fields/CoreArrayField';
+import CoreBooleanField from './fields/CoreBooleanField';
+import CoreOneOfField from './fields/CoreOneOfField';
 import LayoutGridField from './fields/LayoutGridField';
 import { FormBuilderV1Props } from './FormBuilderV1.interface';
 import { CoreArrayFieldTemplate } from './templates/CoreArrayFieldTemplate';
 import { CoreFieldErrorTemplate } from './templates/CoreFieldErrorTemplate';
 import { CoreFieldTemplate } from './templates/CoreFieldTemplate';
 import { CoreObjectFieldTemplate } from './templates/CoreObjectFieldTemplate';
+import { CoreWrapIfAdditionalTemplate } from './templates/CoreWrapIfAdditionalTemplate';
 import CoreCheckboxWidget from './widgets/CoreCheckboxWidget';
 import CoreInputWidget from './widgets/CoreInputWidget';
+import CorePasswordWidget from './widgets/CorePasswordWidget';
 import CoreRadioWidget from './widgets/CoreRadioWidget';
 import CoreSelectWidget from './widgets/CoreSelectWidget';
 import CoreTextAreaWidget from './widgets/CoreTextAreaWidget';
 
-const FormBuilderV1 = ({
-  formData,
-  schema,
-  okText,
-  cancelText,
-  isLoading,
-  hideCancelButton = false,
-  status = 'initial',
-  onCancel,
-  onSubmit,
-  uiSchema,
-  children,
-  ...props
-}: FormBuilderV1Props) => {
-  const { t } = useTranslation();
+const defaultFields = {
+  AnyOfField: CoreOneOfField,
+  ArrayField: CoreArrayField,
+  BooleanField: CoreBooleanField,
+  OneOfField: CoreOneOfField,
+  LayoutGridField,
+};
 
-  const [localFormData, setLocalFormData] = useState(
-    formatFormDataForRender((formData ?? {}) as Record<string, unknown>)
-  );
+const defaultWidgets = {
+  CheckboxWidget: CoreCheckboxWidget,
+  EmailWidget: CoreInputWidget,
+  PasswordWidget: CorePasswordWidget,
+  RadioWidget: CoreRadioWidget,
+  SelectWidget: CoreSelectWidget,
+  TextWidget: CoreInputWidget,
+  TextareaWidget: CoreTextAreaWidget,
+  URLWidget: CoreInputWidget,
+  UpDownWidget: CoreInputWidget,
+};
 
-  useEffect(() => {
-    setLocalFormData(
-      formatFormDataForRender((formData ?? {}) as Record<string, unknown>)
-    );
-  }, [formData]);
+const FormBuilderV1 = forwardRef<Form, FormBuilderV1Props>(
+  (
+    {
+      formData,
+      schema,
+      okText,
+      cancelText,
+      isLoading,
+      hideCancelButton = false,
+      status = 'initial',
+      onCancel,
+      onSubmit,
+      uiSchema,
+      children,
+      ...props
+    },
+    ref
+  ) => {
+    const { t } = useTranslation();
 
-  const handleCancel = () => {
-    setLocalFormData(
+    const [localFormData, setLocalFormData] = useState(
       formatFormDataForRender((formData ?? {}) as Record<string, unknown>)
     );
-    onCancel?.();
-  };
 
-  const handleFormChange = (e: IChangeEvent) => {
-    setLocalFormData(e.formData ?? {});
-    props.onChange && props.onChange(e);
-  };
+    useEffect(() => {
+      setLocalFormData(
+        formatFormDataForRender((formData ?? {}) as Record<string, unknown>)
+      );
+    }, [formData]);
+
+    const handleCancel = () => {
+      setLocalFormData(
+        formatFormDataForRender((formData ?? {}) as Record<string, unknown>)
+      );
+      onCancel?.();
+    };
 
-  const isSubmitting = status === 'waiting';
+    const handleFormChange = (e: IChangeEvent) => {
+      setLocalFormData(e.formData ?? {});
+      props.onChange && props.onChange(e);
+    };
 
-  const fields = {
-    LayoutGridField,
-  };
+    const isSubmitting = status === 'waiting';
 
-  const widgets = {
-    CheckboxWidget: CoreCheckboxWidget,
-    EmailWidget: CoreInputWidget,
-    PasswordWidget: CoreInputWidget,
-    RadioWidget: CoreRadioWidget,
-    SelectWidget: CoreSelectWidget,
-    TextWidget: CoreInputWidget,
-    TextareaWidget: CoreTextAreaWidget,
-    URLWidget: CoreInputWidget,
-    UpDownWidget: CoreInputWidget,
-  };
+    const mergedFields = useMemo(
+      () => ({
+        ...defaultFields,
+        ...(props.fields ?? {}),
+      }),
+      [props.fields]
+    );
 
-  return (
-    <Form
-      {...props}
-      focusOnFirstError
-      noHtml5Validate
-      omitExtraData
-      className="rjsf no-header"
-      fields={fields}
-      formData={localFormData}
-      idSeparator="/"
-      schema={schema as RJSFSchema}
-      showErrorList={false}
-      templates={{
-        ArrayFieldTemplate: CoreArrayFieldTemplate,
-        FieldTemplate: CoreFieldTemplate,
-        ObjectFieldTemplate: CoreObjectFieldTemplate,
-        FieldErrorTemplate: CoreFieldErrorTemplate,
-      }}
-      transformErrors={transformErrors}
-      uiSchema={uiSchema}
-      validator={validator}
-      widgets={widgets}
-      onChange={handleFormChange}
-      onSubmit={onSubmit}>
-      {children}
-      <div className="tw:mt-4 tw:flex tw:justify-end tw:gap-2">
-        {!hideCancelButton && (
+    const mergedWidgets = useMemo(
+      () => ({
+        ...defaultWidgets,
+        ...(props.widgets ?? {}),
+      }),
+      [props.widgets]
+    );
+
+    return (
+      <Form
+        {...props}
+        focusOnFirstError
+        noHtml5Validate
+        omitExtraData
+        className="rjsf no-header"
+        fields={mergedFields}
+        formData={localFormData}
+        idSeparator="/"
+        ref={ref}
+        schema={schema as RJSFSchema}
+        showErrorList={false}
+        templates={{
+          ArrayFieldTemplate: CoreArrayFieldTemplate,
+          FieldTemplate: CoreFieldTemplate,
+          ObjectFieldTemplate: CoreObjectFieldTemplate,
+          FieldErrorTemplate: CoreFieldErrorTemplate,
+          WrapIfAdditionalTemplate: CoreWrapIfAdditionalTemplate,
+        }}
+        transformErrors={transformErrors}
+        uiSchema={uiSchema}
+        validator={validator}
+        widgets={mergedWidgets}
+        onChange={handleFormChange}
+        onSubmit={onSubmit}>
+        {children}
+        <div className="tw:mt-4 tw:flex tw:justify-end tw:gap-2">
+          {!hideCancelButton && (
+            <Button
+              color="secondary"
+              size="sm"
+              type="button"
+              onClick={handleCancel}>
+              {cancelText ?? t('label.cancel')}
+            </Button>
+          )}
           <Button
-            color="secondary"
+            color="primary"
+            data-testid="submit-btn"
+            isDisabled={isSubmitting || isLoading}
             size="sm"
-            type="button"
-            onClick={handleCancel}>
-            {cancelText ?? t('label.cancel')}
+            type="submit">
+            {isSubmitting ? t('label.submitting') : okText ?? t('label.submit')}
           </Button>
-        )}
-        <Button
-          color="primary"
-          data-testid="submit-btn"
-          isDisabled={isSubmitting || isLoading}
-          size="sm"
-          type="submit">
-          {isSubmitting ? t('label.submitting') : okText ?? t('label.submit')}
-        </Button>
-      </div>
-    </Form>
-  );
-};
+        </div>
+      </Form>
+    );
+  }
+);
+
+FormBuilderV1.displayName = 'FormBuilderV1';
 
 export default FormBuilderV1;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/fields/CoreArrayField.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/fields/CoreArrayField.tsx
new file mode 100644
index 000000000000..7ed90d61337d
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/fields/CoreArrayField.tsx
@@ -0,0 +1,180 @@
+/*
+ *  Copyright 2025 Collate.
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+import { HintText, Label, Tooltip } from '@openmetadata/ui-core-components';
+import { FieldProps } from '@rjsf/utils';
+import { Copy01, XClose } from '@untitledui/icons';
+import { isEmpty, startCase } from 'lodash';
+import { useCallback, useState } from 'react';
+import { Input as AriaInput } from 'react-aria-components';
+import { useTranslation } from 'react-i18next';
+import { useClipboard } from '../../../../hooks/useClipBoard';
+import { splitCSV } from '../../../../utils/CSV/CSV.utils';
+
+const CoreArrayField = (props: FieldProps) => {
+  const {
+    idSchema,
+    formData,
+    onChange,
+    disabled,
+    readonly,
+    schema,
+    formContext,
+    onBlur,
+    rawErrors,
+    label,
+    required,
+  } = props;
+
+  const { t } = useTranslation();
+  const id = idSchema.$id;
+  const fieldName = id.split('/').pop() ?? '';
+  const isFilterPattern = /FilterPattern/.test(id);
+  const value: string[] = formData ?? [];
+  const [inputValue, setInputValue] = useState('');
+
+  const { onCopyToClipBoard, onPasteFromClipBoard, hasCopied } = useClipboard(
+    JSON.stringify(value)
+  );
+
+  const isDisabled = disabled || readonly;
+  const isInvalid = !!rawErrors?.length;
+
+  const handleFocus = useCallback(() => {
+    let focusId = id;
+    if (isFilterPattern) {
+      focusId = id.split('/').slice(0, 2).join('/');
+    }
+    formContext?.handleFocus?.(focusId);
+  }, [id, isFilterPattern, formContext]);
+
+  const addValues = useCallback(
+    (newValues: string[]) => {
+      const filtered = newValues.map((v) => v.trim()).filter(Boolean);
+      if (isEmpty(filtered)) {
+        return;
+      }
+      onChange(Array.from(new Set([...value, ...filtered])));
+    },
+    [value, onChange]
+  );
+
+  const commitInput = useCallback(() => {
+    if (inputValue.trim()) {
+      addValues(splitCSV(inputValue));
+      setInputValue('');
+    }
+  }, [inputValue, addValues]);
+
+  const handleKeyDown = useCallback(
+    async (e: React.KeyboardEvent<HTMLInputElement>) => {
+      if (e.key === 'Enter') {
+        e.preventDefault();
+        commitInput();
+      }
+      if ((e.ctrlKey || e.metaKey) && e.key === 'v') {
+        e.preventDefault();
+        const text = await onPasteFromClipBoard();
+        if (!text) {
+          return;
+        }
+        let values: string[] = [];
+        try {
+          const parsed = JSON.parse(text);
+          if (Array.isArray(parsed)) {
+            values = parsed.map(String);
+          }
+        } catch {
+          values = splitCSV(text);
+        }
+        if (!isEmpty(values)) {
+          addValues(values);
+        }
+      }
+    },
+    [commitInput, onPasteFromClipBoard, addValues]
+  );
+
+  const placeholder = isFilterPattern
+    ? t('message.filter-pattern-placeholder')
+    : '';
+
+  const fieldLabel = label || schema.title || startCase(fieldName);
+
+  return (
+    <div className="tw:flex tw:flex-col tw:gap-1.5">
+      {fieldLabel && <Label isRequired={required}>{fieldLabel}</Label>}
+      <div
+        className={[
+          'tw:flex tw:flex-wrap tw:items-center tw:gap-1.5 tw:min-h-[38px] tw:rounded-lg tw:bg-primary tw:px-2 tw:py-1.5 tw:ring-1 tw:ring-inset tw:transition-shadow tw:duration-100 tw:ease-linear',
+          isInvalid ? 'tw:ring-error_subtle' : 'tw:ring-primary',
+          isDisabled
+            ? 'tw:cursor-not-allowed tw:bg-disabled_subtle tw:ring-disabled'
+            : '',
+        ]
+          .filter(Boolean)
+          .join(' ')}>
+        {value.map((v, idx) => (
+          <span
+            className="tw:inline-flex tw:items-center tw:gap-1 tw:rounded-md
+          tw:bg-utility-brand-50 tw:px-2 tw:py-0.5 tw:text-xs tw:font-medium tw:text-brand-700 tw:ring-1 tw:ring-inset tw:ring-brand-200"
+            key={`${v}-${idx}`}>
+            {v}
+            {!isDisabled && (
+              <button
+                aria-label={t('label.remove-entity', { entity: v })}
+                className="tw:flex tw:cursor-pointer tw:items-center tw:text-brand-400 hover:tw:text-brand-700"
+                type="button"
+                onClick={() => onChange(value.filter((val) => val !== v))}>
+                <XClose size={10} strokeWidth={2.5} />
+              </button>
+            )}
+          </span>
+        ))}
+        {!isDisabled && (
+          <AriaInput
+            className="tw:min-w-[80px] tw:flex-1 tw:bg-transparent tw:text-sm tw:text-primary tw:outline-hidden tw:placeholder:text-placeholder"
+            id={id}
+            placeholder={value.length ? '' : placeholder}
+            value={inputValue}
+            onBlur={() => {
+              commitInput();
+              onBlur(id, value);
+            }}
+            onChange={(e) => setInputValue(e.target.value)}
+            onFocus={handleFocus}
+            onKeyDown={handleKeyDown}
+          />
+        )}
+        <Tooltip
+          title={
+            hasCopied ? t('message.copied-to-clipboard') : t('label.copy')
+          }>
+          <button
+            className="tw:ml-auto tw:flex tw:cursor-pointer tw:items-center tw:p-1 tw:text-fg-quaternary tw:transition-colors tw:duration-200 hover:tw:text-fg-quaternary_hover"
+            tabIndex={-1}
+            type="button"
+            onClick={async (e) => {
+              e.stopPropagation();
+              await onCopyToClipBoard();
+            }}>
+            <Copy01 size={14} />
+          </button>
+        </Tooltip>
+      </div>
+      {isInvalid && rawErrors && <HintText isInvalid>{rawErrors[0]}</HintText>}
+    </div>
+  );
+};
+
+export default CoreArrayField;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/fields/CoreBooleanField.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/fields/CoreBooleanField.tsx
new file mode 100644
index 000000000000..f6c70ea68432
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/fields/CoreBooleanField.tsx
@@ -0,0 +1,32 @@
+/*
+ *  Copyright 2025 Collate.
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+import { Toggle } from '@openmetadata/ui-core-components';
+import { FieldProps } from '@rjsf/utils';
+import { startCase } from 'lodash';
+
+const CoreBooleanField = (props: FieldProps) => {
+  return (
+    <Toggle
+      isDisabled={props.disabled || props.readonly}
+      isSelected={props.formData ?? false}
+      label={props.schema.title ?? startCase(props.name)}
+      onChange={(value) => {
+        props.formContext?.handleFocus?.(props.idSchema.$id);
+        props.onChange(value);
+      }}
+    />
+  );
+};
+
+export default CoreBooleanField;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/fields/CoreOneOfField.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/fields/CoreOneOfField.test.tsx
new file mode 100644
index 000000000000..0408e2625583
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/fields/CoreOneOfField.test.tsx
@@ -0,0 +1,135 @@
+/*
+ *  Copyright 2026 Collate.
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+import { FieldProps } from '@rjsf/utils';
+import { fireEvent, render, screen } from '@testing-library/react';
+import React from 'react';
+import CoreOneOfField from './CoreOneOfField';
+
+jest.mock('@openmetadata/ui-core-components', () => ({
+  RadioButton: jest.fn(
+    ({
+      label,
+      onSelect,
+      selectedValue,
+      value,
+    }: {
+      label: string;
+      onSelect?: (value: string) => void;
+      selectedValue?: string;
+      value: string;
+    }) => (
+      <button
+        aria-checked={selectedValue === value}
+        role="radio"
+        type="button"
+        onClick={() => onSelect?.(value)}>
+        {label}
+      </button>
+    )
+  ),
+  RadioGroup: jest.fn(
+    ({
+      children,
+      onChange,
+      value,
+    }: {
+      children: React.ReactElement[];
+      onChange: (value: string) => void;
+      value: string;
+    }) => (
+      <div role="radiogroup">
+        {children.map((child) =>
+          React.cloneElement(child, {
+            onSelect: onChange,
+            selectedValue: value,
+          })
+        )}
+      </div>
+    )
+  ),
+  Typography: jest.fn(
+    ({
+      children,
+      as: Tag = 'span',
+      ...props
+    }: {
+      children: React.ReactNode;
+      as?: React.ElementType;
+    }) => <Tag {...props}>{children}</Tag>
+  ),
+}));
+
+const getBaseProps = (formData: Record<string, unknown>) =>
+  ({
+    formData,
+    idSchema: { $id: 'root/type' },
+    name: 'type',
+    onBlur: jest.fn(),
+    onChange: jest.fn(),
+    onFocus: jest.fn(),
+    registry: {
+      fields: {
+        SchemaField: ({ schema }: { schema: { title?: string } }) => (
+          <div data-testid="schema-field">{schema.title}</div>
+        ),
+      },
+      schemaUtils: {
+        getClosestMatchingOption: (
+          data: Record<string, unknown>,
+          _options: unknown[],
+          selectedOption: number
+        ) => (data.type === 'second' ? 1 : selectedOption),
+        getDefaultFormState: (
+          _schema: unknown,
+          data: Record<string, unknown> | undefined
+        ) => data ?? {},
+        retrieveSchema: (schema: unknown) => schema,
+        sanitizeDataForNewSchema: (
+          _newSchema: unknown,
+          _currentSchema: unknown,
+          data: Record<string, unknown>
+        ) => data,
+        toIdSchema: () => ({ $id: 'root/type' }),
+      },
+    },
+    schema: {
+      oneOf: [
+        { title: 'First', type: 'object' },
+        { title: 'Second', type: 'object' },
+      ],
+      title: 'Type',
+    },
+  } as unknown as FieldProps);
+
+describe('CoreOneOfField', () => {
+  it('keeps the selected option when form data matches multiple options', () => {
+    const formData = {};
+    const props = getBaseProps(formData);
+    const { rerender } = render(<CoreOneOfField {...props} />);
+
+    fireEvent.click(screen.getByRole('radio', { name: 'Second' }));
+
+    expect(screen.getByRole('radio', { name: 'Second' })).toHaveAttribute(
+      'aria-checked',
+      'true'
+    );
+
+    rerender(<CoreOneOfField {...getBaseProps(formData)} />);
+
+    expect(screen.getByRole('radio', { name: 'Second' })).toHaveAttribute(
+      'aria-checked',
+      'true'
+    );
+  });
+});
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/fields/CoreOneOfField.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/fields/CoreOneOfField.tsx
new file mode 100644
index 000000000000..a173c00ddfdd
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/fields/CoreOneOfField.tsx
@@ -0,0 +1,216 @@
+/*
+ *  Copyright 2025 Collate.
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+import {
+  RadioButton,
+  RadioGroup,
+  Typography,
+} from '@openmetadata/ui-core-components';
+import {
+  FieldProps,
+  getDiscriminatorFieldFromSchema,
+  RJSFSchema,
+} from '@rjsf/utils';
+import { startCase } from 'lodash';
+import { useCallback, useEffect, useMemo, useState } from 'react';
+
+const CoreOneOfField = (props: FieldProps) => {
+  const {
+    schema,
+    formData,
+    onChange,
+    registry,
+    uiSchema,
+    idSchema,
+    errorSchema,
+    disabled,
+    readonly,
+    required,
+    idPrefix,
+    idSeparator,
+    onBlur,
+    onFocus,
+    name,
+    label,
+    hideLabel,
+    hideError,
+    autofocus,
+    rawErrors,
+    formContext,
+  } = props;
+
+  const { schemaUtils, fields } = registry;
+  const { SchemaField } = fields;
+
+  const options = useMemo(
+    () => (schema.oneOf ?? schema.anyOf ?? []) as RJSFSchema[],
+    [schema.oneOf, schema.anyOf]
+  );
+
+  const resolvedOptions = useMemo(
+    () => options.map((opt) => schemaUtils.retrieveSchema(opt, formData)),
+    [options, formData, schemaUtils]
+  );
+
+  const getMatchingOption = useCallback(
+    (currentOption: number, data: unknown, fieldOptions: RJSFSchema[]) =>
+      schemaUtils.getClosestMatchingOption(
+        data,
+        fieldOptions,
+        currentOption,
+        getDiscriminatorFieldFromSchema(schema)
+      ),
+    [schema, schemaUtils]
+  );
+
+  const [selectedOption, setSelectedOption] = useState(() =>
+    getMatchingOption(0, formData, resolvedOptions)
+  );
+
+  useEffect(() => {
+    setSelectedOption((currentOption) => {
+      const matchingOption = getMatchingOption(
+        currentOption,
+        formData,
+        resolvedOptions
+      );
+
+      return matchingOption !== currentOption ? matchingOption : currentOption;
+    });
+  }, [formData, getMatchingOption, resolvedOptions]);
+
+  const selectedSchema = resolvedOptions[selectedOption] ?? {};
+
+  const selectedIdSchema = useMemo(
+    () =>
+      schemaUtils.toIdSchema(
+        selectedSchema,
+        idSchema.$id,
+        formData,
+        idPrefix ?? '',
+        idSeparator ?? '/'
+      ),
+    [selectedSchema, idSchema.$id, formData, idPrefix, idSeparator, schemaUtils]
+  );
+
+  const handleOptionChange = (newIndex: number) => {
+    if (newIndex === selectedOption) {
+      return;
+    }
+
+    const newSchema = resolvedOptions[newIndex];
+    const currentSchema =
+      selectedOption >= 0 ? resolvedOptions[selectedOption] : undefined;
+    const sanitizedFormData = schemaUtils.sanitizeDataForNewSchema(
+      newSchema,
+      currentSchema,
+      formData
+    );
+    const newFormData = newSchema
+      ? schemaUtils.getDefaultFormState(
+          newSchema,
+          sanitizedFormData,
+          'excludeObjectChildren'
+        )
+      : sanitizedFormData;
+
+    setSelectedOption(newIndex);
+    onChange(
+      newFormData ?? undefined,
+      undefined,
+      `${idSchema.$id}${schema.oneOf ? '__oneof_select' : '__anyof_select'}`
+    );
+  };
+
+  const fieldLabel = label ?? schema.title ?? startCase(name);
+
+  return (
+    <div className="tw:flex tw:flex-col tw:gap-4">
+      {!hideLabel && fieldLabel && (
+        <div className="tw:flex tw:items-center tw:gap-0.5">
+          <Typography
+            as="label"
+            className="tw:text-primary"
+            id={`${idSchema.$id}__title`}
+            size="text-sm"
+            weight="semibold">
+            {fieldLabel}
+          </Typography>
+          {required && (
+            <Typography
+              as="span"
+              className="tw:text-error-primary"
+              size="text-sm">
+              *
+            </Typography>
+          )}
+        </div>
+      )}
+      <RadioGroup
+        className="tw:flex tw:flex-row tw:flex-wrap tw:gap-3"
+        isDisabled={disabled || readonly}
+        value={String(selectedOption)}
+        onChange={(val) => handleOptionChange(Number(val))}>
+        {resolvedOptions.map((option, index) => {
+          const optTitle =
+            option.title ??
+            startCase(
+              typeof option.type === 'string'
+                ? option.type
+                : `Option ${index + 1}`
+            );
+
+          return (
+            <RadioButton
+              className={(renderProps) =>
+                `tw:flex-1 tw:min-w-[140px] tw:rounded-xl tw:border tw:px-4 tw:py-3 tw:transition-colors ${
+                  renderProps.isSelected
+                    ? 'tw:border-primary'
+                    : 'tw:border-secondary hover:tw:border-brand-300'
+                }`
+              }
+              key={index}
+              label={optTitle}
+              value={String(index)}
+            />
+          );
+        })}
+      </RadioGroup>
+
+      <SchemaField
+        autofocus={autofocus}
+        disabled={disabled}
+        errorSchema={errorSchema}
+        formContext={formContext}
+        formData={formData}
+        hideError={hideError}
+        hideLabel={hideLabel}
+        idPrefix={idPrefix}
+        idSchema={selectedIdSchema}
+        idSeparator={idSeparator}
+        name={name}
+        rawErrors={rawErrors}
+        readonly={readonly}
+        registry={registry}
+        required={required}
+        schema={selectedSchema}
+        uiSchema={uiSchema}
+        onBlur={onBlur}
+        onChange={onChange}
+        onFocus={onFocus}
+      />
+    </div>
+  );
+};
+
+export default CoreOneOfField;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreArrayFieldTemplate.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreArrayFieldTemplate.tsx
index e951305dd799..14f3450b7ab0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreArrayFieldTemplate.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreArrayFieldTemplate.tsx
@@ -11,7 +11,7 @@
  *  limitations under the License.
  */
 
-import { Button } from '@openmetadata/ui-core-components';
+import { Button, Typography } from '@openmetadata/ui-core-components';
 import { ArrayFieldTemplateProps } from '@rjsf/utils';
 import { Plus, Trash01 } from '@untitledui/icons';
 import { Fragment, FunctionComponent } from 'react';
@@ -24,10 +24,14 @@ export const CoreArrayFieldTemplate: FunctionComponent<
 
   return (
     <Fragment>
-      <div className="tw:flex tw:items-center tw:justify-between">
-        <label className="tw:text-sm tw:font-medium tw:text-[var(--color-text-primary)]">
+      <div className="tw:flex tw:items-center tw:justify-between tw:bg-utility-gray-blue-50">
+        <Typography
+          as="label"
+          className="tw:text-primary"
+          size="text-sm"
+          weight="medium">
           {title}
-        </label>
+        </Typography>
         {canAdd && (
           <Button
             aria-label={t('label.add-entity', { entity: title })}
@@ -48,15 +52,17 @@ export const CoreArrayFieldTemplate: FunctionComponent<
           key={`${element.key}-${index}`}>
           <div className="tw:flex-1">{element.children}</div>
           {element.hasRemove && (
-            <button
+            <Button
               aria-label={t('label.remove')}
-              className="tw:ml-2 tw:flex tw:items-center tw:text-[var(--color-text-error-primary)] hover:tw:opacity-80"
+              className="tw:ml-2"
+              color="secondary"
+              size="sm"
               type="button"
-              onClick={(event) =>
+              onClick={(event: React.MouseEvent<HTMLButtonElement>) =>
                 element.onDropIndexClick(element.index)(event)
               }>
-              <Trash01 size={16} />
-            </button>
+              <Trash01 data-icon size={16} />
+            </Button>
           )}
         </div>
       ))}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreFieldErrorTemplate.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreFieldErrorTemplate.tsx
index faa0c22a4ed8..7782ba9a4652 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreFieldErrorTemplate.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreFieldErrorTemplate.tsx
@@ -11,6 +11,7 @@
  *  limitations under the License.
  */
 
+import { Typography } from '@openmetadata/ui-core-components';
 import { FieldErrorProps } from '@rjsf/utils';
 import { isEmpty } from 'lodash';
 import { FC } from 'react';
@@ -23,16 +24,16 @@ export const CoreFieldErrorTemplate: FC<FieldErrorProps> = (props) => {
   }
 
   return (
-    <div>
-      <ul className="tw:mt-1 tw:list-none tw:p-0">
-        {errorList.map((error, index) => (
-          <li
-            className="tw:text-xs tw:text-[var(--color-text-error-primary)]"
-            key={typeof error === 'string' ? error : index}>
-            {error}
-          </li>
-        ))}
-      </ul>
-    </div>
+    <ul className="tw:mt-1 tw:list-none tw:p-0">
+      {errorList.map((error, index) => (
+        <Typography
+          as="li"
+          className="tw:text-error-primary"
+          key={typeof error === 'string' ? error : index}
+          size="text-xs">
+          {error}
+        </Typography>
+      ))}
+    </ul>
   );
 };
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreFieldTemplate.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreFieldTemplate.tsx
index 0e822f5ba5dc..6278e969689c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreFieldTemplate.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreFieldTemplate.tsx
@@ -11,21 +11,32 @@
  *  limitations under the License.
  */
 
-import { FieldTemplateProps } from '@rjsf/utils';
+import { FieldTemplateProps, getTemplate, getUiOptions } from '@rjsf/utils';
 
 export const CoreFieldTemplate = ({
   children,
-  classNames,
-  hidden,
-  style,
+  hidden = false,
+  registry,
+  uiSchema,
+  ...props
 }: FieldTemplateProps) => {
+  const uiOptions = getUiOptions(uiSchema);
+  const WrapIfAdditionalTemplate = getTemplate(
+    'WrapIfAdditionalTemplate',
+    registry,
+    uiOptions
+  );
+
   if (hidden) {
     return <div className="tw:hidden">{children}</div>;
   }
 
   return (
-    <div className={classNames} style={style}>
+    <WrapIfAdditionalTemplate
+      {...props}
+      registry={registry}
+      uiSchema={uiSchema}>
       {children}
-    </div>
+    </WrapIfAdditionalTemplate>
   );
 };
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreObjectFieldTemplate.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreObjectFieldTemplate.tsx
index fddbda9f4f8b..fd80a68bb2fd 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreObjectFieldTemplate.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreObjectFieldTemplate.tsx
@@ -11,25 +11,40 @@
  *  limitations under the License.
  */
 
-import { Button, Typography } from '@openmetadata/ui-core-components';
+import {
+  Accordion,
+  AccordionHeader,
+  AccordionItem,
+  AccordionPanel,
+  Button,
+  Typography,
+} from '@openmetadata/ui-core-components';
 import { ObjectFieldTemplateProps } from '@rjsf/utils';
 import { Plus } from '@untitledui/icons';
-import { Fragment, FunctionComponent, useState } from 'react';
+import { Fragment, FunctionComponent } from 'react';
 import { useTranslation } from 'react-i18next';
 
 const ADVANCED_PROPERTIES = new Set([
   'connectionArguments',
   'connectionOptions',
+  'sampleDataStorageConfig',
+  'scheme',
+  'sslConfig',
+  'sslMode',
 ]);
 
 export const CoreObjectFieldTemplate: FunctionComponent<
   ObjectFieldTemplateProps
-> = ({ title, onAddClick, schema, properties, idSchema }) => {
+> = ({ title, description, onAddClick, schema, properties, idSchema }) => {
   const { t } = useTranslation();
-  const [advancedOpen, setAdvancedOpen] = useState(false);
+
+  const isRoot = idSchema.$id === 'root';
 
   const { normalProperties, advancedProperties } = properties.reduce(
     (acc, prop) => {
+      if (prop.hidden) {
+        return acc;
+      }
       if (ADVANCED_PROPERTIES.has(prop.name)) {
         acc.advancedProperties.push(prop);
       } else {
@@ -44,9 +59,87 @@ export const CoreObjectFieldTemplate: FunctionComponent<
     }
   );
 
+  const propertiesContent = (
+    <>
+      <div className="tw:flex tw:flex-col tw:gap-6">
+        {!isRoot && schema.additionalProperties && (
+          <div className="tw:flex tw:items-center tw:justify-between">
+            <Typography
+              as="label"
+              className="tw:text-secondary"
+              size="text-xs"
+              weight="medium">
+              {t('label.additional-property-plural')}
+            </Typography>
+            <Button
+              aria-label={t('label.add-entity', { entity: title })}
+              color="primary"
+              data-testid={`add-item-${title}`}
+              id={`${idSchema.$id}`}
+              size="sm"
+              onClick={() => onAddClick(schema)()}>
+              <Plus data-icon size={14} />
+            </Button>
+          </div>
+        )}
+        {normalProperties.map((element) => (
+          <div
+            className={`tw:rounded-xl tw:bg-utility-gray-blue-50 ${
+              isRoot && 'tw:p-4'
+            }`}
+            key={element.name}>
+            {element.content}
+          </div>
+        ))}
+      </div>
+
+      {advancedProperties.length > 0 && (
+        <div className="tw:my-3">
+          <Accordion className="tw:ring-0 tw:divide-y-0 tw:rounded-lg">
+            <AccordionItem id={`${idSchema.$id}-advanced`}>
+              <AccordionHeader className="tw:py-3 tw:px-3 tw:text-md tw:font-medium tw:text-secondary tw:bg-utility-gray-blue-50">
+                {title
+                  ? `${title} ${t('label.advanced-config')}`
+                  : t('label.advanced-config')}
+              </AccordionHeader>
+              <AccordionPanel className="tw:flex tw:flex-col tw:bg-utility-gray-blue-50 tw:gap-4 tw:border-t-0">
+                {advancedProperties.map((element) => (
+                  <div key={element.name}>{element.content}</div>
+                ))}
+              </AccordionPanel>
+            </AccordionItem>
+          </Accordion>
+        </div>
+      )}
+    </>
+  );
+
+  if (!isRoot && title) {
+    return (
+      <div className="tw:flex tw:flex-col tw:gap-4 tw:rounded-xl tw:bg-utility-gray-blue-50">
+        <div className="tw:flex tw:flex-col tw:gap-0.5">
+          <Typography
+            as="label"
+            className="tw:text-primary"
+            id={`${idSchema.$id}__title`}
+            size="text-sm"
+            weight="semibold">
+            {title}
+          </Typography>
+          {description && (
+            <Typography as="span" className="tw:text-secondary" size="text-xs">
+              {description}
+            </Typography>
+          )}
+        </div>
+        {propertiesContent}
+      </div>
+    );
+  }
+
   return (
     <Fragment>
-      {title && (
+      {title && isRoot && (
         <div className="tw:flex tw:items-center tw:justify-between tw:mt-2">
           <Typography
             as="label"
@@ -69,37 +162,7 @@ export const CoreObjectFieldTemplate: FunctionComponent<
           )}
         </div>
       )}
-
-      <div className="tw:flex tw:flex-col tw:gap-4">
-        {normalProperties.map((element) => (
-          <div key={element.name}>{element.content}</div>
-        ))}
-      </div>
-
-      {advancedProperties.length > 0 && (
-        <div className="tw:mt-3">
-          <Button
-            aria-label={
-              advancedOpen
-                ? t('label.hide-entity', { entity: t('label.advanced-config') })
-                : t('label.show-entity', { entity: t('label.advanced-config') })
-            }
-            className="tw:flex tw:items-center tw:gap-1 tw:text-sm tw:font-medium tw:text-brand-primary hover:tw:underline"
-            color="link-color"
-            onClick={() => setAdvancedOpen((v) => !v)}>
-            {advancedOpen
-              ? t('label.hide-entity', { entity: t('label.advanced-config') })
-              : t('label.show-entity', { entity: t('label.advanced-config') })}
-          </Button>
-          {advancedOpen && (
-            <div className="tw:mt-2 tw:flex tw:flex-col tw:gap-4 tw:rounded-lg tw:border tw:border-primary tw:p-3">
-              {advancedProperties.map((element) => (
-                <div key={element.name}>{element.content}</div>
-              ))}
-            </div>
-          )}
-        </div>
-      )}
+      {propertiesContent}
     </Fragment>
   );
 };
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreWrapIfAdditionalTemplate.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreWrapIfAdditionalTemplate.tsx
new file mode 100644
index 000000000000..4b00eef1445a
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/CoreWrapIfAdditionalTemplate.tsx
@@ -0,0 +1,70 @@
+/*
+ *  Copyright 2025 Collate.
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+import { Button, Input } from '@openmetadata/ui-core-components';
+import {
+  ADDITIONAL_PROPERTY_FLAG,
+  WrapIfAdditionalTemplateProps,
+} from '@rjsf/utils';
+import { Trash01 } from '@untitledui/icons';
+import { FunctionComponent, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+export const CoreWrapIfAdditionalTemplate: FunctionComponent<
+  WrapIfAdditionalTemplateProps
+> = ({
+  id,
+  label,
+  onKeyChange,
+  onDropPropertyClick,
+  disabled,
+  readonly,
+  schema,
+  children,
+}) => {
+  const { t } = useTranslation();
+  const [keyValue, setKeyValue] = useState(label);
+  const additional = ADDITIONAL_PROPERTY_FLAG in schema;
+
+  if (!additional) {
+    return <>{children}</>;
+  }
+
+  return (
+    <div className="tw:rounded-xl tw:bg-utility-gray-blue-50">
+      <div className="tw:flex tw:w-full tw:items-end tw:gap-2">
+        <div className="tw:w-2/5 tw:shrink-0">
+          <Input
+            id={`${id}-key`}
+            label={t('label.key')}
+            placeholder={t('label.key')}
+            value={keyValue}
+            onBlur={() => onKeyChange(keyValue)}
+            onChange={setKeyValue}
+          />
+        </div>
+        <div className="tw:flex-1">{children}</div>
+        <Button
+          aria-label={t('label.remove')}
+          className="tw:shrink-0"
+          color="secondary"
+          isDisabled={disabled || readonly}
+          size="sm"
+          type="button"
+          onClick={onDropPropertyClick(label)}>
+          <Trash01 data-icon size={14} />
+        </Button>
+      </div>
+    </div>
+  );
+};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/FormBuilderV1Templates.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/FormBuilderV1Templates.test.tsx
index f2c8638fee5c..bf02f4f47aca 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/FormBuilderV1Templates.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/templates/FormBuilderV1Templates.test.tsx
@@ -25,34 +25,95 @@ import { CoreFieldErrorTemplate } from './CoreFieldErrorTemplate';
 import { CoreFieldTemplate } from './CoreFieldTemplate';
 import { CoreObjectFieldTemplate } from './CoreObjectFieldTemplate';
 
-jest.mock('@openmetadata/ui-core-components', () => ({
-  Button: jest.fn(
-    ({
-      children,
-      onClick,
-      ...props
-    }: {
-      children: React.ReactNode;
-      onClick?: () => void;
-    }) => (
-      <button type="button" onClick={onClick} {...props}>
-        {children}
-      </button>
-    )
-  ),
-  Typography: jest.fn(
-    ({
-      children,
-      as: Tag = 'span',
-      ...props
-    }: {
-      children: React.ReactNode;
-      as?: React.ElementType;
-    }) => <Tag {...props}>{children}</Tag>
-  ),
-}));
+const wrapIfAdditionalRegistry = {
+  templates: {
+    WrapIfAdditionalTemplate: ({ children }: { children: React.ReactNode }) => (
+      <div>{children}</div>
+    ),
+  },
+} as unknown as FieldTemplateProps['registry'];
+
+jest.mock('@openmetadata/ui-core-components', () => {
+  const ActualReact = jest.requireActual('react');
+  const AccordionContext = ActualReact.createContext({
+    expandedItem: undefined,
+    setExpandedItem: jest.fn(),
+  });
+  const AccordionItemContext = ActualReact.createContext(undefined);
+
+  return {
+    Accordion: jest.fn(({ children }: { children: React.ReactNode }) => {
+      const [expandedItem, setExpandedItem] = ActualReact.useState(
+        undefined as string | undefined
+      );
+
+      return (
+        <AccordionContext.Provider value={{ expandedItem, setExpandedItem }}>
+          {children}
+        </AccordionContext.Provider>
+      );
+    }),
+    AccordionHeader: jest.fn(({ children }: { children: React.ReactNode }) => {
+      const { expandedItem, setExpandedItem } =
+        ActualReact.useContext(AccordionContext);
+      const itemId = ActualReact.useContext(AccordionItemContext);
+      const isExpanded = expandedItem === itemId;
+
+      return (
+        <button
+          aria-expanded={isExpanded}
+          type="button"
+          onClick={() => setExpandedItem(isExpanded ? undefined : itemId)}>
+          {children}
+        </button>
+      );
+    }),
+    AccordionItem: jest.fn(
+      ({ children, id }: { children: React.ReactNode; id: string }) => (
+        <AccordionItemContext.Provider value={id}>
+          {children}
+        </AccordionItemContext.Provider>
+      )
+    ),
+    AccordionPanel: jest.fn(
+      ({ children, ...props }: { children: React.ReactNode }) => {
+        const { expandedItem } = ActualReact.useContext(AccordionContext);
+        const itemId = ActualReact.useContext(AccordionItemContext);
+
+        return expandedItem === itemId ? (
+          <div {...props}>{children}</div>
+        ) : null;
+      }
+    ),
+    Button: jest.fn(
+      ({
+        children,
+        onClick,
+        ...props
+      }: {
+        children: React.ReactNode;
+        onClick?: () => void;
+      }) => (
+        <button type="button" onClick={onClick} {...props}>
+          {children}
+        </button>
+      )
+    ),
+    Typography: jest.fn(
+      ({
+        children,
+        as: Tag = 'span',
+        ...props
+      }: {
+        children: React.ReactNode;
+        as?: React.ElementType;
+      }) => <Tag {...props}>{children}</Tag>
+    ),
+  };
+});
 
 jest.mock('@untitledui/icons', () => ({
+  ChevronDown: () => <span aria-hidden="true">chevron-down-icon</span>,
   Plus: () => <span>plus-icon</span>,
   Trash01: () => <span>trash-icon</span>,
 }));
@@ -153,7 +214,7 @@ describe('FormBuilderV1 templates', () => {
       rawErrors: [],
       rawHelp: undefined,
       readonly: false,
-      registry: {} as FieldTemplateProps['registry'],
+      registry: wrapIfAdditionalRegistry,
       required: false,
       schema: { type: 'string' as const },
       onDropPropertyClick: jest.fn(),
@@ -169,8 +230,7 @@ describe('FormBuilderV1 templates', () => {
       </CoreFieldTemplate>
     );
 
-    expect(container.firstChild).toHaveClass('field-wrapper');
-    expect(container.firstChild).toHaveStyle({ marginTop: '8px' });
+    expect(container.firstChild).not.toHaveClass('field-wrapper');
     expect(screen.getByText('content')).toBeVisible();
 
     rerender(
@@ -217,21 +277,21 @@ describe('FormBuilderV1 templates', () => {
 
     expect(onAddClick).toHaveBeenCalledWith({ additionalProperties: true });
 
-    fireEvent.click(
-      screen.getByRole('button', {
-        name: 'label.show-entity:label.advanced-config',
-      })
-    );
+    const advancedConfigToggle = screen.getByRole('button', {
+      name: 'Connection label.advanced-config',
+    });
+
+    expect(advancedConfigToggle).toHaveAttribute('aria-expanded', 'false');
+
+    fireEvent.click(advancedConfigToggle);
 
     expect(screen.getByText('advanced property')).toBeInTheDocument();
+    expect(advancedConfigToggle).toHaveAttribute('aria-expanded', 'true');
 
-    fireEvent.click(
-      screen.getByRole('button', {
-        name: 'label.hide-entity:label.advanced-config',
-      })
-    );
+    fireEvent.click(advancedConfigToggle);
 
     expect(screen.queryByText('advanced property')).not.toBeInTheDocument();
+    expect(advancedConfigToggle).toHaveAttribute('aria-expanded', 'false');
   });
 
   it('renders de-duplicated field errors only when errors exist', () => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/CorePasswordWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/CorePasswordWidget.tsx
new file mode 100644
index 000000000000..628934e3ae11
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/CorePasswordWidget.tsx
@@ -0,0 +1,238 @@
+/*
+ *  Copyright 2025 Collate.
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+import {
+  Box,
+  Button,
+  FileTrigger,
+  HintText,
+  Label,
+  RadioButton,
+  RadioGroup,
+  Typography,
+} from '@openmetadata/ui-core-components';
+import { WidgetProps } from '@rjsf/utils';
+import { Eye, EyeOff, UploadCloud01 } from '@untitledui/icons';
+import { useState } from 'react';
+import {
+  Group as AriaGroup,
+  Input as AriaInput,
+  TextField as AriaTextField,
+} from 'react-aria-components';
+import { useTranslation } from 'react-i18next';
+import { CertificationInputType } from '../../../../enums/PasswordWidget.enum';
+import { getWidgetHint, getWidgetLabel } from './coreWidgetUtils';
+
+interface PasswordInputFieldProps {
+  id: string;
+  value: string | undefined;
+  label?: string;
+  hint?: string;
+  placeholder?: string;
+  required?: boolean;
+  disabled?: boolean;
+  readonly?: boolean;
+  autofocus?: boolean;
+  isInvalid?: boolean;
+  hideLabel?: boolean;
+  onChange: (value: string) => void;
+  onBlur: () => void;
+  onFocus: () => void;
+}
+
+const PasswordInputField = ({
+  id,
+  value,
+  label,
+  hint,
+  placeholder,
+  required,
+  disabled,
+  readonly,
+  autofocus,
+  isInvalid,
+  hideLabel,
+  onChange,
+  onBlur,
+  onFocus,
+}: PasswordInputFieldProps) => {
+  const [showPassword, setShowPassword] = useState(false);
+
+  return (
+    <AriaTextField
+      autoFocus={autofocus}
+      className="tw:flex tw:w-full tw:flex-col tw:gap-1.5 tw:bg-utility-gray-blue-50 tw:p-4 tw:rounded-lg"
+      id={id}
+      isDisabled={disabled || readonly}
+      isInvalid={isInvalid}
+      isRequired={required}
+      type={showPassword ? 'text' : 'password'}
+      value={value ?? ''}
+      onBlur={onBlur}
+      onChange={onChange}
+      onFocus={onFocus}>
+      {!hideLabel && label && <Label isRequired={required}>{label}</Label>}
+      <AriaGroup
+        className={({ isFocusWithin, isDisabled, isInvalid: groupInvalid }) =>
+          [
+            'tw:relative tw:flex tw:w-full tw:items-center tw:rounded-lg tw:bg-primary tw:shadow-xs tw:ring-1 tw:ring-inset tw:ring-primary tw:transition-shadow tw:duration-100 tw:ease-linear',
+            isFocusWithin && !isDisabled ? 'tw:ring-2 tw:ring-brand' : '',
+            isDisabled
+              ? 'tw:cursor-not-allowed tw:bg-disabled_subtle tw:ring-disabled'
+              : '',
+            groupInvalid ? 'tw:ring-error_subtle' : '',
+            groupInvalid && isFocusWithin ? 'tw:ring-2 tw:ring-error' : '',
+          ]
+            .filter(Boolean)
+            .join(' ')
+        }>
+        <AriaInput
+          className="tw:w-full tw:bg-transparent tw:px-3 tw:py-2 tw:pr-9 tw:text-sm tw:text-primary
+          tw:outline-hidden tw:placeholder:text-placeholder disabled:tw:cursor-not-allowed disabled:tw:text-disabled"
+          placeholder={placeholder}
+        />
+        <button
+          className="tw:absolute tw:right-3 tw:flex tw:cursor-pointer tw:items-center tw:text-fg-quaternary tw:transition-colors tw:duration-200 hover:tw:text-fg-quaternary_hover"
+          tabIndex={-1}
+          type="button"
+          onClick={() => setShowPassword((v) => !v)}>
+          {showPassword ? <EyeOff size={16} /> : <Eye size={16} />}
+        </button>
+      </AriaGroup>
+      {hint && <HintText isInvalid={isInvalid}>{hint}</HintText>}
+    </AriaTextField>
+  );
+};
+
+const CorePasswordWidget = (props: WidgetProps) => {
+  const {
+    id,
+    schema,
+    label,
+    hideLabel,
+    required,
+    disabled,
+    readonly,
+    autofocus,
+    value,
+    placeholder,
+    rawErrors,
+    options,
+    onChange,
+    onBlur,
+    onFocus,
+  } = props;
+  const { t } = useTranslation();
+  const isInputTypeFile = schema.uiFieldType === 'file';
+  const isInputTypeFileOrInput = schema.uiFieldType === 'fileOrInput';
+  const [inputType, setInputType] = useState<CertificationInputType>(
+    CertificationInputType.FILE_UPLOAD
+  );
+
+  const displayLabel = getWidgetLabel({ hideLabel, label });
+  const hint = getWidgetHint({ rawErrors, schema, options });
+  const isInvalid = !!rawErrors?.length;
+
+  const handleFileSelect = (files: FileList | null) => {
+    if (!files?.length) {
+      return;
+    }
+
+    const reader = new FileReader();
+    reader.readAsText(files[0]);
+    reader.addEventListener('load', (e) => {
+      onChange(e.target?.result as string);
+    });
+  };
+
+  const fileUploadTrigger = (
+    <FileTrigger onSelect={handleFileSelect}>
+      <Button
+        color="secondary"
+        isDisabled={disabled || readonly}
+        size="sm"
+        type="button">
+        <Box align="center" gap={1}>
+          <UploadCloud01 data-icon size={14} />
+          <Typography size="text-sm">{t('message.upload-file')}</Typography>
+        </Box>
+      </Button>
+    </FileTrigger>
+  );
+
+  if (isInputTypeFile) {
+    return (
+      <div className="tw:flex tw:flex-col tw:gap-1.5">
+        {displayLabel && <Label isRequired={required}>{displayLabel}</Label>}
+        {fileUploadTrigger}
+      </div>
+    );
+  }
+
+  if (isInputTypeFileOrInput) {
+    return (
+      <div className="tw:flex tw:flex-col tw:gap-3">
+        {displayLabel && <Label isRequired={required}>{displayLabel}</Label>}
+        <RadioGroup
+          value={inputType}
+          onChange={(v) => setInputType(v as CertificationInputType)}>
+          <RadioButton
+            label={t('message.upload-file')}
+            value={CertificationInputType.FILE_UPLOAD}
+          />
+          <RadioButton
+            label={t('label.enter-file-content')}
+            value={CertificationInputType.FILE_PATH}
+          />
+        </RadioGroup>
+        {inputType === CertificationInputType.FILE_UPLOAD ? (
+          fileUploadTrigger
+        ) : (
+          <PasswordInputField
+            hideLabel
+            autofocus={autofocus}
+            disabled={disabled}
+            hint={hint}
+            id={id}
+            isInvalid={isInvalid}
+            placeholder={placeholder}
+            readonly={readonly}
+            value={value}
+            onBlur={() => onBlur(id, value)}
+            onChange={onChange}
+            onFocus={() => onFocus(id, value)}
+          />
+        )}
+      </div>
+    );
+  }
+
+  return (
+    <PasswordInputField
+      autofocus={autofocus}
+      disabled={disabled}
+      hint={hint}
+      id={id}
+      isInvalid={isInvalid}
+      label={displayLabel}
+      placeholder={placeholder}
+      readonly={readonly}
+      value={value}
+      onBlur={() => onBlur(id, value)}
+      onChange={onChange}
+      onFocus={() => onFocus(id, value)}
+    />
+  );
+};
+
+export default CorePasswordWidget;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/CoreRadioWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/CoreRadioWidget.tsx
index 1bfc66c54880..dc3e8bd172bf 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/CoreRadioWidget.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/CoreRadioWidget.tsx
@@ -66,7 +66,7 @@ const CoreRadioWidget = ({
       <RadioGroup
         className={
           isHorizontal
-            ? 'tw:flex tw:flex-row tw:flex-wrap tw:gap-3'
+            ? 'tw:flex tw:flex-row tw:flex-wrap tw:gap-3 tw:bg-white'
             : 'tw:flex tw:flex-col tw:gap-3'
         }
         isDisabled={disabled || readonly}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/FormBuilderV1Widgets.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/FormBuilderV1Widgets.test.tsx
index e29862460942..b8c314ecfd28 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/FormBuilderV1Widgets.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/FormBuilderV1Widgets.test.tsx
@@ -370,7 +370,13 @@ describe('FormBuilderV1 widgets', () => {
       />
     );
 
-    expect(screen.getByText('Widget label*')).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        (_, element) =>
+          element?.tagName.toLowerCase() === 'div' &&
+          element.textContent?.replace(/\s/g, '') === 'Widgetlabel*'
+      )
+    ).toBeInTheDocument();
     expect(screen.getByText('First option')).toBeInTheDocument();
     expect(screen.getByText('Choose one')).toBeInTheDocument();
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/coreWidgetUtils.test.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/coreWidgetUtils.test.ts
index f67ff62f885c..75d0890241d8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/coreWidgetUtils.test.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/coreWidgetUtils.test.ts
@@ -54,15 +54,38 @@ describe('coreWidgetUtils', () => {
     expect(
       getWidgetLabel({
         hideLabel: true,
-        label: 'Name',
+        label: 'rawFieldName',
       } as never)
     ).toBeUndefined();
 
     expect(
       getWidgetLabel({
         hideLabel: false,
-        label: 'Name',
+        label: 'Raw Field Name',
       } as never)
-    ).toBe('Name');
+    ).toBe('Raw Field Name');
+  });
+
+  it('formats raw camelCase labels and preserves display labels', () => {
+    expect(
+      getWidgetLabel({
+        hideLabel: false,
+        label: 'sampleDataStorageConfig',
+      } as never)
+    ).toBe('Sample Data Storage Config');
+
+    expect(
+      getWidgetLabel({
+        hideLabel: false,
+        label: 'label.sample-data-storage-config',
+      } as never)
+    ).toBe('label.sample-data-storage-config');
+
+    expect(
+      getWidgetLabel({
+        hideLabel: false,
+        label: 'Sample data storage config',
+      } as never)
+    ).toBe('Sample data storage config');
   });
 });
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/coreWidgetUtils.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/coreWidgetUtils.ts
index a90a4abc9300..b3101dc6c0a5 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/coreWidgetUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilderV1/widgets/coreWidgetUtils.ts
@@ -12,6 +12,7 @@
  */
 
 import { WidgetProps } from '@rjsf/utils';
+import { startCase } from 'lodash';
 
 export const getWidgetHint = ({
   rawErrors,
@@ -25,5 +26,11 @@ export const getWidgetLabel = ({
   hideLabel,
   label,
 }: Pick<WidgetProps, 'hideLabel' | 'label'>) => {
-  return hideLabel ? undefined : label;
+  const looksLikeRawKey = (s: string) => /^[a-z][a-zA-Z0-9]*$/.test(s); // camelCase id
+
+  return hideLabel
+    ? undefined
+    : looksLikeRawKey(label)
+    ? startCase(label)
+    : label;
 };
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.interface.ts
index 363849cf1c24..b78cb9d3d0fb 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.interface.ts
@@ -12,6 +12,7 @@
  */
 export interface ResizablePanelsProps {
   className?: string;
+  hideBgGrey?: boolean;
   orientation?: 'vertical' | 'horizontal';
   firstPanel: PanelProps;
   secondPanel: PanelProps;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.tsx
index 14dab57a21c4..19833647a640 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.tsx
@@ -22,6 +22,7 @@ import { ResizablePanelsProps } from './ResizablePanels.interface';
 
 const ResizablePanels: React.FC<ResizablePanelsProps> = ({
   className,
+  hideBgGrey = false,
   orientation = 'vertical',
   firstPanel,
   secondPanel,
@@ -46,7 +47,9 @@ const ResizablePanels: React.FC<ResizablePanelsProps> = ({
     <>
       {pageTitle && <DocumentTitle title={pageTitle} />}
       <ReflexContainer
-        className={classNames(className, 'resizable-panels-layout bg-grey')}
+        className={classNames(className, 'resizable-panels-layout', {
+          'bg-grey': !hideBgGrey,
+        })}
         orientation={orientation}>
         <ReflexElement
           className={classNames(firstPanel.className, 'resizable-first-panel', {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/TestConnection.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/TestConnection.tsx
index d43e840e96ac..26d56c116551 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/TestConnection.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/TestConnection.tsx
@@ -443,7 +443,7 @@ const TestConnection: FC<TestConnectionProps> = ({
   return (
     <>
       {showDetails ? (
-        <Space className="w-full justify-between bg-white border border-main rounded-4 p-sm mt-4">
+        <Space className="w-full justify-between bg-white border border-main tw:rounded-lg p-sm mt-4">
           <Space
             align={testStatus ? 'start' : 'center'}
             data-testid="message-container"
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.component.tsx
index ddc790b919b2..ba8ff8dff698 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.component.tsx
@@ -17,7 +17,7 @@ import { isEmpty } from 'lodash';
 import { LoadingState } from 'Models';
 import { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 import ResizablePanels from '../../components/common/ResizablePanels/ResizablePanels';
 import ServiceDocPanel from '../../components/common/ServiceDocPanel/ServiceDocPanel';
 import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component';
@@ -76,8 +76,23 @@ const AddServicePage = () => {
   const [saveServiceState, setSaveServiceState] =
     useState<LoadingState>('initial');
   const [activeField, setActiveField] = useState<string>('');
+  const { pathname } = useLocation();
+  const isEmbedded = pathname.startsWith('/askCollate');
 
-  const slashedBreadcrumb = getAddServiceEntityBreadcrumb(serviceCategory);
+  const slashedBreadcrumb = useMemo(() => {
+    const crumbs = getAddServiceEntityBreadcrumb(serviceCategory);
+    if (isEmbedded) {
+      return [
+        {
+          ...crumbs[0],
+          url: `/askCollate/connections/settings/services/${serviceCategory}`,
+        },
+        ...crumbs.slice(1),
+      ];
+    }
+
+    return crumbs;
+  }, [serviceCategory, isEmbedded]);
 
   const translatedSteps = useMemo(
     () =>
@@ -332,6 +347,7 @@ const AddServicePage = () => {
         cardClassName: 'max-width-md m-x-auto',
         allowScroll: true,
       }}
+      hideBgGrey={connectionsRouterClassBase.isEmbeddedMode()}
       hideSecondPanel={hideSecondPanel}
       pageTitle={t('label.add-entity', { entity: t('label.service') })}
       secondPanel={{
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/GlobalSettingPage/GlobalSettingCategory/GlobalSettingCategoryPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/GlobalSettingPage/GlobalSettingCategory/GlobalSettingCategoryPage.tsx
index 6ef41fff422f..8093d290b1d6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/GlobalSettingPage/GlobalSettingCategory/GlobalSettingCategoryPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/GlobalSettingPage/GlobalSettingCategory/GlobalSettingCategoryPage.tsx
@@ -13,7 +13,7 @@
 import { Col, Row, Space } from 'antd';
 import { useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 import TitleBreadcrumb from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component';
 import { TitleBreadcrumbProps } from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface';
 import PageHeader from '../../../components/PageHeader/PageHeader.component';
@@ -27,6 +27,7 @@ import { usePermissionProvider } from '../../../context/PermissionProvider/Permi
 import { ELASTIC_SEARCH_RE_INDEX_PAGE_TABS } from '../../../enums/ElasticSearch.enum';
 import { TeamType } from '../../../generated/entity/teams/team';
 import { useAuth } from '../../../hooks/authHooks';
+import connectionsRouterClassBase from '../../../utils/ConnectionsRouterClassBase';
 import globalSettingsClassBase from '../../../utils/GlobalSettingsClassBase';
 import {
   getSettingPageEntityBreadCrumb,
@@ -49,10 +50,19 @@ const GlobalSettingCategoryPage = () => {
   const { permissions } = usePermissionProvider();
   const { isAdminUser } = useAuth();
 
-  const breadcrumbs: TitleBreadcrumbProps['titleLinks'] = useMemo(
-    () => getSettingPageEntityBreadCrumb(settingCategory),
-    [settingCategory]
-  );
+  const { pathname } = useLocation();
+  const isEmbedded = pathname.startsWith('/askCollate');
+
+  const breadcrumbs: TitleBreadcrumbProps['titleLinks'] = useMemo(() => {
+    const crumbs = getSettingPageEntityBreadCrumb(settingCategory);
+    if (isEmbedded) {
+      return crumbs.map((crumb, i) =>
+        i === 0 ? { ...crumb, url: '' } : crumb
+      );
+    }
+
+    return crumbs;
+  }, [settingCategory, isEmbedded]);
 
   const settingCategoryData: SettingMenuItem | undefined = useMemo(() => {
     let categoryItem = globalSettingsClassBase
@@ -96,7 +106,14 @@ const GlobalSettingCategoryPage = () => {
 
         break;
       default:
-        navigate(getSettingPath(category, option));
+        if (
+          connectionsRouterClassBase.isEmbeddedMode() &&
+          category === GlobalSettingsMenuCategory.SERVICES
+        ) {
+          navigate(connectionsRouterClassBase.getSettingsServicesPath(option));
+        } else {
+          navigate(getSettingPath(category, option));
+        }
 
         break;
     }
@@ -104,6 +121,7 @@ const GlobalSettingCategoryPage = () => {
 
   return (
     <PageLayoutV1 pageTitle={t('label.setting-plural')}>
+      {isEmbedded && <div className="tw:h-4" />}
       <Row gutter={[0, 20]}>
         <Col span={24}>
           <TitleBreadcrumb titleLinks={breadcrumbs} />
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/ServicesPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/ServicesPage.tsx
index 122b8587b4ef..f258926a6dfa 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/ServicesPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/ServicesPage.tsx
@@ -76,20 +76,36 @@ const ServicesPage = () => {
     );
   }, [permissions]);
 
-  const breadcrumbs: TitleBreadcrumbProps['titleLinks'] = useMemo(
-    () =>
-      getSettingPageEntityBreadCrumb(
-        GlobalSettingsMenuCategory.SERVICES,
-        tab === GlobalSettingOptions.DATA_OBSERVABILITY
-          ? t('label.data-observability')
-          : capitalize(tab)
-      ),
-    []
-  );
+  const isEmbedded = location.pathname.startsWith('/askCollate');
+
+  const breadcrumbs: TitleBreadcrumbProps['titleLinks'] = useMemo(() => {
+    const crumbs = getSettingPageEntityBreadCrumb(
+      GlobalSettingsMenuCategory.SERVICES,
+      tab === GlobalSettingOptions.DATA_OBSERVABILITY
+        ? t('label.data-observability')
+        : capitalize(tab)
+    );
+
+    if (isEmbedded) {
+      return crumbs.map((crumb) => {
+        if (!crumb.activeTitle && crumb.url) {
+          return {
+            ...crumb,
+            url: '/askCollate/connections/settings/services',
+          };
+        }
+
+        return crumb;
+      });
+    }
+
+    return crumbs;
+  }, [tab, t, isEmbedded]);
 
   return viewAllPermission ? (
     <PageLayoutV1 pageTitle={serviceName}>
-      <Row gutter={[0, 16]}>
+      {isEmbedded && <div className="tw:h-4" />}
+      <Row gutter={isEmbedded ? [0, 8] : [0, 16]}>
         <Col span={24}>
           <TitleBreadcrumb titleLinks={breadcrumbs} />
         </Col>