diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/AirflowMessageBanner/airflow-message-banner.less b/openmetadata-ui/src/main/resources/ui/src/components/common/AirflowMessageBanner/airflow-message-banner.less
index 568521953e1..c00067f14bf 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/AirflowMessageBanner/airflow-message-banner.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/AirflowMessageBanner/airflow-message-banner.less
@@ -23,4 +23,5 @@
   + .rjsf .form-group.field {
     margin-top: 0px;
   }
+  width: 100%;
 }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate.tsx
index 409eb20cfd2..109d3a4ef9e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate.tsx
@@ -22,6 +22,7 @@ import { isEmpty, isUndefined } from 'lodash';
 import React, { Fragment, FunctionComponent } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ADVANCED_PROPERTIES } from '../../../../../constants/Services.constant';
+import serviceUtilClassBase from '../../../../../utils/ServiceUtilClassBase';
 import './object-field-template.less';
 
 const { Panel } = Collapse;
@@ -62,6 +63,12 @@ export const ObjectFieldTemplate: FunctionComponent<ObjectFieldTemplateProps> =
       } as PropertyMap
     );
 
+    const {
+      properties: updatedNormalProperties,
+      additionalField: AdditionalField,
+      additionalFieldContent,
+    } = serviceUtilClassBase.getProperties(normalProperties);
+
     const fieldElement = (
       <Fragment>
         <Space className="w-full justify-between header-title-wrapper">
@@ -94,7 +101,13 @@ export const ObjectFieldTemplate: FunctionComponent<ObjectFieldTemplateProps> =
             />
           )}
         </Space>
-        {normalProperties.map((element, index) => (
+
+        {AdditionalField &&
+          React.createElement(AdditionalField, {
+            data: additionalFieldContent,
+          })}
+
+        {updatedNormalProperties.map((element, index) => (
           <div
             className={classNames('property-wrapper', {
               'additional-fields': schema.additionalProperties,
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.ts
index d9a9097c085..266392ea8ae 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.ts
@@ -11,6 +11,7 @@
  *  limitations under the License.
  */
 
+import { ObjectFieldTemplatePropertyType } from '@rjsf/utils';
 import { capitalize, get, toLower } from 'lodash';
 import { ServiceTypes } from 'Models';
 import MetricIcon from '../assets/svg/metric.svg';
@@ -764,6 +765,14 @@ class ServiceUtilClassBase {
     return widgets;
   }
 
+  public getProperties(property: ObjectFieldTemplatePropertyType[]) {
+    return {
+      properties: property,
+      additionalField: '',
+      additionalFieldContent: null,
+    };
+  }
+
   public getEditConfigData(
     serviceData?: ServicesType,
     data?: ConfigData