diff --git a/libs/domains/clusters/feature/src/lib/cluster-add/cluster-add.spec.tsx b/libs/domains/clusters/feature/src/lib/cluster-add/cluster-add.spec.tsx
index 190b3c5b685..da5b2a454e6 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-add/cluster-add.spec.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-add/cluster-add.spec.tsx
@@ -19,6 +19,11 @@ jest.mock('posthog-js', () => ({
   default: { capture: jest.fn() },
 }))
 jest.mock('posthog-js/react', () => ({ useFeatureFlagEnabled: () => false }))
+const mockShowPylonForm = jest.fn()
+jest.mock('@qovery/shared/util-hooks', () => ({
+  ...jest.requireActual('@qovery/shared/util-hooks'),
+  useSupportChat: () => ({ showPylonForm: mockShowPylonForm }),
+}))
 jest.mock('../hooks/use-cluster-creation-restriction/use-cluster-creation-restriction', () => ({
   useClusterCreationRestriction: () => ({ isClusterCreationRestricted: false }),
 }))
@@ -43,6 +48,14 @@ describe('ClusterAdd', () => {
     expect(await screen.findByText('Creation flow')).toBeInTheDocument()
   }
 
+  it('asks for EKS Anywhere access when it is not enabled', async () => {
+    const { userEvent } = renderWithProviders(<ClusterAdd />)
+
+    await userEvent.click(screen.getByRole('button', { name: /Amazon Web Services EKS Anywhere\s*Request access/ }))
+
+    expect(mockShowPylonForm).toHaveBeenCalledWith('request-access-eks-anywhere')
+  })
+
   it('lets the creation flow be dismissed before the cluster is created', async () => {
     const { userEvent } = renderWithProviders(<ClusterAdd />)
 
diff --git a/libs/domains/clusters/feature/src/lib/cluster-add/cluster-add.tsx b/libs/domains/clusters/feature/src/lib/cluster-add/cluster-add.tsx
index ac2c7a983cd..d043f577350 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-add/cluster-add.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-add/cluster-add.tsx
@@ -21,6 +21,7 @@ type ProviderCardProps = {
   title: string
   icon: string | ReactElement
   disabled?: boolean
+  actionLabel?: string
   analytics: { selectedCloudProvider: string; selectedInstallationType: string }
 } & ({ slug: string } | { onClick: () => void })
 
@@ -32,7 +33,7 @@ function ProviderIcon({ icon, title }: { icon: string | ReactElement; title: str
   )
 }
 
-function ProviderCard({ title, icon, disabled = false, analytics, ...props }: ProviderCardProps) {
+function ProviderCard({ title, icon, disabled = false, actionLabel, analytics, ...props }: ProviderCardProps) {
   const { organizationId = '' } = useParams({ strict: false })
   const className = twMerge(
     'flex h-[52px] items-center gap-2 rounded-md border border-neutral bg-surface-neutral px-4 text-left text-sm font-medium text-neutral transition-colors',
@@ -42,7 +43,11 @@ function ProviderCard({ title, icon, disabled = false, analytics, ...props }: Pr
     <>
       <ProviderIcon icon={icon} title={title} />
       <span className="min-w-0 flex-1 truncate">{title}</span>
-      <Icon iconName="angle-right" iconStyle="regular" className="text-neutral-subtle" />
+      {actionLabel ? (
+        <span className="shrink-0 text-ssm font-normal text-neutral-subtle">{actionLabel}</span>
+      ) : (
+        <Icon iconName="angle-right" iconStyle="regular" className="text-neutral-subtle" />
+      )}
     </>
   )
   const capture = () => posthog.capture('select-cluster', analytics)
@@ -165,6 +170,7 @@ export function ClusterAdd() {
           <ProviderCard
             title="Amazon Web Services EKS Anywhere"
             icon={<Icon name="AWS" />}
+            actionLabel="Request access"
             onClick={() => showPylonForm('request-access-eks-anywhere')}
             analytics={{ selectedCloudProvider: 'AWS', selectedInstallationType: 'partially-managed' }}
           />
diff --git a/libs/domains/clusters/feature/src/lib/cluster-profile/cluster-profile-sidebar.tsx b/libs/domains/clusters/feature/src/lib/cluster-profile/cluster-profile-sidebar.tsx
index 5ac6b0d25fd..72f10878696 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-profile/cluster-profile-sidebar.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-profile/cluster-profile-sidebar.tsx
@@ -164,7 +164,7 @@ export function ClusterProfileSidebar({
   const showEmptyState = !isLoading && !isError && layers.length === 0
 
   return (
-    <aside aria-label="Cluster layers" className="hidden w-[272px] shrink-0 flex-col bg-background-secondary lg:flex">
+    <aside aria-label="Cluster layers" className="flex w-56 shrink-0 flex-col bg-background-secondary lg:w-[272px]">
       <div className="p-3">
         <InputSearch
           ariaLabel="Search layers"
diff --git a/libs/domains/clusters/feature/src/lib/cluster-profile/cluster-profile.spec.tsx b/libs/domains/clusters/feature/src/lib/cluster-profile/cluster-profile.spec.tsx
index df9d7b5362a..6b06985bb46 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-profile/cluster-profile.spec.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-profile/cluster-profile.spec.tsx
@@ -19,6 +19,15 @@ jest.mock('@qovery/shared/util-hooks', () => ({
   ...jest.requireActual('@qovery/shared/util-hooks'),
   useDebounce: <T,>(value: T) => value,
 }))
+jest.mock('@qovery/shared/ui', () => {
+  const React = jest.requireActual('react')
+  const ui = jest.requireActual('@qovery/shared/ui')
+  return {
+    ...ui,
+    Icon: (props: { name?: string }) =>
+      React.createElement('span', { 'data-icon-name': props.name }, React.createElement(ui.Icon, props)),
+  }
+})
 jest.mock('../hooks/use-cluster/use-cluster')
 jest.mock('../hooks/use-cluster-operator-status/use-cluster-operator-status', () => ({
   useClusterOperatorStatus: () => ({ data: null, isLoading: false }),
@@ -255,6 +264,23 @@ describe('ClusterProfileFeature', () => {
     mockUseDeployCluster.mockReturnValue({ mutateAsync: mockDeployCluster, isLoading: false })
   })
 
+  it.each([
+    ['AWS', 'AWS'],
+    ['GCP', 'GCP'],
+    ['OVH', 'OVH_CLOUD'],
+    ['ORACLE', 'ORACLE_CLOUD'],
+    ['IBM', 'IBM_CLOUD'],
+  ])('shows the %s provider icon in the header', (cloudProvider, iconName) => {
+    mockUseCluster.mockReturnValue({
+      data: { name: 'my-cluster', cloud_provider: cloudProvider, kubernetes: 'SELF_MANAGED' },
+      isError: false,
+      isLoading: false,
+    } as ReturnType<typeof useCluster>)
+    renderWithProviders(<ClusterProfileFeature />)
+
+    expect(screen.getByRole('banner').querySelector(`[data-icon-name="${iconName}"]`)).toBeInTheDocument()
+  })
+
   it('renders API-defined configuration fields', () => {
     const { container } = renderWithProviders(<ClusterProfileFeature />)
 
@@ -331,6 +357,8 @@ describe('ClusterProfileFeature', () => {
   it('keeps the form visible while a field edit triggers a resolver refetch', async () => {
     const { userEvent } = renderWithProviders(<ClusterProfileFeature />)
     const highAvailability = screen.getByRole('switch', { name: 'High availability' })
+    // Queries keep their previous data while refetching.
+    mockUsePlatformComponentConfigurations.mockReturnValue(createComponentQueries(['loki', 'alloy'], true))
 
     await userEvent.click(highAvailability)
 
diff --git a/libs/domains/clusters/feature/src/lib/cluster-profile/cluster-profile.tsx b/libs/domains/clusters/feature/src/lib/cluster-profile/cluster-profile.tsx
index 96ecabe8aee..5c9284cd80d 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-profile/cluster-profile.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-profile/cluster-profile.tsx
@@ -1,6 +1,7 @@
 import equal from 'fast-deep-equal'
-import { type PlatformComponentConfigurationResolutionResponse } from 'qovery-typescript-axios'
+import { type CloudVendorEnum, type PlatformComponentConfigurationResolutionResponse } from 'qovery-typescript-axios'
 import { useEffect, useMemo, useRef } from 'react'
+import { match } from 'ts-pattern'
 import { CatalogVariableInput } from '@qovery/shared/console-shared'
 import { IconEnum } from '@qovery/shared/enums'
 import { EmptyState, Heading, Icon, Navbar, Skeleton } from '@qovery/shared/ui'
@@ -73,6 +74,14 @@ function filterProfileTree(profileTree: ProfileTreeItem[], query: string): Profi
   })
 }
 
+function getCloudProviderIconName(cloudProvider: CloudVendorEnum) {
+  return match(cloudProvider)
+    .with('OVH', () => IconEnum.OVH_CLOUD)
+    .with('ORACLE', () => IconEnum.ORACLE_CLOUD)
+    .with('IBM', () => IconEnum.IBM_CLOUD)
+    .otherwise((provider) => provider)
+}
+
 function getProfileSections(
   component: ProfileComponent | undefined,
   layer: ProfileTreeItem | undefined,
@@ -434,7 +443,9 @@ function ClusterProfileView({
     <div className="flex h-page-container min-h-0 flex-col overflow-hidden bg-background-secondary text-sm">
       <header className="flex min-h-11 items-center justify-between gap-4 px-4 py-2">
         <div className="flex min-w-0 items-center gap-2">
-          <Icon name={IconEnum.AWS} width={20} height={20} />
+          {cluster?.cloud_provider ? (
+            <Icon name={getCloudProviderIconName(cluster.cloud_provider)} width={20} height={20} />
+          ) : null}
           <p className="truncate font-medium text-neutral">{cluster?.name ?? 'Cluster'}</p>
         </div>
       </header>
diff --git a/libs/domains/clusters/feature/src/lib/cluster-profile/profile-array-item-modal.spec.tsx b/libs/domains/clusters/feature/src/lib/cluster-profile/profile-array-item-modal.spec.tsx
new file mode 100644
index 00000000000..3b2cca80fb2
--- /dev/null
+++ b/libs/domains/clusters/feature/src/lib/cluster-profile/profile-array-item-modal.spec.tsx
@@ -0,0 +1,37 @@
+import { renderWithProviders, screen, waitFor } from '@qovery/shared/util-tests'
+import { type PlatformFieldDescriptor } from '../platform-configuration/platform-configuration-utils'
+import { ProfileArrayItemModal } from './profile-array-item-modal'
+
+const cidrField = {
+  key: 'cidr',
+  label: 'CIDR',
+  type: 'string',
+  required: false,
+  sensitive: false,
+  constraints: {},
+} as PlatformFieldDescriptor
+
+describe('ProfileArrayItemModal', () => {
+  it.each([
+    ['optional fields', cidrField, {}],
+    ['prefilled required fields', { ...cidrField, required: true, defaultValue: '10.0.0.0/8' }, { cidr: '10.0.0.0/8' }],
+  ])('lets an item made of %s be added without editing it', async (_, field, submittedValues) => {
+    const onSubmit = jest.fn()
+    const { userEvent } = renderWithProviders(
+      <ProfileArrayItemModal
+        title="Trusted CIDRs"
+        fields={[field as PlatformFieldDescriptor]}
+        values={{}}
+        isEdit={false}
+        onClose={jest.fn()}
+        onSubmit={onSubmit}
+      />
+    )
+
+    const addButton = screen.getByRole('button', { name: 'Add' })
+    await waitFor(() => expect(addButton).toBeEnabled())
+    await userEvent.click(addButton)
+
+    expect(onSubmit).toHaveBeenCalledWith(submittedValues)
+  })
+})
diff --git a/libs/domains/clusters/feature/src/lib/cluster-profile/profile-changes-bar.tsx b/libs/domains/clusters/feature/src/lib/cluster-profile/profile-changes-bar.tsx
index e0f4b53b8a3..985e3645645 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-profile/profile-changes-bar.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-profile/profile-changes-bar.tsx
@@ -58,7 +58,7 @@ export function ProfileChangesBar({
                 size="md"
                 className="gap-1.5"
                 loading={isSaving}
-                disabled={isDeploying || !canSubmit}
+                disabled={isPending || !canSubmit}
                 onClick={onSave}
               >
                 <Icon iconName="floppy-disk" iconStyle="regular" />
@@ -71,7 +71,7 @@ export function ProfileChangesBar({
                 size="md"
                 className="gap-1.5"
                 loading={isDeploying}
-                disabled={isSaving || !canSubmit}
+                disabled={isPending || !canSubmit}
                 onClick={onSaveAndDeploy}
               >
                 <Icon iconName="rocket" iconStyle="regular" />
diff --git a/libs/domains/clusters/feature/src/lib/cluster-profile/profile-configuration-field.spec.tsx b/libs/domains/clusters/feature/src/lib/cluster-profile/profile-configuration-field.spec.tsx
new file mode 100644
index 00000000000..2340f196c7b
--- /dev/null
+++ b/libs/domains/clusters/feature/src/lib/cluster-profile/profile-configuration-field.spec.tsx
@@ -0,0 +1,68 @@
+import { type FieldSchemaResponse } from 'qovery-typescript-axios'
+import { renderWithProviders, screen } from '@qovery/shared/util-tests'
+import { ProfileConfigurationField } from './profile-configuration-field'
+
+const scalarItemField = {
+  key: 'name',
+  label: 'Name',
+  type: 'string',
+  required: true,
+  sensitive: false,
+  constraints: {},
+}
+
+function createArrayField(itemFields: unknown[]) {
+  return {
+    key: 'listeners',
+    label: 'Listeners',
+    type: 'array',
+    required: false,
+    sensitive: false,
+    constraints: {},
+    items: { type: 'object', fields: itemFields },
+    itemFields: [],
+  } as unknown as FieldSchemaResponse
+}
+
+describe('ProfileConfigurationField', () => {
+  it('lets object items with scalar fields be added', () => {
+    renderWithProviders(
+      <ProfileConfigurationField
+        field={createArrayField([scalarItemField])}
+        path="listeners"
+        value={[]}
+        violations={[]}
+        onChange={jest.fn()}
+      />
+    )
+
+    expect(screen.getByRole('button', { name: 'Add item to Listeners' })).toBeEnabled()
+  })
+
+  it('does not add object items whose nested settings the modal cannot edit', () => {
+    renderWithProviders(
+      <ProfileConfigurationField
+        field={createArrayField([
+          scalarItemField,
+          {
+            key: 'tls',
+            label: 'TLS',
+            type: 'object',
+            required: true,
+            sensitive: false,
+            constraints: {},
+            fields: [{ ...scalarItemField, key: 'secret', label: 'Secret' }],
+          },
+        ])}
+        path="listeners"
+        value={[{ name: 'https', tls: { secret: 'certificate' } }]}
+        violations={[]}
+        onChange={jest.fn()}
+      />
+    )
+
+    expect(screen.getByRole('button', { name: 'Add item to Listeners' })).toBeDisabled()
+    expect(screen.getByText('Items with nested settings cannot be added here yet.')).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'Edit https' })).toBeEnabled()
+  })
+})
diff --git a/libs/domains/clusters/feature/src/lib/cluster-profile/profile-configuration-field.tsx b/libs/domains/clusters/feature/src/lib/cluster-profile/profile-configuration-field.tsx
index 5d853943a46..14eaae7358d 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-profile/profile-configuration-field.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-profile/profile-configuration-field.tsx
@@ -158,7 +158,10 @@ function ProfileArrayField({
   const isItemModalOpenRef = useRef(false)
   const items: unknown[] = Array.isArray(value) ? value : []
   const { minItems, maxItems } = field.constraints
-  const canAdd = typeof maxItems !== 'number' || items.length < maxItems
+  const isUnderLimit = typeof maxItems !== 'number' || items.length < maxItems
+  const hasNestedItemFields =
+    field.items.type === 'object' && field.items.fields.some((itemField) => !isPlatformScalarField(itemField))
+  const canAdd = isUnderLimit && !hasNestedItemFields
   const canRemove = typeof minItems !== 'number' || items.length > minItems
   const error = getFieldViolation(violations, path)
 
@@ -239,7 +242,9 @@ function ProfileArrayField({
             <Icon iconName="circle-plus" iconStyle="regular" />
             Add item
           </Button>
-          {typeof maxItems === 'number' && !canAdd ? (
+          {hasNestedItemFields ? (
+            <p className="text-xs text-neutral-subtle">Items with nested settings cannot be added here yet.</p>
+          ) : typeof maxItems === 'number' && !isUnderLimit ? (
             <p className="text-xs text-neutral-subtle">Limit of {maxItems} reached.</p>
           ) : null}
         </div>
diff --git a/libs/domains/clusters/feature/src/lib/cluster-profile/profile-operator-footer.spec.tsx b/libs/domains/clusters/feature/src/lib/cluster-profile/profile-operator-footer.spec.tsx
index a95a193aae0..9981644752a 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-profile/profile-operator-footer.spec.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-profile/profile-operator-footer.spec.tsx
@@ -38,7 +38,7 @@ describe('ProfileOperatorFooter', () => {
     expect(container).toBeEmptyDOMElement()
   })
 
-  it('refreshes the Operator status while displayed', () => {
+  it('configures polling for the Operator status', () => {
     mockUseClusterOperatorStatus.mockReturnValue({ data: operatorStatus, isLoading: false })
     renderWithProviders(<ProfileOperatorFooter organizationId="org-123" clusterId="cluster-123" />)
 
@@ -50,6 +50,29 @@ describe('ProfileOperatorFooter', () => {
     expect(screen.getByRole('button', { name: 'Qovery operator: Update available' })).toBeInTheDocument()
   })
 
+  it('tells when the Operator status cannot be retrieved', async () => {
+    mockUseClusterOperatorStatus.mockReturnValue({ data: undefined, isLoading: false, isError: true })
+    const { userEvent } = renderWithProviders(
+      <ProfileOperatorFooter organizationId="org-123" clusterId="cluster-123" />
+    )
+
+    await userEvent.hover(screen.getByRole('button', { name: 'Qovery operator: status unavailable' }))
+
+    expect((await screen.findAllByText('The Operator status could not be retrieved.'))[0]).toBeInTheDocument()
+  })
+
+  it('does not keep showing a stale status once a refresh fails', async () => {
+    mockUseClusterOperatorStatus.mockReturnValue({ data: operatorStatus, isLoading: false, isError: true })
+    const { userEvent } = renderWithProviders(
+      <ProfileOperatorFooter organizationId="org-123" clusterId="cluster-123" />
+    )
+
+    await userEvent.hover(screen.getByRole('button', { name: 'Qovery operator: status unavailable' }))
+
+    expect((await screen.findAllByText('The Operator status could not be retrieved.'))[0]).toBeInTheDocument()
+    expect(screen.queryByRole('button', { name: 'Update Operator' })).not.toBeInTheDocument()
+  })
+
   it('shows the Operator versions in a tooltip and starts an update', async () => {
     mockUseClusterOperatorStatus.mockReturnValue({ data: operatorStatus, isLoading: false })
     const { userEvent } = renderWithProviders(
diff --git a/libs/domains/clusters/feature/src/lib/cluster-profile/profile-operator-footer.tsx b/libs/domains/clusters/feature/src/lib/cluster-profile/profile-operator-footer.tsx
index d041cf59940..162176c8cc8 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-profile/profile-operator-footer.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-profile/profile-operator-footer.tsx
@@ -8,32 +8,46 @@ import { useClusterOperatorStatus } from '../hooks/use-cluster-operator-status/u
 const OPERATOR_STATUS_REFRESH_INTERVAL = 30_000
 
 export function ProfileOperatorFooter({ organizationId, clusterId }: { organizationId: string; clusterId: string }) {
-  const { data: operatorStatus, isLoading } = useClusterOperatorStatus({
+  const {
+    data: operatorStatus,
+    isLoading,
+    isError,
+  } = useClusterOperatorStatus({
     organizationId,
     clusterId,
     refetchInterval: OPERATOR_STATUS_REFRESH_INTERVAL,
   })
 
   // Clusters without Operator state (q-core answers 404) have no Operator to describe.
-  if (!isLoading && !operatorStatus) return null
+  if (!isLoading && !isError && !operatorStatus) return null
 
-  const display = operatorStatus ? getClusterOperatorStatusDisplay(operatorStatus.status) : undefined
+  const display = operatorStatus && !isError ? getClusterOperatorStatusDisplay(operatorStatus.status) : undefined
 
   const trigger = (
     <button
       type="button"
-      aria-label={`Qovery operator: ${display?.label ?? 'loading'}`}
+      aria-label={`Qovery operator: ${display?.label ?? (isError ? 'status unavailable' : 'loading')}`}
       className="focus-visible:ring-brand flex w-full shrink-0 items-center gap-2 bg-background-secondary p-3 text-left text-sm font-medium text-neutral outline-none focus-visible:ring-2 focus-visible:ring-inset"
     >
       Qovery operator
       {display ? (
         <Icon iconName={display.icon.name} iconStyle="regular" className={`text-sm ${display.icon.className}`} />
+      ) : isError ? (
+        <Icon iconName="circle-exclamation" iconStyle="regular" className="text-sm text-warning" />
       ) : (
         <LoaderSpinner className="w-3" />
       )}
     </button>
   )
 
+  if (isError) {
+    return (
+      <Tooltip side="right" content="The Operator status could not be retrieved.">
+        {trigger}
+      </Tooltip>
+    )
+  }
+
   return operatorStatus ? (
     <Tooltip
       side="right"
diff --git a/libs/domains/clusters/feature/src/lib/hooks/use-cluster-operator-status/use-cluster-operator-status.spec.ts b/libs/domains/clusters/feature/src/lib/hooks/use-cluster-operator-status/use-cluster-operator-status.spec.ts
new file mode 100644
index 00000000000..5f60195ced8
--- /dev/null
+++ b/libs/domains/clusters/feature/src/lib/hooks/use-cluster-operator-status/use-cluster-operator-status.spec.ts
@@ -0,0 +1,29 @@
+import { useQuery } from '@tanstack/react-query'
+import { renderHook } from '@qovery/shared/util-tests'
+import { useClusterOperatorStatus } from './use-cluster-operator-status'
+
+jest.mock('@tanstack/react-query', () => ({
+  ...jest.requireActual('@tanstack/react-query'),
+  useQuery: jest.fn(),
+}))
+
+const mockUseQuery = useQuery as jest.Mock
+
+describe('useClusterOperatorStatus', () => {
+  it('stops polling once the cluster is known to have no Operator', () => {
+    renderHook(() =>
+      useClusterOperatorStatus({ organizationId: 'org-123', clusterId: 'cluster-123', refetchInterval: 30_000 })
+    )
+
+    const { refetchInterval } = mockUseQuery.mock.calls[0][0]
+    expect(refetchInterval({ status: 'CURRENT' })).toBe(30_000)
+    expect(refetchInterval(undefined)).toBe(30_000)
+    expect(refetchInterval(null)).toBe(false)
+  })
+
+  it('does not poll without interval', () => {
+    renderHook(() => useClusterOperatorStatus({ organizationId: 'org-123', clusterId: 'cluster-123' }))
+
+    expect(mockUseQuery.mock.calls.at(-1)[0].refetchInterval).toBeUndefined()
+  })
+})
diff --git a/libs/domains/clusters/feature/src/lib/hooks/use-cluster-operator-status/use-cluster-operator-status.ts b/libs/domains/clusters/feature/src/lib/hooks/use-cluster-operator-status/use-cluster-operator-status.ts
index 49576d0a06a..3033e90b260 100644
--- a/libs/domains/clusters/feature/src/lib/hooks/use-cluster-operator-status/use-cluster-operator-status.ts
+++ b/libs/domains/clusters/feature/src/lib/hooks/use-cluster-operator-status/use-cluster-operator-status.ts
@@ -20,7 +20,7 @@ export function useClusterOperatorStatus({
   return useQuery({
     ...queries.clusters.operatorStatus({ organizationId, clusterId }),
     enabled: enabled && Boolean(organizationId) && Boolean(clusterId),
-    refetchInterval,
+    refetchInterval: refetchInterval ? (data) => (data === null ? false : refetchInterval) : undefined,
     staleTime,
   })
 }
diff --git a/libs/domains/clusters/feature/src/lib/self-managed-cluster-creation/self-managed-cluster-creation-flow.spec.tsx b/libs/domains/clusters/feature/src/lib/self-managed-cluster-creation/self-managed-cluster-creation-flow.spec.tsx
index 76bfcfdf58c..e61cefba221 100644
--- a/libs/domains/clusters/feature/src/lib/self-managed-cluster-creation/self-managed-cluster-creation-flow.spec.tsx
+++ b/libs/domains/clusters/feature/src/lib/self-managed-cluster-creation/self-managed-cluster-creation-flow.spec.tsx
@@ -116,7 +116,17 @@ describe('SelfManagedClusterCreationFlow', () => {
       isError: false,
       refetch: jest.fn(),
     })
-    mockUsePlatformTemplateComponentConfiguration.mockReturnValue({ data: undefined })
+    mockUsePlatformTemplateComponentConfiguration.mockReturnValue({
+      data: {
+        componentKey: 'qovery-operator',
+        fields: operatorComponent.fields,
+        requirements: [],
+        componentBindings: [],
+        violations: [],
+      },
+      isFetching: false,
+      isError: false,
+    })
     mockCreateSelfManagedCluster.mockResolvedValue({ id: 'cluster-id' })
     mockUseCreateSelfManagedCluster.mockReturnValue({ mutateAsync: mockCreateSelfManagedCluster, isLoading: false })
     mockUseClusterOperatorStatus.mockReturnValue({ data: { operator_connected: false } })
@@ -197,6 +207,41 @@ describe('SelfManagedClusterCreationFlow', () => {
     )
   })
 
+  it.each([
+    ['has not been checked yet', { data: undefined, isFetching: true, isError: false }],
+    ['is being checked again', { data: { componentKey: 'qovery-operator', violations: [] }, isFetching: true }],
+    ['could not be checked', { data: undefined, isFetching: false, isError: true }],
+    [
+      'is waiting for the network',
+      { data: { componentKey: 'qovery-operator', violations: [], requirements: [] }, isPaused: true },
+    ],
+    [
+      'only has the result of previous values',
+      { data: { componentKey: 'qovery-operator', violations: [], requirements: [] }, isPreviousData: true },
+    ],
+    [
+      'misses a required input',
+      {
+        data: {
+          componentKey: 'qovery-operator',
+          violations: [],
+          requirements: [{ key: 'clusterName', source: 'CLUSTER_INPUT', status: 'MISSING' }],
+        },
+        isFetching: false,
+        isError: false,
+      },
+    ],
+  ])('cannot continue while the Operator configuration %s', async (_, preview) => {
+    mockUsePlatformTemplateComponentConfiguration.mockReturnValue(preview)
+    const { userEvent } = renderWithProviders(
+      <SelfManagedClusterCreationFlow organizationId="org-123" onClose={mockOnClose} />
+    )
+
+    await goToOperatorStep(userEvent)
+
+    expect(screen.getByRole('button', { name: 'Continue' })).toBeDisabled()
+  })
+
   it('creates the cluster with the Operator configuration', async () => {
     const { userEvent } = renderWithProviders(
       <SelfManagedClusterCreationFlow organizationId="org-123" onClose={mockOnClose} />
@@ -246,6 +291,11 @@ describe('SelfManagedClusterCreationFlow', () => {
       isError: false,
       refetch: jest.fn(),
     })
+    mockUsePlatformTemplateComponentConfiguration.mockReturnValue({
+      data: undefined,
+      isFetching: false,
+      isError: false,
+    })
     const { userEvent } = renderWithProviders(
       <SelfManagedClusterCreationFlow organizationId="org-123" onClose={mockOnClose} />
     )
@@ -278,6 +328,28 @@ describe('SelfManagedClusterCreationFlow', () => {
     expect(screen.getByRole('button', { name: 'Continue' })).toBeDisabled()
   })
 
+  it('lets a failed Operator configuration check be retried', async () => {
+    const refetchPreview = jest.fn()
+    mockUsePlatformTemplateComponentConfiguration.mockReturnValue({
+      data: undefined,
+      isFetching: false,
+      isError: true,
+      refetch: refetchPreview,
+    })
+    const { userEvent } = renderWithProviders(
+      <SelfManagedClusterCreationFlow organizationId="org-123" onClose={mockOnClose} />
+    )
+
+    await goToOperatorStep(userEvent)
+
+    expect(screen.getByText('The Operator configuration could not be checked.')).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'Continue' })).toBeDisabled()
+
+    await userEvent.click(screen.getByRole('button', { name: 'Try again' }))
+
+    expect(refetchPreview).toHaveBeenCalled()
+  })
+
   it('does not create the cluster when the platform templates cannot be loaded', async () => {
     const refetchTemplates = jest.fn()
     mockUsePlatformTemplates.mockReturnValue({
@@ -323,6 +395,7 @@ describe('SelfManagedClusterCreationFlow', () => {
     await goToOperatorStep(userEvent)
     await userEvent.click(screen.getByRole('button', { name: 'Continue' }))
 
+    expect(mockCreateSelfManagedCluster).toHaveBeenCalled()
     expect(screen.getByRole('heading', { name: 'Configure Qovery Operator' })).toBeInTheDocument()
   })
 
diff --git a/libs/domains/clusters/feature/src/lib/self-managed-cluster-creation/self-managed-cluster-creation-flow.tsx b/libs/domains/clusters/feature/src/lib/self-managed-cluster-creation/self-managed-cluster-creation-flow.tsx
index 85f5a8046ca..3388e12d8f9 100644
--- a/libs/domains/clusters/feature/src/lib/self-managed-cluster-creation/self-managed-cluster-creation-flow.tsx
+++ b/libs/domains/clusters/feature/src/lib/self-managed-cluster-creation/self-managed-cluster-creation-flow.tsx
@@ -1,5 +1,6 @@
 import { useNavigate } from '@tanstack/react-router'
 import download from 'downloadjs'
+import equal from 'fast-deep-equal'
 import {
   type ClusterRegion,
   type PlatformComponentConfigurationResolutionResponse,
@@ -32,6 +33,7 @@ import { usePlatformTemplateComponentConfiguration } from '../platform-configura
 import {
   applyPlatformConfigurationDefaults,
   getUnmappedViolations,
+  isPlatformConfigurationReady,
   isSupportedPlatformField,
   omitEmptyValues,
 } from '../platform-configuration/platform-configuration-utils'
@@ -213,7 +215,9 @@ function OperatorStep({
   isCreating,
   canContinue,
   isTemplatesError,
+  isPreviewError,
   onRetryTemplates,
+  onRetryPreview,
   onChange,
   onBack,
   onCancel,
@@ -225,7 +229,9 @@ function OperatorStep({
   isCreating: boolean
   canContinue: boolean
   isTemplatesError: boolean
+  isPreviewError: boolean
   onRetryTemplates: () => void
+  onRetryPreview: () => void
   onChange: (values: OperatorValues) => void
   onBack: () => void
   onCancel: () => void
@@ -234,6 +240,11 @@ function OperatorStep({
   const fields = getOperatorFields(component, preview)
   const violations = preview?.violations ?? []
   const unmappedViolations = getUnmappedViolations(violations, fields, values, preview?.requirements ?? [])
+  const loadingError = isTemplatesError
+    ? { message: 'The Operator configuration could not be loaded.', onRetry: onRetryTemplates }
+    : isPreviewError
+      ? { message: 'The Operator configuration could not be checked.', onRetry: onRetryPreview }
+      : undefined
 
   return (
     <form
@@ -270,20 +281,20 @@ function OperatorStep({
           </>
         }
       >
-        {isTemplatesError ? (
+        {loadingError ? (
           <Callout.Root color="red" className="mx-5">
             <Callout.Icon>
               <Icon iconName="circle-exclamation" iconStyle="regular" />
             </Callout.Icon>
             <Callout.Text>
-              <Callout.TextDescription>The Operator configuration could not be loaded.</Callout.TextDescription>
+              <Callout.TextDescription>{loadingError.message}</Callout.TextDescription>
               <Button
                 type="button"
                 variant="outline"
                 color="neutral"
                 size="sm"
                 className="mt-2"
-                onClick={onRetryTemplates}
+                onClick={loadingError.onRetry}
               >
                 Try again
               </Button>
@@ -472,7 +483,14 @@ export function SelfManagedClusterCreationFlow({
   const operatorConfig = useMemo(() => omitEmptyValues(resolvedOperatorValues), [resolvedOperatorValues])
   const { mutateAsync: createSelfManagedCluster, isLoading: isCreating } = useCreateSelfManagedCluster()
   const debouncedOperatorConfig = useDebounce(operatorConfig, 300)
-  const { data: operatorPreview } = usePlatformTemplateComponentConfiguration({
+  const {
+    data: operatorPreview,
+    isFetching: isOperatorPreviewFetching,
+    isPaused: isOperatorPreviewPaused,
+    isPreviousData: isOperatorPreviewOutdated,
+    isError: isOperatorPreviewError,
+    refetch: refetchOperatorPreview,
+  } = usePlatformTemplateComponentConfiguration({
     organizationId,
     templateKey: template?.key,
     templateVersion: template?.version,
@@ -482,7 +500,15 @@ export function SelfManagedClusterCreationFlow({
     request: { profileConfig: debouncedOperatorConfig, clusterInputs: {}, componentOutputs: {} },
     enabled: step === 'operator',
   })
-  const hasOperatorViolations = Boolean(operatorPreview?.violations.length)
+  const isOperatorConfigurationValid =
+    !operatorComponent ||
+    (equal(debouncedOperatorConfig, operatorConfig) &&
+      !isOperatorPreviewFetching &&
+      !isOperatorPreviewPaused &&
+      !isOperatorPreviewOutdated &&
+      !isOperatorPreviewError &&
+      operatorPreview?.componentKey === operatorComponent.key &&
+      isPlatformConfigurationReady(operatorPreview.violations, operatorPreview.requirements))
 
   const goToStep = (nextStep: SelfManagedClusterCreationStep) => {
     setStep(nextStep)
@@ -541,9 +567,11 @@ export function SelfManagedClusterCreationFlow({
         values={resolvedOperatorValues}
         isCreating={isCreating}
         // An empty template list lets q-core pick the default; a failed request must not create the cluster blindly.
-        canContinue={isTemplatesSuccess && !hasOperatorViolations}
+        canContinue={isTemplatesSuccess && isOperatorConfigurationValid}
         isTemplatesError={isTemplatesError}
+        isPreviewError={isOperatorPreviewError}
         onRetryTemplates={() => refetchTemplates()}
+        onRetryPreview={() => refetchOperatorPreview()}
         onChange={setOperatorValues}
         onBack={() => goToStep('general')}
         onCancel={onClose}
diff --git a/libs/shared/console-shared/src/lib/catalog-variable-input/catalog-variable-input.spec.tsx b/libs/shared/console-shared/src/lib/catalog-variable-input/catalog-variable-input.spec.tsx
index c8569f7dfef..909f569a29b 100644
--- a/libs/shared/console-shared/src/lib/catalog-variable-input/catalog-variable-input.spec.tsx
+++ b/libs/shared/console-shared/src/lib/catalog-variable-input/catalog-variable-input.spec.tsx
@@ -21,7 +21,7 @@ describe('CatalogVariableInput', () => {
     jest.useRealTimers()
   })
 
-  it('renders a number field with its description and validation error', () => {
+  it('renders a number field with its validation error in place of the description', () => {
     renderWithProviders(<CatalogVariableInput {...defaultProps} error="Retention is invalid." />)
 
     expect(screen.getByRole('spinbutton', { name: 'Retention' })).toHaveValue(12)
@@ -59,6 +59,31 @@ describe('CatalogVariableInput', () => {
     expect(await screen.findByRole('tooltip')).toHaveTextContent(description)
   })
 
+  it('shows the whole row description while searching', () => {
+    renderWithProviders(<CatalogVariableInput {...defaultProps} layout="row" highlight="weeks" />)
+
+    const match = screen.getByText('weeks', { selector: 'mark' })
+    expect(match.closest('p')).not.toHaveClass('line-clamp-3')
+  })
+
+  it('names the row checkbox after its field', async () => {
+    const onChange = jest.fn()
+    const { userEvent } = renderWithProviders(
+      <CatalogVariableInput
+        {...defaultProps}
+        booleanControl="checkbox"
+        field={{ key: 'enabled', label: 'Enabled', type: 'bool' }}
+        layout="row"
+        value={false}
+        onChange={onChange}
+      />
+    )
+
+    await userEvent.click(screen.getByRole('checkbox', { name: 'Enabled' }))
+
+    expect(onChange).toHaveBeenCalledWith(true)
+  })
+
   it('keeps a boolean control aligned to the right when showing an error', () => {
     const error = 'Loki high availability requires object storage.'
 
diff --git a/libs/shared/console-shared/src/lib/catalog-variable-input/catalog-variable-input.tsx b/libs/shared/console-shared/src/lib/catalog-variable-input/catalog-variable-input.tsx
index f0c420dc65b..a82715b565c 100644
--- a/libs/shared/console-shared/src/lib/catalog-variable-input/catalog-variable-input.tsx
+++ b/libs/shared/console-shared/src/lib/catalog-variable-input/catalog-variable-input.tsx
@@ -29,7 +29,7 @@ export function CatalogVariableDescription({ description, highlight }: { descrip
   const formattedDescription = formatDescription(description)
 
   return (
-    <p className="line-clamp-3 whitespace-pre-line text-sm text-neutral-subtle">
+    <p className={`${highlight?.trim() ? '' : 'line-clamp-3 '}whitespace-pre-line text-sm text-neutral-subtle`}>
       {highlight?.trim() ? (
         // Truncating could hide the match, so the full description is shown while searching.
         <HighlightText text={formattedDescription} highlight={highlight} />
@@ -59,6 +59,7 @@ function CatalogVariableControl({
         <Checkbox
           name={field.key}
           id={field.key}
+          aria-label={field.label}
           autoFocus={autoFocus}
           checked={typeof value === 'boolean' ? value : false}
           onCheckedChange={(checked) => {
diff --git a/libs/shared/ui/src/lib/components/highlight-text/highlight-text.tsx b/libs/shared/ui/src/lib/components/highlight-text/highlight-text.tsx
index 5277dfc123d..1212cebf9a5 100644
--- a/libs/shared/ui/src/lib/components/highlight-text/highlight-text.tsx
+++ b/libs/shared/ui/src/lib/components/highlight-text/highlight-text.tsx
@@ -14,7 +14,7 @@ export function HighlightText({ text, highlight }: HighlightTextProps) {
     <>
       {parts.map((part, index) =>
         index % 2 === 1 ? (
-          <mark key={index} className="rounded-sm bg-surface-warning-strong text-neutral">
+          <mark key={index} className="rounded-sm bg-surface-warning-highlight text-neutral">
             {part}
           </mark>
         ) : (
diff --git a/libs/shared/ui/src/lib/components/inputs/input-search/input-search.spec.tsx b/libs/shared/ui/src/lib/components/inputs/input-search/input-search.spec.tsx
index 5c97a0eab58..7842511ca8c 100644
--- a/libs/shared/ui/src/lib/components/inputs/input-search/input-search.spec.tsx
+++ b/libs/shared/ui/src/lib/components/inputs/input-search/input-search.spec.tsx
@@ -18,4 +18,35 @@ describe('InputSearch', () => {
 
     expect(input as HTMLInputElement).toHaveValue('some new text value')
   })
+
+  it('follows default value changes', () => {
+    const { rerender } = render(<InputSearch defaultValue="loki" />)
+
+    rerender(<InputSearch defaultValue="envoy" />)
+    expect(screen.getByRole('textbox')).toHaveValue('envoy')
+
+    rerender(<InputSearch />)
+    expect(screen.getByRole('textbox')).toHaveValue('')
+    expect(screen.queryByRole('button', { name: 'Clear search' })).not.toBeInTheDocument()
+  })
+
+  it('shows the clear button when an empty search receives a default value', () => {
+    const { rerender } = render(<InputSearch defaultValue="" />)
+
+    rerender(<InputSearch defaultValue="loki" />)
+
+    expect(screen.getByRole('textbox')).toHaveValue('loki')
+    expect(screen.getByRole('button', { name: 'Clear search' })).toBeInTheDocument()
+  })
+
+  it('keeps the typed value while focused', () => {
+    const { rerender } = render(<InputSearch defaultValue="lo" />)
+    const input = screen.getByRole('textbox')
+
+    input.focus()
+    fireEvent.change(input, { target: { value: 'loki' } })
+    rerender(<InputSearch defaultValue="lok" />)
+
+    expect(input).toHaveValue('loki')
+  })
 })
diff --git a/libs/shared/ui/src/lib/components/inputs/input-search/input-search.tsx b/libs/shared/ui/src/lib/components/inputs/input-search/input-search.tsx
index 22e7faaaa67..34193145a09 100644
--- a/libs/shared/ui/src/lib/components/inputs/input-search/input-search.tsx
+++ b/libs/shared/ui/src/lib/components/inputs/input-search/input-search.tsx
@@ -1,4 +1,4 @@
-import { type ReactElement, useRef, useState } from 'react'
+import { type ReactElement, useEffect, useRef, useState } from 'react'
 import { twMerge } from '@qovery/shared/util-js'
 import Icon from '../../icon/icon'
 
@@ -30,6 +30,14 @@ export function InputSearch(props: InputSearchProps) {
   const ref = useRef<HTMLInputElement>(null)
   const [toggleDelete, setToggleDelete] = useState(Boolean(defaultValue))
 
+  useEffect(() => {
+    const input = ref.current
+    if (!input || document.activeElement === input) return
+    const nextValue = defaultValue ?? ''
+    if (input.value !== nextValue) input.value = nextValue
+    setToggleDelete(nextValue !== '')
+  }, [defaultValue])
+
   const getValue = (value: string) => {
     if (onChange) onChange(value)
     if (value !== '') {
diff --git a/libs/shared/ui/src/lib/components/inputs/input-select-small/input-select-small.spec.tsx b/libs/shared/ui/src/lib/components/inputs/input-select-small/input-select-small.spec.tsx
index 42780a2961c..7984ed90863 100644
--- a/libs/shared/ui/src/lib/components/inputs/input-select-small/input-select-small.spec.tsx
+++ b/libs/shared/ui/src/lib/components/inputs/input-select-small/input-select-small.spec.tsx
@@ -1,4 +1,4 @@
-import { render } from '__tests__/utils/setup-jest'
+import { render, screen } from '__tests__/utils/setup-jest'
 import InputSelectSmall, { type InputSelectSmallProps } from './input-select-small'
 
 describe('InputSelectSmall', () => {
@@ -15,4 +15,24 @@ describe('InputSelectSmall', () => {
     const { baseElement } = render(<InputSelectSmall {...props} />)
     expect(baseElement).toBeTruthy()
   })
+
+  it('names the select after its visible label', () => {
+    render(<InputSelectSmall {...props} name="storage" label="Storage" items={[{ label: 'PVC', value: 'pvc' }]} />)
+
+    expect(screen.getByRole('combobox', { name: 'Storage' })).toBeInTheDocument()
+  })
+
+  it('prefers an explicit accessible name', () => {
+    render(
+      <InputSelectSmall
+        {...props}
+        name="storage"
+        label="Storage"
+        ariaLabel="Loki storage"
+        items={[{ label: 'PVC', value: 'pvc' }]}
+      />
+    )
+
+    expect(screen.getByRole('combobox', { name: 'Loki storage' })).toBeInTheDocument()
+  })
 })
diff --git a/libs/shared/ui/src/lib/components/inputs/input-select-small/input-select-small.tsx b/libs/shared/ui/src/lib/components/inputs/input-select-small/input-select-small.tsx
index b081731255f..7c60cab0551 100644
--- a/libs/shared/ui/src/lib/components/inputs/input-select-small/input-select-small.tsx
+++ b/libs/shared/ui/src/lib/components/inputs/input-select-small/input-select-small.tsx
@@ -56,7 +56,7 @@ export function InputSelectSmall(props: InputSelectSmallProps) {
       <select
         data-testid={dataTestId || 'input-select-small'}
         name={name}
-        aria-label={ariaLabel}
+        aria-label={ariaLabel ?? label}
         value={value}
         disabled={disabled}
         className={twMerge(
diff --git a/libs/shared/ui/src/lib/components/inputs/input-text-small/input-text-small.spec.tsx b/libs/shared/ui/src/lib/components/inputs/input-text-small/input-text-small.spec.tsx
index 8c0139d4362..dea23e2fafe 100644
--- a/libs/shared/ui/src/lib/components/inputs/input-text-small/input-text-small.spec.tsx
+++ b/libs/shared/ui/src/lib/components/inputs/input-text-small/input-text-small.spec.tsx
@@ -102,4 +102,16 @@ describe('InputTextSmall', () => {
     await userEvent.click(button)
     expect(input).toHaveAttribute('type', 'password')
   })
+
+  it('labels the input with its explicit id', () => {
+    renderWithProviders(<InputTextSmall {...props} id="retention" label="Retention" />)
+
+    expect(screen.getByLabelText('Retention')).toHaveAttribute('id', 'retention')
+  })
+
+  it('falls back to the label as input id', () => {
+    renderWithProviders(<InputTextSmall {...props} label="Retention" />)
+
+    expect(screen.getByLabelText('Retention')).toHaveAttribute('id', 'Retention')
+  })
 })
diff --git a/libs/shared/util-js/src/lib/catalog-variable-field.spec.ts b/libs/shared/util-js/src/lib/catalog-variable-field.spec.ts
index d56f730cfe9..0aa1b6afb68 100644
--- a/libs/shared/util-js/src/lib/catalog-variable-field.spec.ts
+++ b/libs/shared/util-js/src/lib/catalog-variable-field.spec.ts
@@ -90,6 +90,15 @@ describe('catalog field validation', () => {
     expect(getCatalogFieldValidationError({ type: 'string', pattern: '^[a-z]+$' }, 'value')).toBeUndefined()
   })
 
+  it('rejects values outside the allowed values', () => {
+    const field = { type: 'string' as const, allowedValues: ['pvc', 's3'] }
+
+    expect(getCatalogFieldValidationError(field, 'gcs')).toBe('Please select one of the allowed values.')
+    expect(getCatalogFieldValidationError(field, 's3')).toBeUndefined()
+    expect(getCatalogFieldValidationError(field, '')).toBeUndefined()
+    expect(getCatalogFieldValidationError({ type: 'bool', allowedValues: ['true'] }, false)).toBeUndefined()
+  })
+
   it('validates required state and constraints together', () => {
     expect(isCatalogFieldValid({ type: 'string', required: true }, undefined)).toBe(false)
     expect(isCatalogFieldValid({ type: 'string', required: true }, 'value')).toBe(true)
diff --git a/libs/shared/util-js/src/lib/catalog-variable-field.ts b/libs/shared/util-js/src/lib/catalog-variable-field.ts
index 1e5605071b1..4abb1c27735 100644
--- a/libs/shared/util-js/src/lib/catalog-variable-field.ts
+++ b/libs/shared/util-js/src/lib/catalog-variable-field.ts
@@ -108,9 +108,19 @@ export function getCatalogFieldNumberValidationError(
 }
 
 export function getCatalogFieldValidationError(
-  field: Pick<CatalogVariableField, 'type' | 'pattern' | 'minLength' | 'maxLength' | 'min' | 'max'>,
+  field: Pick<CatalogVariableField, 'type' | 'allowedValues' | 'pattern' | 'minLength' | 'maxLength' | 'min' | 'max'>,
   value: CatalogVariableValue | undefined
 ) {
+  if (
+    field.type !== 'bool' &&
+    field.allowedValues?.length &&
+    typeof value === 'string' &&
+    value !== '' &&
+    !field.allowedValues.includes(value)
+  ) {
+    return 'Please select one of the allowed values.'
+  }
+
   const numberValidationError = getCatalogFieldNumberValidationError(field, value)
   if (numberValidationError) return numberValidationError
 
@@ -122,7 +132,10 @@ export function getCatalogFieldValidationError(
 }
 
 export function isCatalogFieldValid(
-  field: Pick<CatalogVariableField, 'required' | 'type' | 'pattern' | 'minLength' | 'maxLength' | 'min' | 'max'>,
+  field: Pick<
+    CatalogVariableField,
+    'required' | 'type' | 'allowedValues' | 'pattern' | 'minLength' | 'maxLength' | 'min' | 'max'
+  >,
   value: CatalogVariableValue | undefined
 ) {
   if (field.required && !isCatalogFieldValueFulfilled(value)) return false
diff --git a/tailwind-workspace-preset.js b/tailwind-workspace-preset.js
index 668fe8f188f..0e173929d37 100644
--- a/tailwind-workspace-preset.js
+++ b/tailwind-workspace-preset.js
@@ -293,7 +293,7 @@ module.exports = {
           warning: {
             solid: 'var(--warning-9)',
             solidHover: 'var(--warning-10)',
-            strong: 'var(--warning-5)',
+            highlight: 'var(--warning-5)',
             component: 'var(--warning-3)',
             subtle: 'var(--warning-2)',
           },