From 72fd93408ae328c2922cdf7cec1bbed4ab96940f Mon Sep 17 00:00:00 2001
From: ppadti <ppadti@redhat.com>
Date: Wed, 22 Apr 2026 13:20:46 +0530
Subject: [PATCH 01/14] Update @odh-dashboard/model-registry tracking to
 2ed730b8c636640add1cd3a13a35696a99de0a9a (no file changes)

---
 packages/model-registry/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/model-registry/package.json b/packages/model-registry/package.json
index dd0fe0cd98..18836f604a 100644
--- a/packages/model-registry/package.json
+++ b/packages/model-registry/package.json
@@ -23,7 +23,7 @@
     "branch": "main",
     "src": "clients/ui",
     "target": "upstream",
-    "commit": "d941024350a42ef5f0b047c4617ee98e85158e26"
+    "commit": "2ed730b8c636640add1cd3a13a35696a99de0a9a"
   },
   "module-federation": {
     "name": "modelRegistry",

From 68908144f45a1735e228695fd16fe585b724cb63 Mon Sep 17 00:00:00 2001
From: ppadti <ppadti@redhat.com>
Date: Wed, 22 Apr 2026 13:20:46 +0530
Subject: [PATCH 02/14] Update @odh-dashboard/model-registry tracking to
 12d13435a90483b9bdc7efe6ed71c66501040138 (no file changes)

---
 packages/model-registry/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/model-registry/package.json b/packages/model-registry/package.json
index 18836f604a..f388ede71e 100644
--- a/packages/model-registry/package.json
+++ b/packages/model-registry/package.json
@@ -23,7 +23,7 @@
     "branch": "main",
     "src": "clients/ui",
     "target": "upstream",
-    "commit": "2ed730b8c636640add1cd3a13a35696a99de0a9a"
+    "commit": "12d13435a90483b9bdc7efe6ed71c66501040138"
   },
   "module-federation": {
     "name": "modelRegistry",

From a640d985e7d7f58ba912fe12a42d6e0184a11540 Mon Sep 17 00:00:00 2001
From: ppadti <ppadti@redhat.com>
Date: Wed, 22 Apr 2026 13:20:46 +0530
Subject: [PATCH 03/14] Update @odh-dashboard/model-registry tracking to
 93d56023d5c252102d4301c897705123b81c87f0 (no file changes)

---
 packages/model-registry/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/model-registry/package.json b/packages/model-registry/package.json
index f388ede71e..c7ea5181a4 100644
--- a/packages/model-registry/package.json
+++ b/packages/model-registry/package.json
@@ -23,7 +23,7 @@
     "branch": "main",
     "src": "clients/ui",
     "target": "upstream",
-    "commit": "12d13435a90483b9bdc7efe6ed71c66501040138"
+    "commit": "93d56023d5c252102d4301c897705123b81c87f0"
   },
   "module-federation": {
     "name": "modelRegistry",

From 990fdfd4f085185894cc0bd592ce002c492b7bae Mon Sep 17 00:00:00 2001
From: ppadti <ppadti@redhat.com>
Date: Wed, 22 Apr 2026 13:20:47 +0530
Subject: [PATCH 04/14] Update @odh-dashboard/model-registry tracking to
 de0edc74fb35342abefecf23aaa496282231cd6a (no file changes)

---
 packages/model-registry/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/model-registry/package.json b/packages/model-registry/package.json
index c7ea5181a4..9061f8fb53 100644
--- a/packages/model-registry/package.json
+++ b/packages/model-registry/package.json
@@ -23,7 +23,7 @@
     "branch": "main",
     "src": "clients/ui",
     "target": "upstream",
-    "commit": "93d56023d5c252102d4301c897705123b81c87f0"
+    "commit": "de0edc74fb35342abefecf23aaa496282231cd6a"
   },
   "module-federation": {
     "name": "modelRegistry",

From b0bbf468ef32e2ad314443f1e665d3a1e9865356 Mon Sep 17 00:00:00 2001
From: ppadti <ppadti@redhat.com>
Date: Wed, 22 Apr 2026 13:20:47 +0530
Subject: [PATCH 05/14] Update @odh-dashboard/model-registry tracking to
 43716b7a323974703dc21299cd18b8faf52e8633 (no file changes)

---
 packages/model-registry/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/model-registry/package.json b/packages/model-registry/package.json
index 9061f8fb53..ac6afea4b5 100644
--- a/packages/model-registry/package.json
+++ b/packages/model-registry/package.json
@@ -23,7 +23,7 @@
     "branch": "main",
     "src": "clients/ui",
     "target": "upstream",
-    "commit": "de0edc74fb35342abefecf23aaa496282231cd6a"
+    "commit": "43716b7a323974703dc21299cd18b8faf52e8633"
   },
   "module-federation": {
     "name": "modelRegistry",

From aae89b5eb20c49aded82706ce9fee0305aeb37ba Mon Sep 17 00:00:00 2001
From: ppadti <ppadti@redhat.com>
Date: Wed, 22 Apr 2026 13:20:47 +0530
Subject: [PATCH 06/14] Update @odh-dashboard/model-registry tracking to
 36dcfed0c566a5875aafe424f4b0e1a7821937a3 (no file changes)

---
 packages/model-registry/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/model-registry/package.json b/packages/model-registry/package.json
index ac6afea4b5..fc88605f1e 100644
--- a/packages/model-registry/package.json
+++ b/packages/model-registry/package.json
@@ -23,7 +23,7 @@
     "branch": "main",
     "src": "clients/ui",
     "target": "upstream",
-    "commit": "43716b7a323974703dc21299cd18b8faf52e8633"
+    "commit": "36dcfed0c566a5875aafe424f4b0e1a7821937a3"
   },
   "module-federation": {
     "name": "modelRegistry",

From 26dce9d4e849c63f3404add3b3fb3a6c4d791ee4 Mon Sep 17 00:00:00 2001
From: ppadti <ppadti@redhat.com>
Date: Wed, 22 Apr 2026 13:20:47 +0530
Subject: [PATCH 07/14] Update @odh-dashboard/model-registry tracking to
 7d27a9e9fa54fce37d8d3f5d6fe91aad6fd1b9e5 (no file changes)

---
 packages/model-registry/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/model-registry/package.json b/packages/model-registry/package.json
index fc88605f1e..89a05e54f3 100644
--- a/packages/model-registry/package.json
+++ b/packages/model-registry/package.json
@@ -23,7 +23,7 @@
     "branch": "main",
     "src": "clients/ui",
     "target": "upstream",
-    "commit": "36dcfed0c566a5875aafe424f4b0e1a7821937a3"
+    "commit": "7d27a9e9fa54fce37d8d3f5d6fe91aad6fd1b9e5"
   },
   "module-federation": {
     "name": "modelRegistry",

From f74beb8ec7e086518244c50d339927544f39a4e4 Mon Sep 17 00:00:00 2001
From: ppadti <ppadti@redhat.com>
Date: Wed, 22 Apr 2026 13:20:47 +0530
Subject: [PATCH 08/14] Update @odh-dashboard/model-registry tracking to
 cb7de46b7f8e050fdb757b37ab42fafed7de733f (no file changes)

---
 packages/model-registry/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/model-registry/package.json b/packages/model-registry/package.json
index 89a05e54f3..0f19cbe293 100644
--- a/packages/model-registry/package.json
+++ b/packages/model-registry/package.json
@@ -23,7 +23,7 @@
     "branch": "main",
     "src": "clients/ui",
     "target": "upstream",
-    "commit": "7d27a9e9fa54fce37d8d3f5d6fe91aad6fd1b9e5"
+    "commit": "cb7de46b7f8e050fdb757b37ab42fafed7de733f"
   },
   "module-federation": {
     "name": "modelRegistry",

From bf1e1330fe0da4b5c59e08c6a51a8106bcafb0d1 Mon Sep 17 00:00:00 2001
From: ppadti <ppadti@redhat.com>
Date: Wed, 22 Apr 2026 13:20:47 +0530
Subject: [PATCH 09/14] Update @odh-dashboard/model-registry: Fix independent
 filters scrolling for MCP (#2622)

Upstream commit: 26e784c6d2aa4d25845be57567a7156fa4b37dce
---
 packages/model-registry/package.json                            | 2 +-
 .../frontend/src/app/pages/mcpCatalog/screens/McpCatalog.tsx    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/model-registry/package.json b/packages/model-registry/package.json
index 0f19cbe293..39ce9e5f42 100644
--- a/packages/model-registry/package.json
+++ b/packages/model-registry/package.json
@@ -23,7 +23,7 @@
     "branch": "main",
     "src": "clients/ui",
     "target": "upstream",
-    "commit": "cb7de46b7f8e050fdb757b37ab42fafed7de733f"
+    "commit": "26e784c6d2aa4d25845be57567a7156fa4b37dce"
   },
   "module-federation": {
     "name": "modelRegistry",
diff --git a/packages/model-registry/upstream/frontend/src/app/pages/mcpCatalog/screens/McpCatalog.tsx b/packages/model-registry/upstream/frontend/src/app/pages/mcpCatalog/screens/McpCatalog.tsx
index 4ca261136b..03f82235f9 100644
--- a/packages/model-registry/upstream/frontend/src/app/pages/mcpCatalog/screens/McpCatalog.tsx
+++ b/packages/model-registry/upstream/frontend/src/app/pages/mcpCatalog/screens/McpCatalog.tsx
@@ -46,7 +46,7 @@ const McpCatalog: React.FC = () => {
         provideChildrenPadding
       >
         <Sidebar hasBorder hasGutter>
-          <SidebarPanel>
+          <SidebarPanel variant="sticky">
             <McpCatalogFilters />
           </SidebarPanel>
           <SidebarContent>

From 344779a369854e19b2d56df3b1115563c44f93b0 Mon Sep 17 00:00:00 2001
From: ppadti <ppadti@redhat.com>
Date: Wed, 22 Apr 2026 13:20:48 +0530
Subject: [PATCH 10/14] Update @odh-dashboard/model-registry: Fix/catalog
 source error messages (#2526)

Upstream commit: f953cc20feea8838fac24064d0a4201df7fe0e70
---
 packages/model-registry/package.json          |   2 +-
 .../cypress/pages/modelCatalogSettings.ts     |   2 +-
 .../modelCatalogSettings.cy.ts                |   8 +-
 .../components/CatalogSourceStatus.tsx        |   2 +-
 .../CatalogSourceStatusErrorModal.tsx         |   6 +-
 .../components/CredentialsSection.tsx         |  56 +++++++---
 .../components/ManageSourceForm.tsx           |  10 +-
 .../components/ManageSourceFormFooter.tsx     |   3 +-
 .../components/ModelVisibilitySection.tsx     |  96 +++++++++--------
 .../components/PreviewPanel.tsx               |  22 ++--
 .../components/YamlSection.tsx                | 102 +++++++++++-------
 .../__tests__/PreviewPanel.spec.tsx           |   2 +-
 .../pages/modelCatalogSettings/constants.tsx  |  70 +++++++++---
 .../CatalogSourceConfigsTableColumns.tsx      |  22 ++--
 14 files changed, 258 insertions(+), 145 deletions(-)

diff --git a/packages/model-registry/package.json b/packages/model-registry/package.json
index 39ce9e5f42..0a59d783e1 100644
--- a/packages/model-registry/package.json
+++ b/packages/model-registry/package.json
@@ -23,7 +23,7 @@
     "branch": "main",
     "src": "clients/ui",
     "target": "upstream",
-    "commit": "26e784c6d2aa4d25845be57567a7156fa4b37dce"
+    "commit": "f953cc20feea8838fac24064d0a4201df7fe0e70"
   },
   "module-federation": {
     "name": "modelRegistry",
diff --git a/packages/model-registry/upstream/frontend/src/__tests__/cypress/cypress/pages/modelCatalogSettings.ts b/packages/model-registry/upstream/frontend/src/__tests__/cypress/cypress/pages/modelCatalogSettings.ts
index 331e341e9c..434d299f04 100644
--- a/packages/model-registry/upstream/frontend/src/__tests__/cypress/cypress/pages/modelCatalogSettings.ts
+++ b/packages/model-registry/upstream/frontend/src/__tests__/cypress/cypress/pages/modelCatalogSettings.ts
@@ -97,7 +97,7 @@ class CatalogSourceConfigRow extends TableRow {
     return this;
   }
 
-  shouldHaveValidationStatus(status: 'Connected' | 'Failed' | 'Starting' | 'Unknown' | '-') {
+  shouldHaveValidationStatus(status: 'Ready' | 'Failed' | 'Starting' | 'Unknown' | '-') {
     this.findValidationStatus().contains(status);
     return this;
   }
diff --git a/packages/model-registry/upstream/frontend/src/__tests__/cypress/cypress/tests/mocked/modelCatalogSettings/modelCatalogSettings.cy.ts b/packages/model-registry/upstream/frontend/src/__tests__/cypress/cypress/tests/mocked/modelCatalogSettings/modelCatalogSettings.cy.ts
index 6daf05cce9..4097a8cb2d 100644
--- a/packages/model-registry/upstream/frontend/src/__tests__/cypress/cypress/tests/mocked/modelCatalogSettings/modelCatalogSettings.cy.ts
+++ b/packages/model-registry/upstream/frontend/src/__tests__/cypress/cypress/tests/mocked/modelCatalogSettings/modelCatalogSettings.cy.ts
@@ -443,7 +443,7 @@ describe('Catalog Source Configs Table', () => {
       modelCatalogSettings.visit();
       const row = modelCatalogSettings.getRow('HuggingFace Google');
       row.findName().should('be.visible');
-      row.shouldHaveValidationStatus('Connected');
+      row.shouldHaveValidationStatus('Ready');
       row.findValidationStatus().findByTestId('source-status-connected-hf-google').should('exist');
     });
 
@@ -783,7 +783,7 @@ describe('Manage Source Page', () => {
 
       // Before entering organization, should show generic text
       cy.contains(
-        'Optionally filter which models from your source appear in the model catalog',
+        'Optionally filter which models from this source appear in the model catalog',
       ).should('exist');
 
       // Fill organization name
@@ -791,7 +791,7 @@ describe('Manage Source Page', () => {
 
       // After entering organization, should show organization-specific text
       cy.contains(
-        'Optionally filter which Google models from your source appear in the model catalog',
+        'Optionally filter which Google models from this source appear in the model catalog',
       ).should('exist');
       cy.contains('all Google models from the source will be visible').should('exist');
 
@@ -800,7 +800,7 @@ describe('Manage Source Page', () => {
 
       // Text should update to new organization
       cy.contains(
-        'Optionally filter which Meta models from your source appear in the model catalog',
+        'Optionally filter which Meta models from this source appear in the model catalog',
       ).should('exist');
       cy.contains('all Meta models from the source will be visible').should('exist');
     });
diff --git a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/CatalogSourceStatus.tsx b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/CatalogSourceStatus.tsx
index 005c4257e2..afb1d181f6 100644
--- a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/CatalogSourceStatus.tsx
+++ b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/CatalogSourceStatus.tsx
@@ -54,7 +54,7 @@ const CatalogSourceStatus: React.FC<CatalogSourceStatusProps> = ({ catalogSource
     case CatalogSourceStatusEnum.AVAILABLE:
       return (
         <Label status="success" data-testid={`source-status-connected-${catalogSourceConfig.id}`}>
-          Connected
+          Ready
         </Label>
       );
 
diff --git a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/CatalogSourceStatusErrorModal.tsx b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/CatalogSourceStatusErrorModal.tsx
index 9cd19f945c..6b85582aa6 100644
--- a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/CatalogSourceStatusErrorModal.tsx
+++ b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/CatalogSourceStatusErrorModal.tsx
@@ -10,6 +10,7 @@ import {
   ModalVariant,
 } from '@patternfly/react-core';
 import { ExclamationCircleIcon } from '@patternfly/react-icons';
+import { ERROR_MESSAGES } from '~/app/pages/modelCatalogSettings/constants';
 
 type CatalogSourceStatusErrorModalProps = {
   isOpen: boolean;
@@ -45,12 +46,11 @@ const CatalogSourceStatusErrorModal: React.FC<CatalogSourceStatusErrorModalProps
         <Alert
           variant="danger"
           isInline
-          title="Validation failed"
+          title={ERROR_MESSAGES.VALIDATION_FAILED}
           data-testid="catalog-source-status-error-alert"
         >
           <p data-testid="catalog-source-status-error-details">
-            The system cannot establish a connection to the source. Ensure that the organization is
-            accurate, then try again.
+            {ERROR_MESSAGES.VALIDATION_FAILED_BODY}
           </p>
           {errorMessage && <p data-testid="catalog-source-status-error-message">{errorMessage}</p>}
         </Alert>
diff --git a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/CredentialsSection.tsx b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/CredentialsSection.tsx
index 72f5a2e79b..b0f391bad4 100644
--- a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/CredentialsSection.tsx
+++ b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/CredentialsSection.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
 import {
-  FormGroup,
   TextInput,
   FormHelperText,
   HelperText,
@@ -12,7 +11,6 @@ import {
 } from '@patternfly/react-core';
 import { UpdateObjectAtPropAndValue } from 'mod-arch-shared';
 import PasswordInput from '~/app/shared/components/PasswordInput';
-import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 import FormSection from '~/app/pages/modelRegistry/components/pf-overrides/FormSection';
 import ThemeAwareFormGroupWrapper from '~/app/pages/settings/components/ThemeAwareFormGroupWrapper';
 import { ManageSourceFormData } from '~/app/pages/modelCatalogSettings/useManageSourceData';
@@ -20,8 +18,11 @@ import { validateOrganization } from '~/app/pages/modelCatalogSettings/utils/val
 import {
   FORM_LABELS,
   VALIDATION_MESSAGES,
-  HELP_TEXT,
+  DESCRIPTION_TEXT,
+  HELPER_TEXT,
   PLACEHOLDERS,
+  ERROR_MESSAGES,
+  SUCCESS_MESSAGES,
 } from '~/app/pages/modelCatalogSettings/constants';
 import { TempDevFeature, useTempDevFeatureAvailable } from '~/app/hooks/useTempDevFeatureAvailable';
 
@@ -67,7 +68,7 @@ const CredentialsSection: React.FC<CredentialsSectionProps> = ({
     <>
       <FormHelperText>
         <HelperText>
-          <HelperTextItem>{HELP_TEXT.ORGANIZATION}</HelperTextItem>
+          <HelperTextItem>{DESCRIPTION_TEXT.ORGANIZATION}</HelperTextItem>
         </HelperText>
       </FormHelperText>
     </>
@@ -111,18 +112,39 @@ const CredentialsSection: React.FC<CredentialsSectionProps> = ({
     />
   );
 
+  const accessTokenDescriptionTxtNode = (
+    <FormHelperText>
+      <HelperText>
+        <HelperTextItem>{DESCRIPTION_TEXT.ACCESS_TOKEN}</HelperTextItem>
+      </HelperText>
+    </FormHelperText>
+  );
+
+  const accessTokenHelperTxtNode = (
+    <FormHelperText>
+      <HelperText>
+        <HelperTextItem>{HELPER_TEXT.ACCESS_TOKEN}</HelperTextItem>
+      </HelperText>
+    </FormHelperText>
+  );
+
   const accessTokenFormGroup = (
     <>
-      <FormGroup label={FORM_LABELS.ACCESS_TOKEN} fieldId="access-token">
-        <FormHelperText>
-          <HelperText>
-            <HelperTextItem>{HELP_TEXT.ACCESS_TOKEN}</HelperTextItem>
-          </HelperText>
-        </FormHelperText>
-        <FormFieldset component={accessTokenInput} field="Access token" />
-      </FormGroup>
+      <ThemeAwareFormGroupWrapper
+        label={FORM_LABELS.ACCESS_TOKEN}
+        fieldId="access-token"
+        descriptionTextNode={accessTokenDescriptionTxtNode}
+        helperTextNode={accessTokenHelperTxtNode}
+      >
+        {accessTokenInput}
+      </ThemeAwareFormGroupWrapper>
       {validationError && (
-        <Alert isInline variant="danger" title="Validation failed" className="pf-v5-u-mt-md">
+        <Alert
+          isInline
+          variant="danger"
+          title={ERROR_MESSAGES.VALIDATION_FAILED}
+          className="pf-v6-u-mt-md"
+        >
           {validationError.message}
         </Alert>
       )}
@@ -130,15 +152,15 @@ const CredentialsSection: React.FC<CredentialsSectionProps> = ({
         <Alert
           isInline
           variant="success"
-          className="pf-v5-u-mt-md"
-          title="Validation successful"
+          className="pf-v6-u-mt-md"
+          title={SUCCESS_MESSAGES.VALIDATION_SUCCESSFUL}
           actionClose={<AlertActionCloseButton onClose={onClearValidationSuccess} />}
         >
-          The organization and accessToken are valid for connection.
+          {SUCCESS_MESSAGES.VALIDATION_SUCCESSFUL_BODY}
         </Alert>
       )}
 
-      <ActionList className="pf-v5-u-mt-md">
+      <ActionList className="pf-v6-u-mt-md">
         <Button
           isDisabled={!isOrganizationValid || isValidating}
           variant="link"
diff --git a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/ManageSourceForm.tsx b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/ManageSourceForm.tsx
index 906a70eb31..aaabccbce5 100644
--- a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/ManageSourceForm.tsx
+++ b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/ManageSourceForm.tsx
@@ -15,7 +15,11 @@ import { catalogSettingsUrl } from '~/app/routes/modelCatalogSettings/modelCatal
 import { isFormValid } from '~/app/pages/modelCatalogSettings/utils/validation';
 import { useManageSourceData } from '~/app/pages/modelCatalogSettings/useManageSourceData';
 import { useSourcePreview } from '~/app/pages/modelCatalogSettings/useSourcePreview';
-import { FORM_LABELS, DESCRIPTIONS } from '~/app/pages/modelCatalogSettings/constants';
+import {
+  FORM_LABELS,
+  DESCRIPTION_TEXT,
+  ERROR_MESSAGES,
+} from '~/app/pages/modelCatalogSettings/constants';
 import { ModelCatalogSettingsContext } from '~/app/context/modelCatalogSettings/ModelCatalogSettingsContext';
 import {
   catalogSourceConfigToFormData,
@@ -82,7 +86,7 @@ const ManageSourceForm: React.FC<ManageSourceFormProps> = ({
       refreshCatalogSourceConfigs();
       navigate(catalogSettingsUrl());
     } catch (error) {
-      setSubmitError(error instanceof Error ? error : new Error(`Failed to save source`));
+      setSubmitError(error instanceof Error ? error : new Error(ERROR_MESSAGES.SAVE_FAILED));
     } finally {
       setIsSubmitting(false);
     }
@@ -154,7 +158,7 @@ const ManageSourceForm: React.FC<ManageSourceFormProps> = ({
                       id="enable-source"
                       name="enable-source"
                       data-testid="enable-source-checkbox"
-                      description={DESCRIPTIONS.ENABLE_SOURCE}
+                      description={DESCRIPTION_TEXT.ENABLE_SOURCE}
                       isChecked={formData.enabled}
                       onChange={(_event, checked) => setData('enabled', checked)}
                     />
diff --git a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/ManageSourceFormFooter.tsx b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/ManageSourceFormFooter.tsx
index 9bfcc34d7b..03b7b835bf 100644
--- a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/ManageSourceFormFooter.tsx
+++ b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/ManageSourceFormFooter.tsx
@@ -9,6 +9,7 @@ import {
   ActionListGroup,
   Alert,
 } from '@patternfly/react-core';
+import { ERROR_MESSAGES } from '~/app/pages/modelCatalogSettings/constants';
 import PreviewButton from './PreviewButton';
 
 type ManageSourceFormFooterProps = {
@@ -38,7 +39,7 @@ const ManageSourceFormFooter: React.FC<ManageSourceFormFooterProps> = ({
     <Stack hasGutter>
       {submitError && (
         <StackItem>
-          <Alert variant="danger" isInline title="Error saving source">
+          <Alert variant="danger" isInline title={ERROR_MESSAGES.SAVE_FAILED}>
             {submitError.message}
           </Alert>
         </StackItem>
diff --git a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/ModelVisibilitySection.tsx b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/ModelVisibilitySection.tsx
index 445e6691f9..d5342351e8 100644
--- a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/ModelVisibilitySection.tsx
+++ b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/ModelVisibilitySection.tsx
@@ -2,20 +2,19 @@ import * as React from 'react';
 import {
   FormFieldGroupExpandable,
   FormFieldGroupHeader,
-  FormGroup,
   TextArea,
   FormHelperText,
   HelperText,
   HelperTextItem,
 } from '@patternfly/react-core';
 import { UpdateObjectAtPropAndValue } from 'mod-arch-shared';
-import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 import FormSection from '~/app/pages/modelRegistry/components/pf-overrides/FormSection';
+import ThemeAwareFormGroupWrapper from '~/app/pages/settings/components/ThemeAwareFormGroupWrapper';
 import { ManageSourceFormData } from '~/app/pages/modelCatalogSettings/useManageSourceData';
 import {
   FORM_LABELS,
   PLACEHOLDERS,
-  DESCRIPTIONS,
+  DESCRIPTION_TEXT,
   getFilterInfoWithOrg,
   getAllowedModelsHelp,
   getExcludedModelsHelp,
@@ -41,18 +40,7 @@ const ModelVisibilitySection: React.FC<ModelVisibilitySectionProps> = ({
   const sectionDescription =
     isHuggingFaceMode && organization
       ? getFilterInfoWithOrg(organization)
-      : DESCRIPTIONS.FILTER_INFO_GENERIC;
-
-  const allowedModelsHelp = getAllowedModelsHelp(organization);
-  const excludedModelsHelp = getExcludedModelsHelp(organization);
-
-  const allowedModelsPlaceholder = isHuggingFaceMode
-    ? PLACEHOLDERS.ALLOWED_MODELS_HF
-    : PLACEHOLDERS.ALLOWED_MODELS_GENERIC;
-
-  const excludedModelsPlaceholder = isHuggingFaceMode
-    ? PLACEHOLDERS.EXCLUDED_MODELS_HF
-    : PLACEHOLDERS.EXCLUDED_MODELS_GENERIC;
+      : DESCRIPTION_TEXT.FILTER_INFO_GENERIC;
 
   const allowedModelsInput = (
     <TextArea
@@ -63,10 +51,26 @@ const ModelVisibilitySection: React.FC<ModelVisibilitySectionProps> = ({
       onChange={(_event, value) => setData('allowedModels', value)}
       rows={3}
       resizeOrientation="vertical"
-      placeholder={allowedModelsPlaceholder}
+      placeholder={PLACEHOLDERS.ALLOWED_MODELS}
     />
   );
 
+  const allowedModelsDescriptionTxtNode = (
+    <FormHelperText>
+      <HelperText>
+        <HelperTextItem>{getAllowedModelsHelp(organization)}</HelperTextItem>
+      </HelperText>
+    </FormHelperText>
+  );
+
+  const allowedModelsHelperTxtNode = (
+    <FormHelperText>
+      <HelperText>
+        <HelperTextItem>{getIncludedModelsFieldHelperText}</HelperTextItem>
+      </HelperText>
+    </FormHelperText>
+  );
+
   const excludedModelsInput = (
     <TextArea
       id="excluded-models"
@@ -76,10 +80,26 @@ const ModelVisibilitySection: React.FC<ModelVisibilitySectionProps> = ({
       onChange={(_event, value) => setData('excludedModels', value)}
       rows={3}
       resizeOrientation="vertical"
-      placeholder={excludedModelsPlaceholder}
+      placeholder={PLACEHOLDERS.EXCLUDED_MODELS}
     />
   );
 
+  const excludedModelsDescriptionTxtNode = (
+    <FormHelperText>
+      <HelperText>
+        <HelperTextItem>{getExcludedModelsHelp(organization)}</HelperTextItem>
+      </HelperText>
+    </FormHelperText>
+  );
+
+  const excludedModelsHelperTxtNode = (
+    <FormHelperText>
+      <HelperText>
+        <HelperTextItem>{getExcludedModelsFieldHelperText}</HelperTextItem>
+      </HelperText>
+    </FormHelperText>
+  );
+
   return (
     <FormSection>
       <FormFieldGroupExpandable
@@ -93,33 +113,23 @@ const ModelVisibilitySection: React.FC<ModelVisibilitySectionProps> = ({
         isExpanded={isDefaultExpanded}
         data-testid="model-visibility-section"
       >
-        <FormGroup label={FORM_LABELS.ALLOWED_MODELS} fieldId="allowed-models">
-          <FormFieldset component={allowedModelsInput} field="Allowed models" />
-          <FormHelperText>
-            <HelperText>
-              <HelperTextItem>{allowedModelsHelp}</HelperTextItem>
-            </HelperText>
-          </FormHelperText>
-          <FormHelperText>
-            <HelperText>
-              <HelperTextItem>{getIncludedModelsFieldHelperText}</HelperTextItem>
-            </HelperText>
-          </FormHelperText>
-        </FormGroup>
+        <ThemeAwareFormGroupWrapper
+          label={FORM_LABELS.ALLOWED_MODELS}
+          fieldId="allowed-models"
+          descriptionTextNode={allowedModelsDescriptionTxtNode}
+          helperTextNode={allowedModelsHelperTxtNode}
+        >
+          {allowedModelsInput}
+        </ThemeAwareFormGroupWrapper>
 
-        <FormGroup label={FORM_LABELS.EXCLUDED_MODELS} fieldId="excluded-models">
-          <FormFieldset component={excludedModelsInput} field="Excluded models" />
-          <FormHelperText>
-            <HelperText>
-              <HelperTextItem>{excludedModelsHelp}</HelperTextItem>
-            </HelperText>
-          </FormHelperText>
-          <FormHelperText>
-            <HelperText>
-              <HelperTextItem>{getExcludedModelsFieldHelperText}</HelperTextItem>
-            </HelperText>
-          </FormHelperText>
-        </FormGroup>
+        <ThemeAwareFormGroupWrapper
+          label={FORM_LABELS.EXCLUDED_MODELS}
+          fieldId="excluded-models"
+          descriptionTextNode={excludedModelsDescriptionTxtNode}
+          helperTextNode={excludedModelsHelperTxtNode}
+        >
+          {excludedModelsInput}
+        </ThemeAwareFormGroupWrapper>
       </FormFieldGroupExpandable>
     </FormSection>
   );
diff --git a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/PreviewPanel.tsx b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/PreviewPanel.tsx
index 38bb61c54a..55dfd0c0ee 100644
--- a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/PreviewPanel.tsx
+++ b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/PreviewPanel.tsx
@@ -19,7 +19,11 @@ import {
   AlertActionLink,
 } from '@patternfly/react-core';
 import { CheckCircleIcon, TimesCircleIcon } from '@patternfly/react-icons';
-import { PAGE_TITLES } from '~/app/pages/modelCatalogSettings/constants';
+import {
+  PAGE_TITLES,
+  ERROR_MESSAGES,
+  EMPTY_STATE_TEXT,
+} from '~/app/pages/modelCatalogSettings/constants';
 import {
   UseSourcePreviewResult,
   PreviewTab,
@@ -58,7 +62,7 @@ const PreviewPanel: React.FC<PreviewPanelProps> = ({ preview }) => {
       return (
         <EmptyState
           icon={TimesCircleIcon}
-          titleText="Failed to preview the results"
+          titleText={ERROR_MESSAGES.PREVIEW_FAILED}
           variant={EmptyStateVariant.sm}
         >
           <EmptyStateBody>{previewError.message}</EmptyStateBody>
@@ -80,8 +84,8 @@ const PreviewPanel: React.FC<PreviewPanelProps> = ({ preview }) => {
     return (
       <EmptyState titleText={PAGE_TITLES.PREVIEW_MODELS} variant={EmptyStateVariant.sm}>
         <EmptyStateBody>
-          To view the models from this source that will appear in the model catalog with your
-          current configuration, complete all required fields, then click <strong>Preview</strong>.
+          To view the models from this source that will appear in the model catalog, complete all
+          required fields, then click <strong>Preview</strong>.
         </EmptyStateBody>
         <EmptyStateFooter>
           <EmptyStateActions>
@@ -175,12 +179,16 @@ const PreviewPanel: React.FC<PreviewPanelProps> = ({ preview }) => {
           ) : (
             <EmptyState
               variant={EmptyStateVariant.sm}
-              titleText={`No models ${activeTab === PreviewTab.INCLUDED ? 'included' : 'excluded'}`}
+              titleText={
+                activeTab === PreviewTab.INCLUDED
+                  ? EMPTY_STATE_TEXT.NO_MODELS_INCLUDED
+                  : EMPTY_STATE_TEXT.NO_MODELS_EXCLUDED
+              }
             >
               <EmptyStateBody>
                 {activeTab === PreviewTab.INCLUDED
-                  ? 'No models from this source are visible in the model catalog. To include models, edit the model visibility settings of this source.'
-                  : 'No models from this source are excluded by this filter'}
+                  ? EMPTY_STATE_TEXT.NO_MODELS_INCLUDED_BODY
+                  : EMPTY_STATE_TEXT.NO_MODELS_EXCLUDED_BODY}
               </EmptyStateBody>
             </EmptyState>
           )}
diff --git a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/YamlSection.tsx b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/YamlSection.tsx
index d7cabcdf00..8e73da13d8 100644
--- a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/YamlSection.tsx
+++ b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/YamlSection.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
 import {
+  Alert,
   Button,
   Flex,
   FlexItem,
@@ -11,6 +12,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';
@@ -18,8 +20,9 @@ import { validateYamlContent } from '~/app/pages/modelCatalogSettings/utils/vali
 import {
   FORM_LABELS,
   VALIDATION_MESSAGES,
-  HELP_TEXT,
+  ERROR_MESSAGES,
   EXPECTED_YAML_FORMAT_LABEL,
+  HELPER_TEXT,
 } from '~/app/pages/modelCatalogSettings/constants';
 
 type YamlSectionProps = {
@@ -33,8 +36,10 @@ const YamlSection: React.FC<YamlSectionProps> = ({
   setData,
   onToggleExpectedFormatDrawer,
 }) => {
+  const { isMUITheme } = useThemeContext();
   const [isYamlTouched, setIsYamlTouched] = React.useState(false);
   const [filename, setFilename] = React.useState('');
+  const [fileUploadError, setFileUploadError] = React.useState<string | undefined>(undefined);
   const isYamlContentValid = validateYamlContent(formData.yamlContent);
 
   const handleFileChange = (
@@ -42,12 +47,16 @@ const YamlSection: React.FC<YamlSectionProps> = ({
     file: File,
   ) => {
     setFilename(file.name);
+    setFileUploadError(undefined);
     const reader = new FileReader();
     reader.onload = () => {
       const text = typeof reader.result === 'string' ? reader.result : '';
       setData('yamlContent', text);
       setIsYamlTouched(true);
     };
+    reader.onerror = () => {
+      setFileUploadError(ERROR_MESSAGES.FILE_UPLOAD_FAILED_BODY);
+    };
     reader.readAsText(file);
   };
 
@@ -59,6 +68,7 @@ const YamlSection: React.FC<YamlSectionProps> = ({
     setFilename('');
     setData('yamlContent', '');
     setIsYamlTouched(true);
+    setFileUploadError(undefined);
   };
 
   const yamlInput = (
@@ -83,49 +93,67 @@ const YamlSection: React.FC<YamlSectionProps> = ({
     </div>
   );
 
+  const yamlHelperTxtNode =
+    isYamlTouched && !isYamlContentValid ? (
+      <FormHelperText>
+        <HelperText>
+          <HelperTextItem variant="error" data-testid="yaml-content-error">
+            {VALIDATION_MESSAGES.YAML_CONTENT_REQUIRED}
+          </HelperTextItem>
+        </HelperText>
+      </FormHelperText>
+    ) : (
+      <FormHelperText>
+        <HelperText>
+          <HelperTextItem>{HELPER_TEXT.YAML}</HelperTextItem>
+        </HelperText>
+      </FormHelperText>
+    );
+
+  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;
+
   return (
     <FormSection data-testid="yaml-section">
+      {fileUploadError && (
+        <Alert
+          variant="danger"
+          isInline
+          title={ERROR_MESSAGES.FILE_UPLOAD_FAILED}
+          className="pf-v6-u-mb-md"
+          data-testid="yaml-file-upload-error"
+        >
+          {fileUploadError}
+        </Alert>
+      )}
+      {isMUITheme && (
+        <Flex
+          justifyContent={{ default: 'justifyContentSpaceBetween' }}
+          alignItems={{ default: 'alignItemsCenter' }}
+          className="pf-v6-u-mb-sm"
+        >
+          <FlexItem>{FORM_LABELS.YAML_CONTENT}</FlexItem>
+          <FlexItem>{expectedFormatButton}</FlexItem>
+        </Flex>
+      )}
       <FormGroup
-        label={
-          <Flex
-            justifyContent={{ default: 'justifyContentSpaceBetween' }}
-            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>
-            )}
-          </Flex>
-        }
+        label={!isMUITheme ? FORM_LABELS.YAML_CONTENT : undefined}
+        labelInfo={!isMUITheme ? expectedFormatButton : undefined}
         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>
-        )}
+        {yamlHelperTxtNode}
       </FormGroup>
     </FormSection>
   );
diff --git a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/__tests__/PreviewPanel.spec.tsx b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/__tests__/PreviewPanel.spec.tsx
index a15641bd29..af20315ac8 100644
--- a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/__tests__/PreviewPanel.spec.tsx
+++ b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/__tests__/PreviewPanel.spec.tsx
@@ -116,7 +116,7 @@ describe('PreviewPanel', () => {
     );
     render(<PreviewPanel preview={preview} />);
 
-    expect(screen.getByText('Failed to preview the results')).toBeInTheDocument();
+    expect(screen.getByText('Preview failed')).toBeInTheDocument();
     expect(screen.getByText('Failed to fetch preview')).toBeInTheDocument();
     expect(screen.getByTestId('preview-button-panel-retry')).toBeInTheDocument();
   });
diff --git a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/constants.tsx b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/constants.tsx
index b65034b73b..123139b1dd 100644
--- a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/constants.tsx
+++ b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/constants.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 export const FORM_LABELS = {
   NAME: 'Name',
   SOURCE_TYPE: 'Source type',
-  ORGANIZATION: 'Allowed organization',
+  ORGANIZATION: 'Organization',
   ACCESS_TOKEN: 'Access token',
   YAML_CONTENT: 'Upload a YAML file',
   MODEL_VISIBILITY: 'Model visibility',
@@ -33,39 +33,77 @@ export const VALIDATION_MESSAGES = {
   YAML_CONTENT_REQUIRED: 'YAML content is required',
 } as const;
 
-export const HELP_TEXT = {
+export const DESCRIPTION_TEXT = {
   ACCESS_TOKEN:
-    'Enter your fine-grained Hugging Face access token. Public models can be pulled into catalog without an access token. For private/gated models, a token is recommended to ensure full metadata is displayed, otherwise only limited metadata may be available. The token must have the following permissions: read repos in your namespace, read public repos that you can access.',
+    'Enter your fine-grained Hugging Face access token. The token must have the following permissions: read repos in your namespace, read public repos that you can access, access webhooks, and create webhooks.',
   ORGANIZATION:
     'Enter the name of the organization (for example, meta-llama) to sync models from. Hugging Face sources are limited to 1 organization to prevent performance issues related to loading large model sets.',
+  ENABLE_SOURCE:
+    'Enable users in your organization to view models from this source in the model catalog.',
+  FILTER_INFO_GENERIC:
+    'Optionally filter which models from this source appear in the model catalog. If no filters are set, all models from the source will be visible.',
+} as const;
+
+export const HELPER_TEXT = {
+  ACCESS_TOKEN: 'Enter your Hugging Face access token.',
   YAML: 'Upload or paste a YAML string.',
 } as const;
 
 export const PLACEHOLDERS = {
   ORGANIZATION: 'Example: meta-llama',
-  ALLOWED_MODELS_HF: 'Enter model names, one per line (e.g., gemma-7b*)',
-  ALLOWED_MODELS_GENERIC: 'Example: Google/gemma-7b*, Meta/Llama-3.1-8B-Instruct',
-  EXCLUDED_MODELS_HF: 'Enter model names, one per line (e.g., gemma-7b-test*)',
-  EXCLUDED_MODELS_GENERIC: 'Example: Google/gemma-7b-test*, Meta/Llama*',
+  ALLOWED_MODELS: 'Example: Llama*, Llama-3.1-8B-Instruct',
+  EXCLUDED_MODELS: 'Example: Llama*, Llama-3.1-8B-Instruct',
 } as const;
 
 export const EXPECTED_YAML_FORMAT_LABEL = 'View expected file format';
 
-export const DESCRIPTIONS = {
-  ENABLE_SOURCE:
-    'Enable users in your organization to view models from this source in the model catalog.',
-  FILTER_INFO_GENERIC:
-    'Optionally filter which models from your source appear in the model catalog. If no filters are set, all models from the source will be visible.',
-} as const;
-
 export const PAGE_TITLES = {
   MODEL_CATALOG_PREVIEW: 'Model catalog preview',
   PREVIEW_MODELS: 'Preview models',
 } as const;
 
+export const ERROR_MESSAGES = {
+  PREVIEW_FAILED: 'Preview failed',
+  SAVE_FAILED: 'Failed to save source',
+  FILE_UPLOAD_FAILED: 'File upload failed',
+  FILE_UPLOAD_FAILED_BODY:
+    "The YAML file couldn't be uploaded. Check its syntax and structure, then try again.",
+  VALIDATION_FAILED: 'Validation failed',
+  VALIDATION_FAILED_BODY: 'The system cannot establish a connection to the source.',
+} as const;
+
+export const SUCCESS_MESSAGES = {
+  VALIDATION_SUCCESSFUL: 'Validation successful',
+  VALIDATION_SUCCESSFUL_BODY: 'The organization and access token are valid for connection.',
+} as const;
+
+export const TABLE_COLUMN_LABELS = {
+  SOURCE_NAME: 'Source name',
+  ORGANIZATION: 'Organization',
+  MODEL_VISIBILITY: 'Model visibility',
+  SOURCE_TYPE: 'Source type',
+  ENABLE: 'Enable',
+  VALIDATION_STATUS: 'Validation status',
+} as const;
+
+export const TABLE_COLUMN_POPOVERS = {
+  ORGANIZATION:
+    'Applies only to Hugging Face sources. Shows the organization the source syncs models from (for example, meta-llama). Only models within this organization are included in the catalog.',
+  ENABLE:
+    'Enable a source to make its models available to users in your organization from the model catalog.',
+} as const;
+
+export const EMPTY_STATE_TEXT = {
+  NO_MODELS_INCLUDED: 'No models included',
+  NO_MODELS_INCLUDED_BODY:
+    'No models from this source are visible in the model catalog. To include models, edit the model visibility settings of this source.',
+  NO_MODELS_EXCLUDED: 'No models excluded',
+  NO_MODELS_EXCLUDED_BODY: 'No models from this source are excluded by this filter',
+} as const;
+
 export const getFilterInfoWithOrg = (organization: string): React.ReactNode => (
   <>
-    Optionally filter which <strong>{organization}</strong> models from your source appear in the
+    Optionally filter which <strong>{organization}</strong> models from this source appear in the
     model catalog. If no filters are set, all <strong>{organization}</strong> models from the source
     will be visible.
   </>
@@ -97,4 +135,4 @@ export const getIncludedModelsFieldHelperText =
 
 /** Same for HF and YAML sources. */
 export const getExcludedModelsFieldHelperText =
-  'Separate model names using commas. To exclude models matching a pattern, use an asterisk at the beginning, end, or both sides of a name. Example, *Llama*, Llama*Instruct';
+  'Separate model names using commas. To exclude all models with a specific prefix, enter the prefix followed by an asterisk. Example, Llama*';
diff --git a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/screens/CatalogSourceConfigsTableColumns.tsx b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/screens/CatalogSourceConfigsTableColumns.tsx
index c06760bd56..1abbc58403 100644
--- a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/screens/CatalogSourceConfigsTableColumns.tsx
+++ b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/screens/CatalogSourceConfigsTableColumns.tsx
@@ -2,30 +2,33 @@ import * as React from 'react';
 import { List, ListItem } from '@patternfly/react-core';
 import { kebabTableColumn, SortableData } from 'mod-arch-shared';
 import { CatalogSourceConfig } from '~/app/modelCatalogTypes';
+import {
+  TABLE_COLUMN_LABELS,
+  TABLE_COLUMN_POPOVERS,
+} from '~/app/pages/modelCatalogSettings/constants';
 
 export const catalogSourceConfigsColumns: SortableData<CatalogSourceConfig>[] = [
   {
     field: 'name',
-    label: 'Source name',
+    label: TABLE_COLUMN_LABELS.SOURCE_NAME,
     sortable: (a, b) => a.name.localeCompare(b.name),
     width: 15,
   },
   {
     field: 'allowedOrganization',
-    label: 'Organization',
+    label: TABLE_COLUMN_LABELS.ORGANIZATION,
     sortable: (a, b) =>
       ('allowedOrganization' in a ? (a.allowedOrganization ?? '') : '').localeCompare(
         'allowedOrganization' in b ? (b.allowedOrganization ?? '') : '',
       ),
     info: {
-      popover:
-        'Applies only to Hugging Face sources. Shows the organization the source syncs models from (for example, meta-llama). Only models within this organization are included in the catalog.',
+      popover: TABLE_COLUMN_POPOVERS.ORGANIZATION,
     },
     width: 15,
   },
   {
     field: 'filters',
-    label: 'Model visibility',
+    label: TABLE_COLUMN_LABELS.MODEL_VISIBILITY,
     sortable: (a: CatalogSourceConfig, b: CatalogSourceConfig): number => {
       const aFiltered = (a.includedModels?.length ?? 0) + (a.excludedModels?.length ?? 0);
       const bFiltered = (b.includedModels?.length ?? 0) + (b.excludedModels?.length ?? 0);
@@ -54,23 +57,22 @@ export const catalogSourceConfigsColumns: SortableData<CatalogSourceConfig>[] =
   },
   {
     field: 'type',
-    label: 'Source type',
+    label: TABLE_COLUMN_LABELS.SOURCE_TYPE,
     sortable: (a, b) => a.type.localeCompare(b.type),
     width: 15,
   },
   {
     field: 'enabled',
-    label: 'Enable',
+    label: TABLE_COLUMN_LABELS.ENABLE,
     sortable: (a, b) => Number(a.enabled ?? true) - Number(b.enabled ?? true),
     info: {
-      popover:
-        'Enable a source to make its models available to users in your organization from the model catalog.',
+      popover: TABLE_COLUMN_POPOVERS.ENABLE,
     },
     width: 10,
   },
   {
     field: 'status',
-    label: 'Validation status',
+    label: TABLE_COLUMN_LABELS.VALIDATION_STATUS,
     sortable: false,
     width: 10,
   },

From 9630004bae3857aa6c063752f78677dab19e75c7 Mon Sep 17 00:00:00 2001
From: ppadti <ppadti@redhat.com>
Date: Wed, 22 Apr 2026 13:20:48 +0530
Subject: [PATCH 11/14] Update @odh-dashboard/model-registry: build(deps): bump
 k8s.io/api from 0.35.3 to 0.35.4 in /clients/ui/bff (#2614)

Upstream commit: 19dc8e3fdbfc2a139d90a6eee0674b3b29f308f3
---
 packages/model-registry/package.json        | 2 +-
 packages/model-registry/upstream/bff/go.mod | 4 ++--
 packages/model-registry/upstream/bff/go.sum | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/model-registry/package.json b/packages/model-registry/package.json
index 0a59d783e1..a8a51e8759 100644
--- a/packages/model-registry/package.json
+++ b/packages/model-registry/package.json
@@ -23,7 +23,7 @@
     "branch": "main",
     "src": "clients/ui",
     "target": "upstream",
-    "commit": "f953cc20feea8838fac24064d0a4201df7fe0e70"
+    "commit": "19dc8e3fdbfc2a139d90a6eee0674b3b29f308f3"
   },
   "module-federation": {
     "name": "modelRegistry",
diff --git a/packages/model-registry/upstream/bff/go.mod b/packages/model-registry/upstream/bff/go.mod
index 9f5b6078ea..0b558e5644 100644
--- a/packages/model-registry/upstream/bff/go.mod
+++ b/packages/model-registry/upstream/bff/go.mod
@@ -12,8 +12,8 @@ require (
 	github.com/rs/cors v1.11.1
 	github.com/stretchr/testify v1.11.1
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/api v0.35.3
-	k8s.io/apimachinery v0.35.3
+	k8s.io/api v0.35.4
+	k8s.io/apimachinery v0.35.4
 	k8s.io/client-go v0.35.3
 	sigs.k8s.io/controller-runtime v0.23.3
 )
diff --git a/packages/model-registry/upstream/bff/go.sum b/packages/model-registry/upstream/bff/go.sum
index d975af3c0a..d42d08844c 100644
--- a/packages/model-registry/upstream/bff/go.sum
+++ b/packages/model-registry/upstream/bff/go.sum
@@ -153,12 +153,12 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.35.3 h1:pA2fiBc6+N9PDf7SAiluKGEBuScsTzd2uYBkA5RzNWQ=
-k8s.io/api v0.35.3/go.mod h1:9Y9tkBcFwKNq2sxwZTQh1Njh9qHl81D0As56tu42GA4=
+k8s.io/api v0.35.4 h1:P7nFYKl5vo9AGUp1Z+Pmd3p2tA7bX2wbFWCvDeRv988=
+k8s.io/api v0.35.4/go.mod h1:yl4lqySWOgYJJf9RERXKUwE9g2y+CkuwG+xmcOK8wXU=
 k8s.io/apiextensions-apiserver v0.35.0 h1:3xHk2rTOdWXXJM+RDQZJvdx0yEOgC0FgQ1PlJatA5T4=
 k8s.io/apiextensions-apiserver v0.35.0/go.mod h1:E1Ahk9SADaLQ4qtzYFkwUqusXTcaV2uw3l14aqpL2LU=
-k8s.io/apimachinery v0.35.3 h1:MeaUwQCV3tjKP4bcwWGgZ/cp/vpsRnQzqO6J6tJyoF8=
-k8s.io/apimachinery v0.35.3/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns=
+k8s.io/apimachinery v0.35.4 h1:xtdom9RG7e+yDp71uoXoJDWEE2eOiHgeO4GdBzwWpds=
+k8s.io/apimachinery v0.35.4/go.mod h1:NNi1taPOpep0jOj+oRha3mBJPqvi0hGdaV8TCqGQ+cc=
 k8s.io/client-go v0.35.3 h1:s1lZbpN4uI6IxeTM2cpdtrwHcSOBML1ODNTCCfsP1pg=
 k8s.io/client-go v0.35.3/go.mod h1:RzoXkc0mzpWIDvBrRnD+VlfXP+lRzqQjCmKtiwZ8Q9c=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

From bc4d4371f2f88d8316b882c420d1294f47f860e7 Mon Sep 17 00:00:00 2001
From: ppadti <ppadti@redhat.com>
Date: Wed, 22 Apr 2026 13:20:49 +0530
Subject: [PATCH 12/14] Update @odh-dashboard/model-registry: Rename default
 catalog sources ConfigMap to `default-catalog-sources` (#2593)

Upstream commit: f7b549fc9dd27eb0f3e4090c70c2bda2a16c6dba
---
 packages/model-registry/package.json                            | 2 +-
 .../upstream/bff/internal/integrations/kubernetes/client.go     | 2 +-
 .../internal/integrations/kubernetes/k8mocks/base_testenv.go    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/model-registry/package.json b/packages/model-registry/package.json
index a8a51e8759..99f2899ee5 100644
--- a/packages/model-registry/package.json
+++ b/packages/model-registry/package.json
@@ -23,7 +23,7 @@
     "branch": "main",
     "src": "clients/ui",
     "target": "upstream",
-    "commit": "19dc8e3fdbfc2a139d90a6eee0674b3b29f308f3"
+    "commit": "f7b549fc9dd27eb0f3e4090c70c2bda2a16c6dba"
   },
   "module-federation": {
     "name": "modelRegistry",
diff --git a/packages/model-registry/upstream/bff/internal/integrations/kubernetes/client.go b/packages/model-registry/upstream/bff/internal/integrations/kubernetes/client.go
index dffdc734e3..e6b777e1b2 100644
--- a/packages/model-registry/upstream/bff/internal/integrations/kubernetes/client.go
+++ b/packages/model-registry/upstream/bff/internal/integrations/kubernetes/client.go
@@ -12,7 +12,7 @@ const ComponentLabelValue = "model-registry"
 const ComponentLabelValueCatalog = "model-catalog"
 
 const CatalogSourceKey = "sources.yaml"
-const CatalogSourceDefaultConfigMapName = "model-catalog-default-sources"
+const CatalogSourceDefaultConfigMapName = "default-catalog-sources"
 const CatalogSourceUserConfigMapName = "model-catalog-sources"
 
 type KubernetesClientInterface interface {
diff --git a/packages/model-registry/upstream/bff/internal/integrations/kubernetes/k8mocks/base_testenv.go b/packages/model-registry/upstream/bff/internal/integrations/kubernetes/k8mocks/base_testenv.go
index 4b6d817d73..8acf16ae44 100644
--- a/packages/model-registry/upstream/bff/internal/integrations/kubernetes/k8mocks/base_testenv.go
+++ b/packages/model-registry/upstream/bff/internal/integrations/kubernetes/k8mocks/base_testenv.go
@@ -347,7 +347,7 @@ catalogs:
 	}
 
 	if _, err := k8sClient.CoreV1().ConfigMaps(namespace).Create(ctx, cm, metav1.CreateOptions{}); err != nil {
-		return fmt.Errorf("failed to create model-catalog-default-sources configmap: %w", err)
+		return fmt.Errorf("failed to create default-catalog-sources configmap: %w", err)
 	}
 
 	return nil

From d7208ad569e751c9b1a570585572b67fbe546689 Mon Sep 17 00:00:00 2001
From: ppadti <ppadti@redhat.com>
Date: Wed, 22 Apr 2026 13:20:49 +0530
Subject: [PATCH 13/14] Update @odh-dashboard/model-registry: Add Hugging Face
 organization slug helper under Allowed organization (#2600)

Upstream commit: 6819f351f62bfc265679cb4f3a5720ba81746da1
---
 packages/model-registry/package.json          |  2 +-
 .../components/CredentialsSection.tsx         | 25 ++++++++++++-------
 .../pages/modelCatalogSettings/constants.tsx  |  2 ++
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/packages/model-registry/package.json b/packages/model-registry/package.json
index 99f2899ee5..ab997dcfcf 100644
--- a/packages/model-registry/package.json
+++ b/packages/model-registry/package.json
@@ -23,7 +23,7 @@
     "branch": "main",
     "src": "clients/ui",
     "target": "upstream",
-    "commit": "f7b549fc9dd27eb0f3e4090c70c2bda2a16c6dba"
+    "commit": "6819f351f62bfc265679cb4f3a5720ba81746da1"
   },
   "module-federation": {
     "name": "modelRegistry",
diff --git a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/CredentialsSection.tsx b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/CredentialsSection.tsx
index b0f391bad4..3991e9e5f3 100644
--- a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/CredentialsSection.tsx
+++ b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/components/CredentialsSection.tsx
@@ -88,15 +88,22 @@ const CredentialsSection: React.FC<CredentialsSectionProps> = ({
     ) : undefined;
 
   const organizationFormGroup = (
-    <ThemeAwareFormGroupWrapper
-      label={FORM_LABELS.ORGANIZATION}
-      fieldId="organization"
-      isRequired
-      descriptionTextNode={organizationDescriptionTxtNode}
-      helperTextNode={organizationHelperTxtNode}
-    >
-      {organizationInput}
-    </ThemeAwareFormGroupWrapper>
+    <>
+      <ThemeAwareFormGroupWrapper
+        label={FORM_LABELS.ORGANIZATION}
+        fieldId="organization"
+        isRequired
+        descriptionTextNode={organizationDescriptionTxtNode}
+        helperTextNode={organizationHelperTxtNode}
+      >
+        {organizationInput}
+      </ThemeAwareFormGroupWrapper>
+      <FormHelperText>
+        <HelperText>
+          <HelperTextItem>{HELPER_TEXT.ORGANIZATION_SLUG}</HelperTextItem>
+        </HelperText>
+      </FormHelperText>
+    </>
   );
 
   const accessTokenInput = (
diff --git a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/constants.tsx b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/constants.tsx
index 123139b1dd..c016a55d70 100644
--- a/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/constants.tsx
+++ b/packages/model-registry/upstream/frontend/src/app/pages/modelCatalogSettings/constants.tsx
@@ -47,6 +47,8 @@ export const DESCRIPTION_TEXT = {
 export const HELPER_TEXT = {
   ACCESS_TOKEN: 'Enter your Hugging Face access token.',
   YAML: 'Upload or paste a YAML string.',
+  ORGANIZATION_SLUG:
+    'Hugging Face organization’s name is case-sensitive and should match the organization’s URL, which may differ from the displayed name. Use the organization’s URL slug found in the URL (e.g., Input: meta-llama from huggingface.co/meta-llama).',
 } as const;
 
 export const PLACEHOLDERS = {

From 24c5e145a5ec67387b0233341a725ecd76e916ae Mon Sep 17 00:00:00 2001
From: ppadti <ppadti@redhat.com>
Date: Wed, 22 Apr 2026 13:20:49 +0530
Subject: [PATCH 14/14] Update @odh-dashboard/model-registry tracking to
 6e18d5aca6de378c66794ae581b9c42d0767aff7 (no file changes)

---
 packages/model-registry/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/model-registry/package.json b/packages/model-registry/package.json
index ab997dcfcf..741db6c736 100644
--- a/packages/model-registry/package.json
+++ b/packages/model-registry/package.json
@@ -23,7 +23,7 @@
     "branch": "main",
     "src": "clients/ui",
     "target": "upstream",
-    "commit": "6819f351f62bfc265679cb4f3a5720ba81746da1"
+    "commit": "6e18d5aca6de378c66794ae581b9c42d0767aff7"
   },
   "module-federation": {
     "name": "modelRegistry",