diff --git a/clients/ui/frontend/src/app/pages/modelCatalogSettings/components/YamlSection.tsx b/clients/ui/frontend/src/app/pages/modelCatalogSettings/components/YamlSection.tsx
index d7cabcdf00..9e51a037cb 100644
--- a/clients/ui/frontend/src/app/pages/modelCatalogSettings/components/YamlSection.tsx
+++ b/clients/ui/frontend/src/app/pages/modelCatalogSettings/components/YamlSection.tsx
@@ -11,6 +11,7 @@ import {
 } from '@patternfly/react-core';
 import { OpenDrawerRightIcon } from '@patternfly/react-icons';
 import { UpdateObjectAtPropAndValue } from 'mod-arch-shared';
+import { useThemeContext } from 'mod-arch-kubeflow';
 import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 import FormSection from '~/app/pages/modelRegistry/components/pf-overrides/FormSection';
 import { ManageSourceFormData } from '~/app/pages/modelCatalogSettings/useManageSourceData';
@@ -33,6 +34,7 @@ const YamlSection: React.FC<YamlSectionProps> = ({
   setData,
   onToggleExpectedFormatDrawer,
 }) => {
+  const { isMUITheme } = useThemeContext();
   const [isYamlTouched, setIsYamlTouched] = React.useState(false);
   const [filename, setFilename] = React.useState('');
   const isYamlContentValid = validateYamlContent(formData.yamlContent);
@@ -83,6 +85,60 @@ const YamlSection: React.FC<YamlSectionProps> = ({
     </div>
   );
 
+  const expectedFormatButton = onToggleExpectedFormatDrawer ? (
+    <Button
+      variant="link"
+      isInline
+      onClick={onToggleExpectedFormatDrawer}
+      data-testid="view-expected-yaml-format-link"
+      icon={<OpenDrawerRightIcon />}
+      iconPosition="end"
+    >
+      {EXPECTED_YAML_FORMAT_LABEL}
+    </Button>
+  ) : null;
+
+  const descriptionTextNode = (
+    <FormHelperText>
+      <HelperText>
+        <HelperTextItem>{HELP_TEXT.YAML}</HelperTextItem>
+      </HelperText>
+    </FormHelperText>
+  );
+
+  const hasError = isYamlTouched && !isYamlContentValid;
+  const helperTextNode = hasError ? (
+    <FormHelperText>
+      <HelperText>
+        <HelperTextItem variant="error" data-testid="yaml-content-error">
+          {VALIDATION_MESSAGES.YAML_CONTENT_REQUIRED}
+        </HelperTextItem>
+      </HelperText>
+    </FormHelperText>
+  ) : undefined;
+
+  if (isMUITheme) {
+    return (
+      <FormSection data-testid="yaml-section">
+        {expectedFormatButton && (
+          <Flex justifyContent={{ default: 'justifyContentFlexEnd' }}>
+            <FlexItem>{expectedFormatButton}</FlexItem>
+          </Flex>
+        )}
+        {descriptionTextNode}
+        <FormGroup
+          className={hasError ? 'pf-m-error' : undefined}
+          label={FORM_LABELS.YAML_CONTENT}
+          isRequired
+          fieldId="yaml-content"
+        >
+          <FormFieldset component={yamlInput} field={FORM_LABELS.YAML_CONTENT} />
+        </FormGroup>
+        {helperTextNode}
+      </FormSection>
+    );
+  }
+
   return (
     <FormSection data-testid="yaml-section">
       <FormGroup
@@ -92,40 +148,15 @@ const YamlSection: React.FC<YamlSectionProps> = ({
             alignItems={{ default: 'alignItemsCenter' }}
           >
             <FlexItem>{FORM_LABELS.YAML_CONTENT}</FlexItem>
-            {onToggleExpectedFormatDrawer && (
-              <FlexItem>
-                <Button
-                  variant="link"
-                  isInline
-                  onClick={onToggleExpectedFormatDrawer}
-                  data-testid="view-expected-yaml-format-link"
-                  icon={<OpenDrawerRightIcon />}
-                  iconPosition="end"
-                >
-                  {EXPECTED_YAML_FORMAT_LABEL}
-                </Button>
-              </FlexItem>
-            )}
+            {expectedFormatButton && <FlexItem>{expectedFormatButton}</FlexItem>}
           </Flex>
         }
         isRequired
         fieldId="yaml-content"
       >
         <FormFieldset component={yamlInput} field="YAML" />
-        <FormHelperText>
-          <HelperText>
-            <HelperTextItem>{HELP_TEXT.YAML}</HelperTextItem>
-          </HelperText>
-        </FormHelperText>
-        {isYamlTouched && !isYamlContentValid && (
-          <FormHelperText>
-            <HelperText>
-              <HelperTextItem variant="error" data-testid="yaml-content-error">
-                {VALIDATION_MESSAGES.YAML_CONTENT_REQUIRED}
-              </HelperTextItem>
-            </HelperText>
-          </FormHelperText>
-        )}
+        {descriptionTextNode}
+        {helperTextNode}
       </FormGroup>
     </FormSection>
   );