diff --git a/apps/app-frontend/src/main.tsx b/apps/app-frontend/src/main.tsx
index 0ac147f7..ea8b5549 100644
--- a/apps/app-frontend/src/main.tsx
+++ b/apps/app-frontend/src/main.tsx
@@ -1,5 +1,12 @@
 import React from 'react';
-import { BrowserRouter } from 'react-router-dom';
+import { RouterProvider, createBrowserRouter } from 'react-router-dom';
+import { createRegistry } from '@bufbuild/protobuf';
+import {
+  file_google_protobuf_duration,
+  file_google_protobuf_struct,
+  file_google_protobuf_timestamp,
+  file_google_protobuf_wrappers,
+} from '@bufbuild/protobuf/wkt';
 import { createConnectTransport } from '@connectrpc/connect-web';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { createRoot } from 'react-dom/client';
@@ -12,6 +19,14 @@ import './i18n';
 const connectTransport = createConnectTransport({
   baseUrl: '/api/fulfillment',
   interceptors: [connectErrorInterceptor],
+  jsonOptions: {
+    registry: createRegistry(
+      file_google_protobuf_wrappers,
+      file_google_protobuf_struct,
+      file_google_protobuf_timestamp,
+      file_google_protobuf_duration,
+    ),
+  },
 });
 
 // CSS load order is intentional: base → addons → local overrides
@@ -34,6 +49,8 @@ const queryClient = new QueryClient({
   },
 });
 
+const router = createBrowserRouter([{ path: '*', element: <App /> }]);
+
 const rootElement = document.getElementById('root');
 
 if (rootElement) {
@@ -41,9 +58,7 @@ if (rootElement) {
     <React.StrictMode>
       <ApiProvider transport={connectTransport}>
         <QueryClientProvider client={queryClient}>
-          <BrowserRouter>
-            <App />
-          </BrowserRouter>
+          <RouterProvider router={router} />
         </QueryClientProvider>
       </ApiProvider>
     </React.StrictMode>,
diff --git a/apps/app-frontend/src/shell/AppShell.tsx b/apps/app-frontend/src/shell/AppShell.tsx
index 980405d5..3d523104 100644
--- a/apps/app-frontend/src/shell/AppShell.tsx
+++ b/apps/app-frontend/src/shell/AppShell.tsx
@@ -3,6 +3,7 @@ import { Navigate, Route, Routes, useLocation } from 'react-router-dom';
 import { Page } from '@patternfly/react-core';
 
 import ErrorBoundary from '@osac/ui-components/components/ErrorBoundary/ErrorBoundary';
+import ComputeInstanceProvisionWizard from '@osac/ui-components/components/vm/CreateWizard/ComputeInstanceProvisionWizard';
 import { VmDetailsPage } from '@osac/ui-components/components/vm/VmDetailsPage';
 import { useSession } from '@osac/ui-components/hooks/use-session';
 import { SecurityGroupDetailPage } from '@osac/ui-components/pages/networking/SecurityGroupDetailPage';
@@ -12,7 +13,6 @@ import { VirtualNetworksListPage } from '@osac/ui-components/pages/networking/Vi
 import { BareMetalRoutes } from '@osac/ui-components/pages/tenant/BareMetalRoutes';
 import CatalogPage from '@osac/ui-components/pages/tenant/CatalogPage';
 import { ClusterRoutes } from '@osac/ui-components/pages/tenant/ClusterRoutes';
-import { VmCreatePage } from '@osac/ui-components/pages/tenant/VmCreatePage';
 import { VmListPage } from '@osac/ui-components/pages/tenant/VmListPage';
 
 import { AdminCatalogRoutes } from './AdminCatalogRoutes';
@@ -50,7 +50,7 @@ export const AppShell = ({ logout }: { logout: () => Promise<void> }) => {
           path="/vms/create/:catalogItemId?"
           element={
             <ShellRoute>
-              <VmCreatePage />
+              <ComputeInstanceProvisionWizard />
             </ShellRoute>
           }
         />
diff --git a/libs/i18n/locales/en/translation.json b/libs/i18n/locales/en/translation.json
index 8ed870df..356c0ec4 100644
--- a/libs/i18n/locales/en/translation.json
+++ b/libs/i18n/locales/en/translation.json
@@ -1,87 +1,37 @@
 {
+  " (deprecated)": " (deprecated)",
+  "{{name}} size": "{{name}} size",
   "Actions": "Actions",
   "Actions for {{name}}": "Actions for {{name}}",
   "Add": "Add",
-  "Add node set": "Add node set",
   "Add rule": "Add rule",
   "Administration": "Administration",
   "All": "All",
+  "Always": "Always",
   "API URL": "API URL",
+  "Are you sure you want to cancel? Your selections and entered data will be lost.": "Are you sure you want to cancel? Your selections and entered data will be lost.",
   "At least one CIDR (IPv4 or IPv6) is required": "At least one CIDR (IPv4 or IPv6) is required",
-  "At least one node set is required": "At least one node set is required",
+  "At least one security group is required": "At least one security group is required",
   "Attach": "Attach",
   "Attach public IP": "Attach public IP",
+  "Back": "Back",
   "Bare Metal": "Bare Metal",
   "bare metal instance": "bare metal instance",
   "Bare metal instance conditions": "Bare metal instance conditions",
   "Bare metal instances": "Bare metal instances",
   "Bare Metal Machines": "Bare Metal Machines",
   "Bare metal provisioning wizard": "Bare metal provisioning wizard",
+  "Boot disk size": "Boot disk size",
+  "Boot disk size (GiB)": "Boot disk size (GiB)",
+  "Boot disk size is required": "Boot disk size is required",
+  "Boot disk size must be greater than zero": "Boot disk size must be greater than zero",
   "Browse catalog items and launch virtual machines, clusters, or bare metal machines from published offerings.": "Browse catalog items and launch virtual machines, clusters, or bare metal machines from published offerings.",
   "Cancel": "Cancel",
   "Catalog": "Catalog",
-  "Catalog configuration is unavailable for this virtual machine.": "Catalog configuration is unavailable for this virtual machine.",
   "Catalog item": "Catalog item",
+  "Catalog item is required": "Catalog item is required",
   "Catalog management": "Catalog management",
   "Catalog management resource type tabs": "Catalog management resource type tabs",
-  "catalogProvision.actions.back": "Back",
-  "catalogProvision.actions.cancel": "Cancel",
-  "catalogProvision.actions.create": "Create",
-  "catalogProvision.actions.next": "Next",
-  "catalogProvision.actions.retry": "Retry",
-  "catalogProvision.cancel.body": "Are you sure you want to cancel? Your selections and entered data will be lost.",
-  "catalogProvision.cancel.discard": "Discard and close",
-  "catalogProvision.cancel.keepEditing": "Keep editing",
-  "catalogProvision.cancel.title": "Discard wizard progress?",
-  "catalogProvision.catalog.count_one": "1 catalog item available",
-  "catalogProvision.catalog.count_other": "{{count}} catalog items available",
-  "catalogProvision.catalog.empty": "No catalog items match your search. Try changing keywords.",
-  "catalogProvision.catalog.loadError": "Could not load catalog items",
-  "catalogProvision.catalog.loadErrorDetail": "Unable to load catalog items right now. Please try again.",
-  "catalogProvision.catalog.loading": "Loading catalog items…",
-  "catalogProvision.catalog.searchAria": "Search catalog items",
-  "catalogProvision.catalog.searchPlaceholder": "Search catalog items…",
-  "catalogProvision.common.loading": "Loading...",
-  "catalogProvision.errors.provisionFailed": "Provisioning failed. Please try again.",
-  "catalogProvision.errors.provisionTitle": "Could not create resource",
-  "catalogProvision.instanceTypes.deprecatedSuffix": " (deprecated)",
-  "catalogProvision.instanceTypes.loadError": "Could not load instance types",
-  "catalogProvision.networking.loadError": "Could not load networking options",
-  "catalogProvision.review.catalogItem": "Catalog item",
-  "catalogProvision.steps.catalog.title": "Catalog item",
-  "catalogProvision.steps.configuration.title": "Configuration",
-  "catalogProvision.steps.general.title": "General",
-  "catalogProvision.steps.networking.title": "Networking",
-  "catalogProvision.steps.review.title": "Review",
-  "catalogProvision.validation.bootDiskNumber": "Boot disk size must be a number",
-  "catalogProvision.validation.catalogItemRequired": "Select a catalog item",
-  "catalogProvision.validation.imageRequired": "VM image is required",
-  "catalogProvision.validation.instanceTypeRequired": "Instance type is required",
-  "catalogProvision.validation.nameRequired": "Name is required",
-  "catalogProvision.validation.required": "This field is required",
-  "catalogProvision.validation.securityGroupRequired": "Security group is required",
-  "catalogProvision.validation.stepInvalid": "Fix the highlighted errors before continuing.",
-  "catalogProvision.validation.subnetRequired": "Subnet is required",
-  "catalogProvision.validation.virtualNetworkRequired": "Virtual network is required",
-  "catalogProvision.vm.breadcrumbCreate": "Create",
-  "catalogProvision.vm.fields.bootDisk": "Boot disk",
-  "catalogProvision.vm.fields.bootDiskDescription": "Size in GiB",
-  "catalogProvision.vm.fields.image": "VM image",
-  "catalogProvision.vm.fields.imageDescription": "OCI reference",
-  "catalogProvision.vm.fields.instanceType": "Instance type",
-  "catalogProvision.vm.fields.name": "Name",
-  "catalogProvision.vm.fields.securityGroup": "Security groups",
-  "catalogProvision.vm.fields.sshKey": "SSH public key",
-  "catalogProvision.vm.fields.subnet": "Subnet",
-  "catalogProvision.vm.fields.userData": "User Data",
-  "catalogProvision.vm.fields.virtualNetwork": "Virtual network",
-  "catalogProvision.vm.placeholders.selectInstanceType": "Select an instance type",
-  "catalogProvision.vm.placeholders.selectSecurityGroup": "Select security groups",
-  "catalogProvision.vm.placeholders.selectSubnet": "Select a subnet",
-  "catalogProvision.vm.placeholders.selectVirtualNetwork": "Select a virtual network",
-  "catalogProvision.vm.wizardDescription": "Select a catalog item, configure, and provision.",
-  "catalogProvision.vm.wizardTitle": "Create virtual machine",
-  "catalogProvision.wizard.navAria": "{{title}} steps",
   "CIDR": "CIDR",
   "CIDR must be within parent virtual network range": "CIDR must be within parent virtual network range",
   "CIDR overlaps with existing subnet \"{{name}}\" ({{cidr}})": "CIDR overlaps with existing subnet \"{{name}}\" ({{cidr}})",
@@ -93,6 +43,7 @@
   "Cluster summary": "Cluster summary",
   "Clusters": "Clusters",
   "Collapse user data": "Collapse user data",
+  "Compute instance provisioning wizard": "Compute instance provisioning wizard",
   "Conditions": "Conditions",
   "Configuration": "Configuration",
   "Configuration defaults": "Configuration defaults",
@@ -106,14 +57,17 @@
   "Console URL": "Console URL",
   "Copied": "Copied",
   "Copy": "Copy",
-  "Could not load host types": "Could not load host types",
+  "Could not load catalog items": "Could not load catalog items",
   "Could not load instance types": "Could not load instance types",
+  "Could not load networking options": "Could not load networking options",
   "Create": "Create",
   "Create cluster": "Create cluster",
+  "Create cluster steps": "Create cluster steps",
   "Create cluster wizard": "Create cluster wizard",
   "Create security group": "Create security group",
   "Create subnet": "Create subnet",
   "Create virtual machine": "Create virtual machine",
+  "Create virtual machine steps": "Create virtual machine steps",
   "Create virtual network": "Create virtual network",
   "Created": "Created",
   "Creator": "Creator",
@@ -127,8 +81,9 @@
   "deprecated": "deprecated",
   "Destination CIDR": "Destination CIDR",
   "Details": "Details",
+  "Discard and close": "Discard and close",
+  "Discard wizard progress?": "Discard wizard progress?",
   "Download kubeconfig": "Download kubeconfig",
-  "Each host type can only be selected once": "Each host type can only be selected once",
   "Edit": "Edit",
   "Edit rule": "Edit rule",
   "Editable": "Editable",
@@ -148,6 +103,7 @@
   "Failed": "Failed",
   "Failed to attach public IP": "Failed to attach public IP",
   "Failed to connect to the console.": "Failed to connect to the console.",
+  "Failed to create resource": "Failed to create resource",
   "Failed to create subnet": "Failed to create subnet",
   "Failed to create virtual network": "Failed to create virtual network",
   "Failed to delete bare metal instance": "Failed to delete bare metal instance",
@@ -161,17 +117,19 @@
   "Filter by publication status": "Filter by publication status",
   "Filter catalog by keyword": "Filter catalog by keyword",
   "Filter catalog by resource type": "Filter catalog by resource type",
+  "Fix the highlighted errors before continuing.": "Fix the highlighted errors before continuing.",
   "Fixed": "Fixed",
   "Full screen": "Full screen",
   "General": "General",
   "Graphical console disconnected": "Graphical console disconnected",
   "Graphical console disconnected before it finished connecting": "Graphical console disconnected before it finished connecting",
   "Graphical console viewer could not start because the display area has no size": "Graphical console viewer could not start because the display area has no size",
+  "Halted": "Halted",
   "Host type": "Host type",
-  "Host type is required": "Host type is required",
   "ICMP": "ICMP",
   "Inbound Rules": "Inbound Rules",
   "Instance type": "Instance type",
+  "Instance type is required": "Instance type is required",
   "Internal IP": "Internal IP",
   "Invalid IPv4 CIDR format (e.g., 192.168.1.0/24)": "Invalid IPv4 CIDR format (e.g., 192.168.1.0/24)",
   "Invalid IPv4 CIDR notation": "Invalid IPv4 CIDR notation",
@@ -184,12 +142,16 @@
   "IPv6 CIDR": "IPv6 CIDR",
   "IPv6 CIDR (Optional)": "IPv6 CIDR (Optional)",
   "IPv6 CIDR is required": "IPv6 CIDR is required",
+  "Keep editing": "Keep editing",
+  "Loading catalog": "Loading catalog",
   "Loading cluster password": "Loading cluster password",
   "Loading security groups...": "Loading security groups...",
   "Loading subnets...": "Loading subnets...",
+  "Loading...": "Loading...",
   "Manage firewall rules for your virtual networks.": "Manage firewall rules for your virtual networks.",
   "Manage virtual networks for your compute instances.": "Manage virtual networks for your compute instances.",
   "Message": "Message",
+  "Must be a valid SSH public key (ssh-rsa, ssh-ed25519, ecdsa-sha2-*, or sk-* prefixed).": "Must be a valid SSH public key (ssh-rsa, ssh-ed25519, ecdsa-sha2-*, or sk-* prefixed).",
   "Name": "Name",
   "Name cannot end with a hyphen": "Name cannot end with a hyphen",
   "Name cannot start with a hyphen": "Name cannot start with a hyphen",
@@ -198,14 +160,15 @@
   "Name must be at most 63 characters long": "Name must be at most 63 characters long",
   "Name must only contain lowercase letters (a-z), digits (0-9), and hyphens (-)": "Name must only contain lowercase letters (a-z), digits (0-9), and hyphens (-)",
   "Networking": "Networking",
+  "Next": "Next",
   "No bare metal instances match your search.": "No bare metal instances match your search.",
   "No bare metal instances yet.": "No bare metal instances yet.",
   "No catalog items found": "No catalog items found",
   "No catalog items have been created yet.": "No catalog items have been created yet.",
   "No catalog items match your search or filter.": "No catalog items match your search or filter.",
   "No catalog items match your search.": "No catalog items match your search.",
+  "No catalog items match your search. Try changing keywords.": "No catalog items match your search. Try changing keywords.",
   "No inbound rules yet. Add one to allow incoming traffic.": "No inbound rules yet. Add one to allow incoming traffic.",
-  "No node sets added yet.": "No node sets added yet.",
   "No node sets configured.": "No node sets configured.",
   "No outbound rules yet. Add one to allow outgoing traffic.": "No outbound rules yet. Add one to allow outgoing traffic.",
   "No published catalog items are available yet.": "No published catalog items are available yet.",
@@ -215,10 +178,10 @@
   "No virtual networks configured.": "No virtual networks configured.",
   "No virtual networks match your search.": "No virtual networks match your search.",
   "No virtual networks yet. Create one to get started.": "No virtual networks yet. Create one to get started.",
-  "Node set {{number}}": "Node set {{number}}",
+  "Node set name is required": "Node set name is required",
   "Node sets": "Node sets",
   "Node Sets": "Node Sets",
-  "Nodes": "Nodes",
+  "OCI reference": "OCI reference",
   "Open catalog item details for {{title}}": "Open catalog item details for {{title}}",
   "Optional cloud-init user data (max 64 KB).": "Optional cloud-init user data (max 64 KB).",
   "Organization": "Organization",
@@ -245,30 +208,39 @@
   "Protocol is required": "Protocol is required",
   "Provision a bare metal instance from a catalog item.": "Provision a bare metal instance from a catalog item.",
   "Provision bare metal": "Provision bare metal",
+  "Provision bare metal steps": "Provision bare metal steps",
   "Provisioning": "Provisioning",
   "Provisioning failed": "Provisioning failed",
+  "Provisioning failed. Please try again.": "Provisioning failed. Please try again.",
   "Public IP": "Public IP",
-  "Public SSH key is required": "Public SSH key is required",
   "Published": "Published",
   "Pull secret": "Pull secret",
   "Pull secret is required": "Pull secret is required",
+  "Pull secret set": "Pull secret set",
   "Pull secrets download OpenShift components and connect clusters to your Red Hat account. Copy the full JSON from OpenShift Cluster Manager (console.redhat.com/openshift/install/pull-secret).": "Pull secrets download OpenShift components and connect clusters to your Red Hat account. Copy the full JSON from OpenShift Cluster Manager (console.redhat.com/openshift/install/pull-secret).",
   "Release image": "Release image",
   "Release image is required": "Release image is required",
-  "Remove node set": "Remove node set",
   "Restart": "Restart",
   "Retry": "Retry",
+  "Review": "Review",
+  "Run strategy": "Run strategy",
+  "Run strategy is required": "Run strategy is required",
   "Running": "Running",
   "Save": "Save",
   "Search by name": "Search by name",
   "Search catalog items": "Search catalog items",
+  "Search catalog items…": "Search catalog items…",
   "Search security groups by name…": "Search security groups by name…",
   "Search virtual networks by name…": "Search virtual networks by name…",
   "Security groups": "Security groups",
   "Select a catalog item": "Select a catalog item",
   "Select a catalog item, configure, and provision an OpenShift cluster.": "Select a catalog item, configure, and provision an OpenShift cluster.",
+  "Select a catalog item, configure, and provision.": "Select a catalog item, configure, and provision.",
+  "Select a run strategy": "Select a run strategy",
+  "Select a subnet": "Select a subnet",
   "Select a virtual network": "Select a virtual network",
-  "Select host type": "Select host type",
+  "Select an instance type": "Select an instance type",
+  "Select security groups": "Select security groups",
   "Service CIDR": "Service CIDR",
   "Service CIDR must not overlap the pod CIDR.": "Service CIDR must not overlap the pod CIDR.",
   "Services": "Services",
@@ -276,7 +248,6 @@
   "Size": "Size",
   "Source CIDR": "Source CIDR",
   "SSH public key": "SSH public key",
-  "SSH public key must be in the form \"[TYPE] key [[EMAIL]]\". Supported types are ssh-rsa, ssh-ed25519, and ecdsa-sha2-nistp256/384/521.": "SSH public key must be in the form \"[TYPE] key [[EMAIL]]\". Supported types are ssh-rsa, ssh-ed25519, and ecdsa-sha2-nistp256/384/521.",
   "Start": "Start",
   "Starting": "Starting",
   "Status": "Status",
@@ -284,6 +255,7 @@
   "Stopped": "Stopped",
   "Stopping": "Stopping",
   "Subnet": "Subnet",
+  "Subnet is required": "Subnet is required",
   "Subnets": "Subnets",
   "Take over": "Take over",
   "TCP": "TCP",
@@ -297,13 +269,14 @@
   "This will permanently delete the security group and all its rules. This action cannot be undone.": "This will permanently delete the security group and all its rules. This action cannot be undone.",
   "Timed out waiting for the graphical console to finish connecting": "Timed out waiting for the graphical console to finish connecting",
   "UDP": "UDP",
+  "Unable to load catalog items right now. Please try again.": "Unable to load catalog items right now. Please try again.",
   "Unauthorized": "Unauthorized",
   "Unknown": "Unknown",
   "Unpublished": "Unpublished",
+  "Unspecified": "Unspecified",
   "Use IPv4 CIDR notation (for example 10.128.0.0/14).": "Use IPv4 CIDR notation (for example 10.128.0.0/14).",
   "Use IPv4 CIDR notation (for example 172.30.0.0/16).": "Use IPv4 CIDR notation (for example 172.30.0.0/16).",
   "User data": "User data",
-  "User Data is required": "User Data is required",
   "User data must not exceed 64 KB.": "User data must not exceed 64 KB.",
   "View and manage your bare metal instances.": "View and manage your bare metal instances.",
   "View password": "View password",
@@ -315,6 +288,8 @@
   "Virtual Network": "Virtual Network",
   "Virtual network is required": "Virtual network is required",
   "Virtual networks": "Virtual networks",
+  "VM image": "VM image",
+  "VM image is required": "VM image is required",
   "Worker nodes": "Worker nodes",
   "You are not authorized to access this resource.": "You are not authorized to access this resource."
 }
diff --git a/libs/types/src/osac/private/v1/baremetal_instance_catalog_item_type_pb.ts b/libs/types/src/osac/private/v1/baremetal_instance_catalog_item_type_pb.ts
index 6c0f6abb..671affa6 100644
--- a/libs/types/src/osac/private/v1/baremetal_instance_catalog_item_type_pb.ts
+++ b/libs/types/src/osac/private/v1/baremetal_instance_catalog_item_type_pb.ts
@@ -33,6 +33,8 @@ export const file_osac_private_v1_baremetal_instance_catalog_item_type: GenFile
  * A bare metal instance catalog item defines a curated hardware offering that references an underlying bare metal
  * instance template. Admins control which fields users can set, enforce defaults, and validate input via JSON Schema.
  *
+ * buf:lint:ignore OSAC_OBJECT_SHAPE
+ *
  * @generated from message osac.private.v1.BareMetalInstanceCatalogItem
  */
 export type BareMetalInstanceCatalogItem = Message<"osac.private.v1.BareMetalInstanceCatalogItem"> & {
diff --git a/libs/types/src/osac/private/v1/baremetal_instance_template_type_pb.ts b/libs/types/src/osac/private/v1/baremetal_instance_template_type_pb.ts
index 71efeacb..12bb5755 100644
--- a/libs/types/src/osac/private/v1/baremetal_instance_template_type_pb.ts
+++ b/libs/types/src/osac/private/v1/baremetal_instance_template_type_pb.ts
@@ -17,6 +17,7 @@
 
 import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
 import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
+import { file_buf_validate_validate } from "../../../buf/validate/validate_pb";
 import type { Any } from "../../../google/protobuf/any_pb";
 import { file_google_protobuf_any } from "../../../google/protobuf/any_pb";
 import type { BareMetalInstanceImage } from "./baremetal_instance_type_pb";
@@ -29,17 +30,20 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file osac/private/v1/baremetal_instance_template_type.proto.
  */
 export const file_osac_private_v1_baremetal_instance_template_type: GenFile = /*@__PURE__*/
-  fileDesc("CjZvc2FjL3ByaXZhdGUvdjEvYmFyZW1ldGFsX2luc3RhbmNlX3RlbXBsYXRlX3R5cGUucHJvdG8SD29zYWMucHJpdmF0ZS52MSKaAgoZQmFyZU1ldGFsSW5zdGFuY2VUZW1wbGF0ZRIKCgJpZBgBIAEoCRIrCghtZXRhZGF0YRgCIAEoCzIZLm9zYWMucHJpdmF0ZS52MS5NZXRhZGF0YRINCgV0aXRsZRgDIAEoCRITCgtkZXNjcmlwdGlvbhgEIAEoCRJNCg1zcGVjX2RlZmF1bHRzGAUgASgLMjYub3NhYy5wcml2YXRlLnYxLkJhcmVNZXRhbEluc3RhbmNlVGVtcGxhdGVTcGVjRGVmYXVsdHMSUQoKcGFyYW1ldGVycxgGIAMoCzI9Lm9zYWMucHJpdmF0ZS52MS5CYXJlTWV0YWxJbnN0YW5jZVRlbXBsYXRlUGFyYW1ldGVyRGVmaW5pdGlvbiKnAQosQmFyZU1ldGFsSW5zdGFuY2VUZW1wbGF0ZVBhcmFtZXRlckRlZmluaXRpb24SDAoEbmFtZRgBIAEoCRINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCRIQCghyZXF1aXJlZBgEIAEoCBIMCgR0eXBlGAUgASgJEiUKB2RlZmF1bHQYBiABKAsyFC5nb29nbGUucHJvdG9idWYuQW55Im4KJUJhcmVNZXRhbEluc3RhbmNlVGVtcGxhdGVTcGVjRGVmYXVsdHMSOwoFaW1hZ2UYASABKAsyJy5vc2FjLnByaXZhdGUudjEuQmFyZU1ldGFsSW5zdGFuY2VJbWFnZUgAiAEBQggKBl9pbWFnZWIGcHJvdG8z", [file_google_protobuf_any, file_osac_private_v1_baremetal_instance_type, file_osac_private_v1_metadata_type]);
+  fileDesc("CjZvc2FjL3ByaXZhdGUvdjEvYmFyZW1ldGFsX2luc3RhbmNlX3RlbXBsYXRlX3R5cGUucHJvdG8SD29zYWMucHJpdmF0ZS52MSK+AgoZQmFyZU1ldGFsSW5zdGFuY2VUZW1wbGF0ZRIuCgJpZBgBIAEoCUIiukgfch0QATIZXlthLXpBLVpfXVthLXpBLVowLTkuX10qJBIrCghtZXRhZGF0YRgCIAEoCzIZLm9zYWMucHJpdmF0ZS52MS5NZXRhZGF0YRINCgV0aXRsZRgDIAEoCRITCgtkZXNjcmlwdGlvbhgEIAEoCRJNCg1zcGVjX2RlZmF1bHRzGAUgASgLMjYub3NhYy5wcml2YXRlLnYxLkJhcmVNZXRhbEluc3RhbmNlVGVtcGxhdGVTcGVjRGVmYXVsdHMSUQoKcGFyYW1ldGVycxgGIAMoCzI9Lm9zYWMucHJpdmF0ZS52MS5CYXJlTWV0YWxJbnN0YW5jZVRlbXBsYXRlUGFyYW1ldGVyRGVmaW5pdGlvbiKnAQosQmFyZU1ldGFsSW5zdGFuY2VUZW1wbGF0ZVBhcmFtZXRlckRlZmluaXRpb24SDAoEbmFtZRgBIAEoCRINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCRIQCghyZXF1aXJlZBgEIAEoCBIMCgR0eXBlGAUgASgJEiUKB2RlZmF1bHQYBiABKAsyFC5nb29nbGUucHJvdG9idWYuQW55Im4KJUJhcmVNZXRhbEluc3RhbmNlVGVtcGxhdGVTcGVjRGVmYXVsdHMSOwoFaW1hZ2UYASABKAsyJy5vc2FjLnByaXZhdGUudjEuQmFyZU1ldGFsSW5zdGFuY2VJbWFnZUgAiAEBQggKBl9pbWFnZWIGcHJvdG8z", [file_buf_validate_validate, file_google_protobuf_any, file_osac_private_v1_baremetal_instance_type, file_osac_private_v1_metadata_type]);
 
 /**
  * A bare metal instance template defines a hardware profile (host type, OS image, network configuration)
  * that can be used to create bare metal instances via a catalog item.
  *
+ * buf:lint:ignore OSAC_OBJECT_SHAPE
+ *
  * @generated from message osac.private.v1.BareMetalInstanceTemplate
  */
 export type BareMetalInstanceTemplate = Message<"osac.private.v1.BareMetalInstanceTemplate"> & {
   /**
-   * Unique identifier of the template.
+   * Unique identifier of the template. Must be a valid Ansible role name: letters, digits,
+   * underscores, and dots, starting with a letter or underscore (e.g., "osac.templates.bm_host_provisioning").
    *
    * @generated from field: string id = 1;
    */
diff --git a/libs/types/src/osac/private/v1/cluster_catalog_item_type_pb.ts b/libs/types/src/osac/private/v1/cluster_catalog_item_type_pb.ts
index 4204a8a1..b93e68f8 100644
--- a/libs/types/src/osac/private/v1/cluster_catalog_item_type_pb.ts
+++ b/libs/types/src/osac/private/v1/cluster_catalog_item_type_pb.ts
@@ -33,6 +33,8 @@ export const file_osac_private_v1_cluster_catalog_item_type: GenFile = /*@__PURE
  * A cluster catalog item defines a curated infrastructure offering that references an underlying cluster template.
  * Admins control which fields users can set, enforce defaults, and validate input via JSON Schema.
  *
+ * buf:lint:ignore OSAC_OBJECT_SHAPE
+ *
  * @generated from message osac.private.v1.ClusterCatalogItem
  */
 export type ClusterCatalogItem = Message<"osac.private.v1.ClusterCatalogItem"> & {
diff --git a/libs/types/src/osac/private/v1/cluster_template_type_pb.ts b/libs/types/src/osac/private/v1/cluster_template_type_pb.ts
index 0bcc5f25..94a83826 100644
--- a/libs/types/src/osac/private/v1/cluster_template_type_pb.ts
+++ b/libs/types/src/osac/private/v1/cluster_template_type_pb.ts
@@ -32,6 +32,8 @@ export const file_osac_private_v1_cluster_template_type: GenFile = /*@__PURE__*/
   fileDesc("Citvc2FjL3ByaXZhdGUvdjEvY2x1c3Rlcl90ZW1wbGF0ZV90eXBlLnByb3RvEg9vc2FjLnByaXZhdGUudjEimQMKD0NsdXN0ZXJUZW1wbGF0ZRIKCgJpZBgBIAEoCRIrCghtZXRhZGF0YRgCIAEoCzIZLm9zYWMucHJpdmF0ZS52MS5NZXRhZGF0YRINCgV0aXRsZRgDIAEoCRITCgtkZXNjcmlwdGlvbhgEIAEoCRJHCgpwYXJhbWV0ZXJzGAUgAygLMjMub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJUZW1wbGF0ZVBhcmFtZXRlckRlZmluaXRpb24SQQoJbm9kZV9zZXRzGAYgAygLMi4ub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJUZW1wbGF0ZS5Ob2RlU2V0c0VudHJ5EkMKDXNwZWNfZGVmYXVsdHMYByABKAsyLC5vc2FjLnByaXZhdGUudjEuQ2x1c3RlclRlbXBsYXRlU3BlY0RlZmF1bHRzGlgKDU5vZGVTZXRzRW50cnkSCwoDa2V5GAEgASgJEjYKBXZhbHVlGAIgASgLMicub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJUZW1wbGF0ZU5vZGVTZXQ6AjgBIp0BCiJDbHVzdGVyVGVtcGxhdGVQYXJhbWV0ZXJEZWZpbml0aW9uEgwKBG5hbWUYASABKAkSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkSEAoIcmVxdWlyZWQYBCABKAgSDAoEdHlwZRgFIAEoCRIlCgdkZWZhdWx0GAYgASgLMhQuZ29vZ2xlLnByb3RvYnVmLkFueSI5ChZDbHVzdGVyVGVtcGxhdGVOb2RlU2V0EhEKCWhvc3RfdHlwZRgBIAEoCRIMCgRzaXplGAIgASgFIugBChtDbHVzdGVyVGVtcGxhdGVTcGVjRGVmYXVsdHMSGAoLcHVsbF9zZWNyZXQYASABKAlIAIgBARIbCg5zc2hfcHVibGljX2tleRgCIAEoCUgBiAEBEhoKDXJlbGVhc2VfaW1hZ2UYAyABKAlIAogBARI1CgduZXR3b3JrGAQgASgLMh8ub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJOZXR3b3JrSAOIAQFCDgoMX3B1bGxfc2VjcmV0QhEKD19zc2hfcHVibGljX2tleUIQCg5fcmVsZWFzZV9pbWFnZUIKCghfbmV0d29ya2IGcHJvdG8z", [file_google_protobuf_any, file_osac_private_v1_cluster_type, file_osac_private_v1_metadata_type]);
 
 /**
+ * buf:lint:ignore OSAC_OBJECT_SHAPE
+ *
  * @generated from message osac.private.v1.ClusterTemplate
  */
 export type ClusterTemplate = Message<"osac.private.v1.ClusterTemplate"> & {
diff --git a/libs/types/src/osac/private/v1/cluster_type_pb.ts b/libs/types/src/osac/private/v1/cluster_type_pb.ts
index b8d2f908..54f59eef 100644
--- a/libs/types/src/osac/private/v1/cluster_type_pb.ts
+++ b/libs/types/src/osac/private/v1/cluster_type_pb.ts
@@ -31,7 +31,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file osac/private/v1/cluster_type.proto.
  */
 export const file_osac_private_v1_cluster_type: GenFile = /*@__PURE__*/
-  fileDesc("CiJvc2FjL3ByaXZhdGUvdjEvY2x1c3Rlcl90eXBlLnByb3RvEg9vc2FjLnByaXZhdGUudjEingEKB0NsdXN0ZXISCgoCaWQYASABKAkSKwoIbWV0YWRhdGEYAiABKAsyGS5vc2FjLnByaXZhdGUudjEuTWV0YWRhdGESKgoEc3BlYxgDIAEoCzIcLm9zYWMucHJpdmF0ZS52MS5DbHVzdGVyU3BlYxIuCgZzdGF0dXMYBCABKAsyHi5vc2FjLnByaXZhdGUudjEuQ2x1c3RlclN0YXR1cyL8BAoLQ2x1c3RlclNwZWMSEAoIdGVtcGxhdGUYASABKAkSUQoTdGVtcGxhdGVfcGFyYW1ldGVycxgCIAMoCzI0Lm9zYWMucHJpdmF0ZS52MS5DbHVzdGVyU3BlYy5UZW1wbGF0ZVBhcmFtZXRlcnNFbnRyeRI9Cglub2RlX3NldHMYAyADKAsyKi5vc2FjLnByaXZhdGUudjEuQ2x1c3RlclNwZWMuTm9kZVNldHNFbnRyeRIYCgtwdWxsX3NlY3JldBgEIAEoCUgAiAEBEhsKDnNzaF9wdWJsaWNfa2V5GAUgASgJSAGIAQESGgoNcmVsZWFzZV9pbWFnZRgGIAEoCUgCiAEBEjUKB25ldHdvcmsYByABKAsyHy5vc2FjLnByaXZhdGUudjEuQ2x1c3Rlck5ldHdvcmtIA4gBARIUCgxjYXRhbG9nX2l0ZW0YCCABKAkSRQoSbmV0d29ya19hdHRhY2htZW50GAkgASgLMikub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJOZXR3b3JrQXR0YWNobWVudBpPChdUZW1wbGF0ZVBhcmFtZXRlcnNFbnRyeRILCgNrZXkYASABKAkSIwoFdmFsdWUYAiABKAsyFC5nb29nbGUucHJvdG9idWYuQW55OgI4ARpQCg1Ob2RlU2V0c0VudHJ5EgsKA2tleRgBIAEoCRIuCgV2YWx1ZRgCIAEoCzIfLm9zYWMucHJpdmF0ZS52MS5DbHVzdGVyTm9kZVNldDoCOAFCDgoMX3B1bGxfc2VjcmV0QhEKD19zc2hfcHVibGljX2tleUIQCg5fcmVsZWFzZV9pbWFnZUIKCghfbmV0d29yayJgCg5DbHVzdGVyTmV0d29yaxIVCghwb2RfY2lkchgBIAEoCUgAiAEBEhkKDHNlcnZpY2VfY2lkchgCIAEoCUgBiAEBQgsKCV9wb2RfY2lkckIPCg1fc2VydmljZV9jaWRyIuoCCg1DbHVzdGVyU3RhdHVzEiwKBXN0YXRlGAEgASgOMh0ub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJTdGF0ZRI1Cgpjb25kaXRpb25zGAIgAygLMiEub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJDb25kaXRpb24SDwoHYXBpX3VybBgDIAEoCRITCgtjb25zb2xlX3VybBgEIAEoCRI/Cglub2RlX3NldHMYBSADKAsyLC5vc2FjLnByaXZhdGUudjEuQ2x1c3RlclN0YXR1cy5Ob2RlU2V0c0VudHJ5EgsKA2h1YhgGIAEoCRIUCgxhcGlfZW5kcG9pbnQYByABKAkSGAoQaW5ncmVzc19lbmRwb2ludBgIIAEoCRpQCg1Ob2RlU2V0c0VudHJ5EgsKA2tleRgBIAEoCRIuCgV2YWx1ZRgCIAEoCzIfLm9zYWMucHJpdmF0ZS52MS5DbHVzdGVyTm9kZVNldDoCOAEi9QEKEENsdXN0ZXJDb25kaXRpb24SMwoEdHlwZRgBIAEoDjIlLm9zYWMucHJpdmF0ZS52MS5DbHVzdGVyQ29uZGl0aW9uVHlwZRIwCgZzdGF0dXMYAiABKA4yIC5vc2FjLnByaXZhdGUudjEuQ29uZGl0aW9uU3RhdHVzEjgKFGxhc3RfdHJhbnNpdGlvbl90aW1lGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBITCgZyZWFzb24YBCABKAlIAIgBARIUCgdtZXNzYWdlGAUgASgJSAGIAQFCCQoHX3JlYXNvbkIKCghfbWVzc2FnZSJDChhDbHVzdGVyTmV0d29ya0F0dGFjaG1lbnQSDgoGc3VibmV0GAEgASgJEhcKD3NlY3VyaXR5X2dyb3VwcxgCIAMoCSIxCg5DbHVzdGVyTm9kZVNldBIRCglob3N0X3R5cGUYASABKAkSDAoEc2l6ZRgCIAEoBSp/CgxDbHVzdGVyU3RhdGUSHQoZQ0xVU1RFUl9TVEFURV9VTlNQRUNJRklFRBAAEh0KGUNMVVNURVJfU1RBVEVfUFJPR1JFU1NJTkcQARIXChNDTFVTVEVSX1NUQVRFX1JFQURZEAISGAoUQ0xVU1RFUl9TVEFURV9GQUlMRUQQAyrQAQoUQ2x1c3RlckNvbmRpdGlvblR5cGUSJgoiQ0xVU1RFUl9DT05ESVRJT05fVFlQRV9VTlNQRUNJRklFRBAAEiYKIkNMVVNURVJfQ09ORElUSU9OX1RZUEVfUFJPR1JFU1NJTkcQARIgChxDTFVTVEVSX0NPTkRJVElPTl9UWVBFX1JFQURZEAISIQodQ0xVU1RFUl9DT05ESVRJT05fVFlQRV9GQUlMRUQQAxIjCh9DTFVTVEVSX0NPTkRJVElPTl9UWVBFX0RFR1JBREVEEARiBnByb3RvMw", [file_google_protobuf_any, file_google_protobuf_timestamp, file_osac_private_v1_condition_status_type, file_osac_private_v1_metadata_type]);
+  fileDesc("CiJvc2FjL3ByaXZhdGUvdjEvY2x1c3Rlcl90eXBlLnByb3RvEg9vc2FjLnByaXZhdGUudjEingEKB0NsdXN0ZXISCgoCaWQYASABKAkSKwoIbWV0YWRhdGEYAiABKAsyGS5vc2FjLnByaXZhdGUudjEuTWV0YWRhdGESKgoEc3BlYxgDIAEoCzIcLm9zYWMucHJpdmF0ZS52MS5DbHVzdGVyU3BlYxIuCgZzdGF0dXMYBCABKAsyHi5vc2FjLnByaXZhdGUudjEuQ2x1c3RlclN0YXR1cyL8BAoLQ2x1c3RlclNwZWMSEAoIdGVtcGxhdGUYASABKAkSUQoTdGVtcGxhdGVfcGFyYW1ldGVycxgCIAMoCzI0Lm9zYWMucHJpdmF0ZS52MS5DbHVzdGVyU3BlYy5UZW1wbGF0ZVBhcmFtZXRlcnNFbnRyeRI9Cglub2RlX3NldHMYAyADKAsyKi5vc2FjLnByaXZhdGUudjEuQ2x1c3RlclNwZWMuTm9kZVNldHNFbnRyeRIYCgtwdWxsX3NlY3JldBgEIAEoCUgAiAEBEhsKDnNzaF9wdWJsaWNfa2V5GAUgASgJSAGIAQESGgoNcmVsZWFzZV9pbWFnZRgGIAEoCUgCiAEBEjUKB25ldHdvcmsYByABKAsyHy5vc2FjLnByaXZhdGUudjEuQ2x1c3Rlck5ldHdvcmtIA4gBARIUCgxjYXRhbG9nX2l0ZW0YCCABKAkSRQoSbmV0d29ya19hdHRhY2htZW50GAkgASgLMikub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJOZXR3b3JrQXR0YWNobWVudBpPChdUZW1wbGF0ZVBhcmFtZXRlcnNFbnRyeRILCgNrZXkYASABKAkSIwoFdmFsdWUYAiABKAsyFC5nb29nbGUucHJvdG9idWYuQW55OgI4ARpQCg1Ob2RlU2V0c0VudHJ5EgsKA2tleRgBIAEoCRIuCgV2YWx1ZRgCIAEoCzIfLm9zYWMucHJpdmF0ZS52MS5DbHVzdGVyTm9kZVNldDoCOAFCDgoMX3B1bGxfc2VjcmV0QhEKD19zc2hfcHVibGljX2tleUIQCg5fcmVsZWFzZV9pbWFnZUIKCghfbmV0d29yayJgCg5DbHVzdGVyTmV0d29yaxIVCghwb2RfY2lkchgBIAEoCUgAiAEBEhkKDHNlcnZpY2VfY2lkchgCIAEoCUgBiAEBQgsKCV9wb2RfY2lkckIPCg1fc2VydmljZV9jaWRyIuoCCg1DbHVzdGVyU3RhdHVzEiwKBXN0YXRlGAEgASgOMh0ub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJTdGF0ZRI1Cgpjb25kaXRpb25zGAIgAygLMiEub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJDb25kaXRpb24SDwoHYXBpX3VybBgDIAEoCRITCgtjb25zb2xlX3VybBgEIAEoCRI/Cglub2RlX3NldHMYBSADKAsyLC5vc2FjLnByaXZhdGUudjEuQ2x1c3RlclN0YXR1cy5Ob2RlU2V0c0VudHJ5EgsKA2h1YhgGIAEoCRIUCgxhcGlfZW5kcG9pbnQYByABKAkSGAoQaW5ncmVzc19lbmRwb2ludBgIIAEoCRpQCg1Ob2RlU2V0c0VudHJ5EgsKA2tleRgBIAEoCRIuCgV2YWx1ZRgCIAEoCzIfLm9zYWMucHJpdmF0ZS52MS5DbHVzdGVyTm9kZVNldDoCOAEi9QEKEENsdXN0ZXJDb25kaXRpb24SMwoEdHlwZRgBIAEoDjIlLm9zYWMucHJpdmF0ZS52MS5DbHVzdGVyQ29uZGl0aW9uVHlwZRIwCgZzdGF0dXMYAiABKA4yIC5vc2FjLnByaXZhdGUudjEuQ29uZGl0aW9uU3RhdHVzEjgKFGxhc3RfdHJhbnNpdGlvbl90aW1lGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBITCgZyZWFzb24YBCABKAlIAIgBARIUCgdtZXNzYWdlGAUgASgJSAGIAQFCCQoHX3JlYXNvbkIKCghfbWVzc2FnZSJDChhDbHVzdGVyTmV0d29ya0F0dGFjaG1lbnQSDgoGc3VibmV0GAEgASgJEhcKD3NlY3VyaXR5X2dyb3VwcxgCIAMoCSIxCg5DbHVzdGVyTm9kZVNldBIRCglob3N0X3R5cGUYASABKAkSDAoEc2l6ZRgCIAEoBSq8AQoMQ2x1c3RlclN0YXRlEh0KGUNMVVNURVJfU1RBVEVfVU5TUEVDSUZJRUQQABIdChlDTFVTVEVSX1NUQVRFX1BST0dSRVNTSU5HEAESFwoTQ0xVU1RFUl9TVEFURV9SRUFEWRACEhgKFENMVVNURVJfU1RBVEVfRkFJTEVEEAMSGgoWQ0xVU1RFUl9TVEFURV9ERUxFVElORxAEEh8KG0NMVVNURVJfU1RBVEVfREVMRVRFX0ZBSUxFRBAFKtABChRDbHVzdGVyQ29uZGl0aW9uVHlwZRImCiJDTFVTVEVSX0NPTkRJVElPTl9UWVBFX1VOU1BFQ0lGSUVEEAASJgoiQ0xVU1RFUl9DT05ESVRJT05fVFlQRV9QUk9HUkVTU0lORxABEiAKHENMVVNURVJfQ09ORElUSU9OX1RZUEVfUkVBRFkQAhIhCh1DTFVTVEVSX0NPTkRJVElPTl9UWVBFX0ZBSUxFRBADEiMKH0NMVVNURVJfQ09ORElUSU9OX1RZUEVfREVHUkFERUQQBGIGcHJvdG8z", [file_google_protobuf_any, file_google_protobuf_timestamp, file_osac_private_v1_condition_status_type, file_osac_private_v1_metadata_type]);
 
 /**
  * Contains the details about the cluster that are available only for the system.
@@ -356,6 +356,16 @@ export enum ClusterState {
    * @generated from enum value: CLUSTER_STATE_FAILED = 3;
    */
   FAILED = 3,
+
+  /**
+   * @generated from enum value: CLUSTER_STATE_DELETING = 4;
+   */
+  DELETING = 4,
+
+  /**
+   * @generated from enum value: CLUSTER_STATE_DELETE_FAILED = 5;
+   */
+  DELETE_FAILED = 5,
 }
 
 /**
diff --git a/libs/types/src/osac/private/v1/cluster_version_type_pb.ts b/libs/types/src/osac/private/v1/cluster_version_type_pb.ts
index 9b6d54e5..fd4ae378 100644
--- a/libs/types/src/osac/private/v1/cluster_version_type_pb.ts
+++ b/libs/types/src/osac/private/v1/cluster_version_type_pb.ts
@@ -17,6 +17,7 @@
 
 import type { GenEnum, GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
 import { enumDesc, fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
+import { file_buf_validate_validate } from "../../../buf/validate/validate_pb";
 import { file_google_api_field_behavior } from "../../../google/api/field_behavior_pb";
 import type { Timestamp } from "../../../google/protobuf/timestamp_pb";
 import { file_google_protobuf_timestamp } from "../../../google/protobuf/timestamp_pb";
@@ -28,14 +29,14 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file osac/private/v1/cluster_version_type.proto.
  */
 export const file_osac_private_v1_cluster_version_type: GenFile = /*@__PURE__*/
-  fileDesc("Cipvc2FjL3ByaXZhdGUvdjEvY2x1c3Rlcl92ZXJzaW9uX3R5cGUucHJvdG8SD29zYWMucHJpdmF0ZS52MSKcAQoZQ2x1c3RlclZlcnNpb25EZXByZWNhdGlvbhI+ChVkZXByZWNhdGlvbl90aW1lc3RhbXAYASABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSPwoWb2Jzb2xlc2NlbmNlX3RpbWVzdGFtcBgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAyI2Ch1DbHVzdGVyVmVyc2lvbkFsbG93ZWRVcGdyYWRlcxIVCg12ZXJzaW9uX25hbWVzGAEgAygJIrMBCg5DbHVzdGVyVmVyc2lvbhIKCgJpZBgBIAEoCRIrCghtZXRhZGF0YRgCIAEoCzIZLm9zYWMucHJpdmF0ZS52MS5NZXRhZGF0YRIxCgRzcGVjGAMgASgLMiMub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJWZXJzaW9uU3BlYxI1CgZzdGF0dXMYBCABKAsyJS5vc2FjLnByaXZhdGUudjEuQ2x1c3RlclZlcnNpb25TdGF0dXMi5wIKEkNsdXN0ZXJWZXJzaW9uU3BlYxIVCgVpbWFnZRgBIAEoCUIG4EEC4EEFEhkKB2VuYWJsZWQYAiABKAhCA+BBAUgAiAEBEhwKCmlzX2RlZmF1bHQYAyABKAhCA+BBAUgBiAEBEjgKBXN0YXRlGAQgASgOMiQub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJWZXJzaW9uU3RhdGVCA+BBARJECgtkZXByZWNhdGlvbhgFIAEoCzIqLm9zYWMucHJpdmF0ZS52MS5DbHVzdGVyVmVyc2lvbkRlcHJlY2F0aW9uQgPgQQESFwoHdmVyc2lvbhgGIAEoCUIG4EEC4EEFEk0KEGFsbG93ZWRfdXBncmFkZXMYByABKAsyLi5vc2FjLnByaXZhdGUudjEuQ2x1c3RlclZlcnNpb25BbGxvd2VkVXBncmFkZXNCA+BBAUIKCghfZW5hYmxlZEINCgtfaXNfZGVmYXVsdCIWChRDbHVzdGVyVmVyc2lvblN0YXR1cyqoAQoTQ2x1c3RlclZlcnNpb25TdGF0ZRIlCiFDTFVTVEVSX1ZFUlNJT05fU1RBVEVfVU5TUEVDSUZJRUQQABIgChxDTFVTVEVSX1ZFUlNJT05fU1RBVEVfQUNUSVZFEAESJAogQ0xVU1RFUl9WRVJTSU9OX1NUQVRFX0RFUFJFQ0FURUQQAhIiCh5DTFVTVEVSX1ZFUlNJT05fU1RBVEVfT0JTT0xFVEUQA2IGcHJvdG8z", [file_google_api_field_behavior, file_google_protobuf_timestamp, file_osac_private_v1_metadata_type]);
+  fileDesc("Cipvc2FjL3ByaXZhdGUvdjEvY2x1c3Rlcl92ZXJzaW9uX3R5cGUucHJvdG8SD29zYWMucHJpdmF0ZS52MSKcAQoZQ2x1c3RlclZlcnNpb25EZXByZWNhdGlvbhI+ChVkZXByZWNhdGlvbl90aW1lc3RhbXAYASABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSPwoWb2Jzb2xlc2NlbmNlX3RpbWVzdGFtcBgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAyJLCh1DbHVzdGVyVmVyc2lvbkFsbG93ZWRVcGdyYWRlcxIqCg12ZXJzaW9uX25hbWVzGAEgAygJQhO6SBCSAQ0Q6AcYASIGcgQQARg/IrMBCg5DbHVzdGVyVmVyc2lvbhIKCgJpZBgBIAEoCRIrCghtZXRhZGF0YRgCIAEoCzIZLm9zYWMucHJpdmF0ZS52MS5NZXRhZGF0YRIxCgRzcGVjGAMgASgLMiMub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJWZXJzaW9uU3BlYxI1CgZzdGF0dXMYBCABKAsyJS5vc2FjLnByaXZhdGUudjEuQ2x1c3RlclZlcnNpb25TdGF0dXMi5wIKEkNsdXN0ZXJWZXJzaW9uU3BlYxIVCgVpbWFnZRgBIAEoCUIG4EEC4EEFEhkKB2VuYWJsZWQYAiABKAhCA+BBAUgAiAEBEhwKCmlzX2RlZmF1bHQYAyABKAhCA+BBAUgBiAEBEjgKBXN0YXRlGAQgASgOMiQub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJWZXJzaW9uU3RhdGVCA+BBARJECgtkZXByZWNhdGlvbhgFIAEoCzIqLm9zYWMucHJpdmF0ZS52MS5DbHVzdGVyVmVyc2lvbkRlcHJlY2F0aW9uQgPgQQESFwoHdmVyc2lvbhgGIAEoCUIG4EEC4EEFEk0KEGFsbG93ZWRfdXBncmFkZXMYByABKAsyLi5vc2FjLnByaXZhdGUudjEuQ2x1c3RlclZlcnNpb25BbGxvd2VkVXBncmFkZXNCA+BBAUIKCghfZW5hYmxlZEINCgtfaXNfZGVmYXVsdCIWChRDbHVzdGVyVmVyc2lvblN0YXR1cyqoAQoTQ2x1c3RlclZlcnNpb25TdGF0ZRIlCiFDTFVTVEVSX1ZFUlNJT05fU1RBVEVfVU5TUEVDSUZJRUQQABIgChxDTFVTVEVSX1ZFUlNJT05fU1RBVEVfQUNUSVZFEAESJAogQ0xVU1RFUl9WRVJTSU9OX1NUQVRFX0RFUFJFQ0FURUQQAhIiCh5DTFVTVEVSX1ZFUlNJT05fU1RBVEVfT0JTT0xFVEUQA2IGcHJvdG8z", [file_buf_validate_validate, file_google_api_field_behavior, file_google_protobuf_timestamp, file_osac_private_v1_metadata_type]);
 
 /**
  * Contains deprecation details for a cluster version.
  *
  * The timestamps are managed by the server during lifecycle state transitions. The deprecation_timestamp is set when
- * the version transitions to DEPRECATED, and the obsolescence_timestamp is set when it transitions to OBSOLETE. Both
- * are cleared if the version returns to ACTIVE.
+ * the version transitions to DEPRECATED, and the obsolescence_timestamp is set when it transitions to OBSOLETE.
+ * Timestamps are retained as historical record when the version returns to ACTIVE.
  *
  * @generated from message osac.private.v1.ClusterVersionDeprecation
  */
@@ -76,6 +77,7 @@ export type ClusterVersionAllowedUpgrades = Message<"osac.private.v1.ClusterVers
   /**
    * ClusterVersion names (metadata.name). Must reference existing, non-deleted ClusterVersions. When a target
    * version is deleted, it is automatically removed from all lists.
+   * No duplicate or empty entries are allowed.
    *
    * @generated from field: repeated string version_names = 1;
    */
@@ -268,7 +270,7 @@ export enum ClusterVersionState {
    * The cluster version is fully available for new cluster creation.
    *
    * This is the default state assigned on creation. Returning to ACTIVE from DEPRECATED or OBSOLETE
-   * clears the corresponding deprecation timestamps.
+   * retains the corresponding deprecation timestamps as historical record.
    *
    * @generated from enum value: CLUSTER_VERSION_STATE_ACTIVE = 1;
    */
diff --git a/libs/types/src/osac/private/v1/compute_instance_catalog_item_type_pb.ts b/libs/types/src/osac/private/v1/compute_instance_catalog_item_type_pb.ts
index 193e0eaa..b113c738 100644
--- a/libs/types/src/osac/private/v1/compute_instance_catalog_item_type_pb.ts
+++ b/libs/types/src/osac/private/v1/compute_instance_catalog_item_type_pb.ts
@@ -33,6 +33,8 @@ export const file_osac_private_v1_compute_instance_catalog_item_type: GenFile =
  * A compute instance catalog item defines a curated infrastructure offering that references an underlying compute
  * instance template. Admins control which fields users can set, enforce defaults, and validate input via JSON Schema.
  *
+ * buf:lint:ignore OSAC_OBJECT_SHAPE
+ *
  * @generated from message osac.private.v1.ComputeInstanceCatalogItem
  */
 export type ComputeInstanceCatalogItem = Message<"osac.private.v1.ComputeInstanceCatalogItem"> & {
diff --git a/libs/types/src/osac/private/v1/compute_instance_template_type_pb.ts b/libs/types/src/osac/private/v1/compute_instance_template_type_pb.ts
index 88a21dd4..81a51695 100644
--- a/libs/types/src/osac/private/v1/compute_instance_template_type_pb.ts
+++ b/libs/types/src/osac/private/v1/compute_instance_template_type_pb.ts
@@ -32,6 +32,8 @@ export const file_osac_private_v1_compute_instance_template_type: GenFile = /*@_
   fileDesc("CjRvc2FjL3ByaXZhdGUvdjEvY29tcHV0ZV9pbnN0YW5jZV90ZW1wbGF0ZV90eXBlLnByb3RvEg9vc2FjLnByaXZhdGUudjEilAIKF0NvbXB1dGVJbnN0YW5jZVRlbXBsYXRlEgoKAmlkGAEgASgJEisKCG1ldGFkYXRhGAIgASgLMhkub3NhYy5wcml2YXRlLnYxLk1ldGFkYXRhEg0KBXRpdGxlGAMgASgJEhMKC2Rlc2NyaXB0aW9uGAQgASgJEk8KCnBhcmFtZXRlcnMYBSADKAsyOy5vc2FjLnByaXZhdGUudjEuQ29tcHV0ZUluc3RhbmNlVGVtcGxhdGVQYXJhbWV0ZXJEZWZpbml0aW9uEksKDXNwZWNfZGVmYXVsdHMYBiABKAsyNC5vc2FjLnByaXZhdGUudjEuQ29tcHV0ZUluc3RhbmNlVGVtcGxhdGVTcGVjRGVmYXVsdHMipQEKKkNvbXB1dGVJbnN0YW5jZVRlbXBsYXRlUGFyYW1ldGVyRGVmaW5pdGlvbhIMCgRuYW1lGAEgASgJEg0KBXRpdGxlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJEhAKCHJlcXVpcmVkGAQgASgIEgwKBHR5cGUYBSABKAkSJQoHZGVmYXVsdBgGIAEoCzIULmdvb2dsZS5wcm90b2J1Zi5Bbnki1wIKI0NvbXB1dGVJbnN0YW5jZVRlbXBsYXRlU3BlY0RlZmF1bHRzEjkKBWltYWdlGAMgASgLMiUub3NhYy5wcml2YXRlLnYxLkNvbXB1dGVJbnN0YW5jZUltYWdlSACIAQESPAoJYm9vdF9kaXNrGAQgASgLMiQub3NhYy5wcml2YXRlLnYxLkNvbXB1dGVJbnN0YW5jZURpc2tIAYgBARIZCgxydW5fc3RyYXRlZ3kYBSABKAlIAogBARIaCg1pbnN0YW5jZV90eXBlGAYgASgJSAOIAQESFwoKaXNfd2luZG93cxgHIAEoCEgEiAEBQggKBl9pbWFnZUIMCgpfYm9vdF9kaXNrQg8KDV9ydW5fc3RyYXRlZ3lCEAoOX2luc3RhbmNlX3R5cGVCDQoLX2lzX3dpbmRvd3NKBAgBEAJKBAgCEANSBWNvcmVzUgptZW1vcnlfZ2liYgZwcm90bzM", [file_google_protobuf_any, file_osac_private_v1_compute_instance_type, file_osac_private_v1_metadata_type]);
 
 /**
+ * buf:lint:ignore OSAC_OBJECT_SHAPE
+ *
  * @generated from message osac.private.v1.ComputeInstanceTemplate
  */
 export type ComputeInstanceTemplate = Message<"osac.private.v1.ComputeInstanceTemplate"> & {
diff --git a/libs/types/src/osac/private/v1/compute_instance_type_pb.ts b/libs/types/src/osac/private/v1/compute_instance_type_pb.ts
index 5d6d59fd..215eb106 100644
--- a/libs/types/src/osac/private/v1/compute_instance_type_pb.ts
+++ b/libs/types/src/osac/private/v1/compute_instance_type_pb.ts
@@ -31,7 +31,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file osac/private/v1/compute_instance_type.proto.
  */
 export const file_osac_private_v1_compute_instance_type: GenFile = /*@__PURE__*/
-  fileDesc("Citvc2FjL3ByaXZhdGUvdjEvY29tcHV0ZV9pbnN0YW5jZV90eXBlLnByb3RvEg9vc2FjLnByaXZhdGUudjEitgEKD0NvbXB1dGVJbnN0YW5jZRIKCgJpZBgBIAEoCRIrCghtZXRhZGF0YRgCIAEoCzIZLm9zYWMucHJpdmF0ZS52MS5NZXRhZGF0YRIyCgRzcGVjGAMgASgLMiQub3NhYy5wcml2YXRlLnYxLkNvbXB1dGVJbnN0YW5jZVNwZWMSNgoGc3RhdHVzGAQgASgLMiYub3NhYy5wcml2YXRlLnYxLkNvbXB1dGVJbnN0YW5jZVN0YXR1cyI/ChRDb21wdXRlSW5zdGFuY2VJbWFnZRITCgtzb3VyY2VfdHlwZRgBIAEoCRISCgpzb3VyY2VfcmVmGAIgASgJIicKE0NvbXB1dGVJbnN0YW5jZURpc2sSEAoIc2l6ZV9naWIYASABKAUiPAoRTmV0d29ya0F0dGFjaG1lbnQSDgoGc3VibmV0GAEgASgJEhcKD3NlY3VyaXR5X2dyb3VwcxgCIAMoCSLhBgoTQ29tcHV0ZUluc3RhbmNlU3BlYxIQCgh0ZW1wbGF0ZRgBIAEoCRJZChN0ZW1wbGF0ZV9wYXJhbWV0ZXJzGAIgAygLMjwub3NhYy5wcml2YXRlLnYxLkNvbXB1dGVJbnN0YW5jZVNwZWMuVGVtcGxhdGVQYXJhbWV0ZXJzRW50cnkSPQoUcmVzdGFydF9yZXF1ZXN0ZWRfYXQYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wSACIAQESOQoFaW1hZ2UYBCABKAsyJS5vc2FjLnByaXZhdGUudjEuQ29tcHV0ZUluc3RhbmNlSW1hZ2VIAYgBARIUCgdzc2hfa2V5GAcgASgJSAKIAQESPAoJYm9vdF9kaXNrGAggASgLMiQub3NhYy5wcml2YXRlLnYxLkNvbXB1dGVJbnN0YW5jZURpc2tIA4gBARI+ChBhZGRpdGlvbmFsX2Rpc2tzGAkgAygLMiQub3NhYy5wcml2YXRlLnYxLkNvbXB1dGVJbnN0YW5jZURpc2sSGQoMcnVuX3N0cmF0ZWd5GAogASgJSASIAQESFgoJdXNlcl9kYXRhGAsgASgJSAWIAQESPwoTbmV0d29ya19hdHRhY2htZW50cxgOIAMoCzIiLm9zYWMucHJpdmF0ZS52MS5OZXR3b3JrQXR0YWNobWVudBIUCgxjYXRhbG9nX2l0ZW0YDyABKAkSFwoKaXNfd2luZG93cxgQIAEoCEgGiAEBEhoKDWluc3RhbmNlX3R5cGUYESABKAlIB4gBARpPChdUZW1wbGF0ZVBhcmFtZXRlcnNFbnRyeRILCgNrZXkYASABKAkSIwoFdmFsdWUYAiABKAsyFC5nb29nbGUucHJvdG9idWYuQW55OgI4AUIXChVfcmVzdGFydF9yZXF1ZXN0ZWRfYXRCCAoGX2ltYWdlQgoKCF9zc2hfa2V5QgwKCl9ib290X2Rpc2tCDwoNX3J1bl9zdHJhdGVneUIMCgpfdXNlcl9kYXRhQg0KC19pc193aW5kb3dzQhAKDl9pbnN0YW5jZV90eXBlSgQIBRAGSgQIBhAHSgQIDBANSgQIDRAOUgVjb3Jlc1IKbWVtb3J5X2dpYlIGc3VibmV0Ug9zZWN1cml0eV9ncm91cHMiowIKFUNvbXB1dGVJbnN0YW5jZVN0YXR1cxI0CgVzdGF0ZRgBIAEoDjIlLm9zYWMucHJpdmF0ZS52MS5Db21wdXRlSW5zdGFuY2VTdGF0ZRI9Cgpjb25kaXRpb25zGAIgAygLMikub3NhYy5wcml2YXRlLnYxLkNvbXB1dGVJbnN0YW5jZUNvbmRpdGlvbhIbChNpbnRlcm5hbF9pcF9hZGRyZXNzGAMgASgJEgsKA2h1YhgEIAEoCRI6ChFsYXN0X3Jlc3RhcnRlZF9hdBgFIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBIAIgBARIZChFwdWJsaWNfaXBfYWRkcmVzcxgGIAEoCUIUChJfbGFzdF9yZXN0YXJ0ZWRfYXQihQIKGENvbXB1dGVJbnN0YW5jZUNvbmRpdGlvbhI7CgR0eXBlGAEgASgOMi0ub3NhYy5wcml2YXRlLnYxLkNvbXB1dGVJbnN0YW5jZUNvbmRpdGlvblR5cGUSMAoGc3RhdHVzGAIgASgOMiAub3NhYy5wcml2YXRlLnYxLkNvbmRpdGlvblN0YXR1cxI4ChRsYXN0X3RyYW5zaXRpb25fdGltZRgDIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASEwoGcmVhc29uGAQgASgJSACIAQESFAoHbWVzc2FnZRgFIAEoCUgBiAEBQgkKB19yZWFzb25CCgoIX21lc3NhZ2UquwIKFENvbXB1dGVJbnN0YW5jZVN0YXRlEiYKIkNPTVBVVEVfSU5TVEFOQ0VfU1RBVEVfVU5TUEVDSUZJRUQQABIjCh9DT01QVVRFX0lOU1RBTkNFX1NUQVRFX1NUQVJUSU5HEAESIgoeQ09NUFVURV9JTlNUQU5DRV9TVEFURV9SVU5OSU5HEAISIQodQ09NUFVURV9JTlNUQU5DRV9TVEFURV9GQUlMRUQQAxIjCh9DT01QVVRFX0lOU1RBTkNFX1NUQVRFX0RFTEVUSU5HEAQSIwofQ09NUFVURV9JTlNUQU5DRV9TVEFURV9TVE9QUElORxAFEiIKHkNPTVBVVEVfSU5TVEFOQ0VfU1RBVEVfU1RPUFBFRBAGEiEKHUNPTVBVVEVfSU5TVEFOQ0VfU1RBVEVfUEFVU0VEEAcqiQMKHENvbXB1dGVJbnN0YW5jZUNvbmRpdGlvblR5cGUSLworQ09NUFVURV9JTlNUQU5DRV9DT05ESVRJT05fVFlQRV9VTlNQRUNJRklFRBAAEjkKNUNPTVBVVEVfSU5TVEFOQ0VfQ09ORElUSU9OX1RZUEVfQ09ORklHVVJBVElPTl9BUFBMSUVEEAESKQolQ09NUFVURV9JTlNUQU5DRV9DT05ESVRJT05fVFlQRV9SRUFEWRACEjcKM0NPTVBVVEVfSU5TVEFOQ0VfQ09ORElUSU9OX1RZUEVfUkVTVEFSVF9JTl9QUk9HUkVTUxADEjIKLkNPTVBVVEVfSU5TVEFOQ0VfQ09ORElUSU9OX1RZUEVfUkVTVEFSVF9GQUlMRUQQBBIvCitDT01QVVRFX0lOU1RBTkNFX0NPTkRJVElPTl9UWVBFX1BST1ZJU0lPTkVEEAUSNAowQ09NUFVURV9JTlNUQU5DRV9DT05ESVRJT05fVFlQRV9SRVNUQVJUX1JFUVVJUkVEEAZiBnByb3RvMw", [file_google_protobuf_any, file_google_protobuf_timestamp, file_osac_private_v1_condition_status_type, file_osac_private_v1_metadata_type]);
+  fileDesc("Citvc2FjL3ByaXZhdGUvdjEvY29tcHV0ZV9pbnN0YW5jZV90eXBlLnByb3RvEg9vc2FjLnByaXZhdGUudjEitgEKD0NvbXB1dGVJbnN0YW5jZRIKCgJpZBgBIAEoCRIrCghtZXRhZGF0YRgCIAEoCzIZLm9zYWMucHJpdmF0ZS52MS5NZXRhZGF0YRIyCgRzcGVjGAMgASgLMiQub3NhYy5wcml2YXRlLnYxLkNvbXB1dGVJbnN0YW5jZVNwZWMSNgoGc3RhdHVzGAQgASgLMiYub3NhYy5wcml2YXRlLnYxLkNvbXB1dGVJbnN0YW5jZVN0YXR1cyI/ChRDb21wdXRlSW5zdGFuY2VJbWFnZRITCgtzb3VyY2VfdHlwZRgBIAEoCRISCgpzb3VyY2VfcmVmGAIgASgJIicKE0NvbXB1dGVJbnN0YW5jZURpc2sSEAoIc2l6ZV9naWIYASABKAUiPAoRTmV0d29ya0F0dGFjaG1lbnQSDgoGc3VibmV0GAEgASgJEhcKD3NlY3VyaXR5X2dyb3VwcxgCIAMoCSLvBgoTQ29tcHV0ZUluc3RhbmNlU3BlYxIQCgh0ZW1wbGF0ZRgBIAEoCRJZChN0ZW1wbGF0ZV9wYXJhbWV0ZXJzGAIgAygLMjwub3NhYy5wcml2YXRlLnYxLkNvbXB1dGVJbnN0YW5jZVNwZWMuVGVtcGxhdGVQYXJhbWV0ZXJzRW50cnkSPQoUcmVzdGFydF9yZXF1ZXN0ZWRfYXQYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wSACIAQESOQoFaW1hZ2UYBCABKAsyJS5vc2FjLnByaXZhdGUudjEuQ29tcHV0ZUluc3RhbmNlSW1hZ2VIAYgBARIbCg5zc2hfcHVibGljX2tleRgHIAEoCUgCiAEBEjwKCWJvb3RfZGlzaxgIIAEoCzIkLm9zYWMucHJpdmF0ZS52MS5Db21wdXRlSW5zdGFuY2VEaXNrSAOIAQESPgoQYWRkaXRpb25hbF9kaXNrcxgJIAMoCzIkLm9zYWMucHJpdmF0ZS52MS5Db21wdXRlSW5zdGFuY2VEaXNrEhkKDHJ1bl9zdHJhdGVneRgKIAEoCUgEiAEBEhYKCXVzZXJfZGF0YRgLIAEoCUgFiAEBEj8KE25ldHdvcmtfYXR0YWNobWVudHMYDiADKAsyIi5vc2FjLnByaXZhdGUudjEuTmV0d29ya0F0dGFjaG1lbnQSFAoMY2F0YWxvZ19pdGVtGA8gASgJEhcKCmlzX3dpbmRvd3MYECABKAhIBogBARIaCg1pbnN0YW5jZV90eXBlGBEgASgJSAeIAQEaTwoXVGVtcGxhdGVQYXJhbWV0ZXJzRW50cnkSCwoDa2V5GAEgASgJEiMKBXZhbHVlGAIgASgLMhQuZ29vZ2xlLnByb3RvYnVmLkFueToCOAFCFwoVX3Jlc3RhcnRfcmVxdWVzdGVkX2F0QggKBl9pbWFnZUIRCg9fc3NoX3B1YmxpY19rZXlCDAoKX2Jvb3RfZGlza0IPCg1fcnVuX3N0cmF0ZWd5QgwKCl91c2VyX2RhdGFCDQoLX2lzX3dpbmRvd3NCEAoOX2luc3RhbmNlX3R5cGVKBAgFEAZKBAgGEAdKBAgMEA1KBAgNEA5SBWNvcmVzUgptZW1vcnlfZ2liUgZzdWJuZXRSD3NlY3VyaXR5X2dyb3VwcyKlAgoVQ29tcHV0ZUluc3RhbmNlU3RhdHVzEjQKBXN0YXRlGAEgASgOMiUub3NhYy5wcml2YXRlLnYxLkNvbXB1dGVJbnN0YW5jZVN0YXRlEj0KCmNvbmRpdGlvbnMYAiADKAsyKS5vc2FjLnByaXZhdGUudjEuQ29tcHV0ZUluc3RhbmNlQ29uZGl0aW9uEhsKE2ludGVybmFsX2lwX2FkZHJlc3MYAyABKAkSCwoDaHViGAQgASgJEjoKEWxhc3RfcmVzdGFydGVkX2F0GAUgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEgAiAEBEhsKE2V4dGVybmFsX2lwX2FkZHJlc3MYBiABKAlCFAoSX2xhc3RfcmVzdGFydGVkX2F0IoUCChhDb21wdXRlSW5zdGFuY2VDb25kaXRpb24SOwoEdHlwZRgBIAEoDjItLm9zYWMucHJpdmF0ZS52MS5Db21wdXRlSW5zdGFuY2VDb25kaXRpb25UeXBlEjAKBnN0YXR1cxgCIAEoDjIgLm9zYWMucHJpdmF0ZS52MS5Db25kaXRpb25TdGF0dXMSOAoUbGFzdF90cmFuc2l0aW9uX3RpbWUYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEhMKBnJlYXNvbhgEIAEoCUgAiAEBEhQKB21lc3NhZ2UYBSABKAlIAYgBAUIJCgdfcmVhc29uQgoKCF9tZXNzYWdlKrsCChRDb21wdXRlSW5zdGFuY2VTdGF0ZRImCiJDT01QVVRFX0lOU1RBTkNFX1NUQVRFX1VOU1BFQ0lGSUVEEAASIwofQ09NUFVURV9JTlNUQU5DRV9TVEFURV9TVEFSVElORxABEiIKHkNPTVBVVEVfSU5TVEFOQ0VfU1RBVEVfUlVOTklORxACEiEKHUNPTVBVVEVfSU5TVEFOQ0VfU1RBVEVfRkFJTEVEEAMSIwofQ09NUFVURV9JTlNUQU5DRV9TVEFURV9ERUxFVElORxAEEiMKH0NPTVBVVEVfSU5TVEFOQ0VfU1RBVEVfU1RPUFBJTkcQBRIiCh5DT01QVVRFX0lOU1RBTkNFX1NUQVRFX1NUT1BQRUQQBhIhCh1DT01QVVRFX0lOU1RBTkNFX1NUQVRFX1BBVVNFRBAHKokDChxDb21wdXRlSW5zdGFuY2VDb25kaXRpb25UeXBlEi8KK0NPTVBVVEVfSU5TVEFOQ0VfQ09ORElUSU9OX1RZUEVfVU5TUEVDSUZJRUQQABI5CjVDT01QVVRFX0lOU1RBTkNFX0NPTkRJVElPTl9UWVBFX0NPTkZJR1VSQVRJT05fQVBQTElFRBABEikKJUNPTVBVVEVfSU5TVEFOQ0VfQ09ORElUSU9OX1RZUEVfUkVBRFkQAhI3CjNDT01QVVRFX0lOU1RBTkNFX0NPTkRJVElPTl9UWVBFX1JFU1RBUlRfSU5fUFJPR1JFU1MQAxIyCi5DT01QVVRFX0lOU1RBTkNFX0NPTkRJVElPTl9UWVBFX1JFU1RBUlRfRkFJTEVEEAQSLworQ09NUFVURV9JTlNUQU5DRV9DT05ESVRJT05fVFlQRV9QUk9WSVNJT05FRBAFEjQKMENPTVBVVEVfSU5TVEFOQ0VfQ09ORElUSU9OX1RZUEVfUkVTVEFSVF9SRVFVSVJFRBAGYgZwcm90bzM", [file_google_protobuf_any, file_google_protobuf_timestamp, file_osac_private_v1_condition_status_type, file_osac_private_v1_metadata_type]);
 
 /**
  * Contains the details about the compute instance that are available only for the system.
@@ -177,9 +177,9 @@ export type ComputeInstanceSpec = Message<"osac.private.v1.ComputeInstanceSpec">
   /**
    * SSH public key.
    *
-   * @generated from field: optional string ssh_key = 7;
+   * @generated from field: optional string ssh_public_key = 7;
    */
-  sshKey?: string | undefined;
+  sshPublicKey?: string | undefined;
 
   /**
    * Boot disk configuration.
@@ -284,11 +284,11 @@ export type ComputeInstanceStatus = Message<"osac.private.v1.ComputeInstanceStat
   lastRestartedAt?: Timestamp | undefined;
 
   /**
-   * Public IP address attached to the compute instance.
+   * External IP address attached to the compute instance.
    *
-   * @generated from field: string public_ip_address = 6;
+   * @generated from field: string external_ip_address = 6;
    */
-  publicIpAddress: string;
+  externalIpAddress: string;
 };
 
 /**
diff --git a/libs/types/src/osac/private/v1/event_type_pb.ts b/libs/types/src/osac/private/v1/event_type_pb.ts
index c4d41878..0afef42e 100644
--- a/libs/types/src/osac/private/v1/event_type_pb.ts
+++ b/libs/types/src/osac/private/v1/event_type_pb.ts
@@ -71,6 +71,8 @@ import type { RoleBinding } from "./role_binding_type_pb";
 import { file_osac_private_v1_role_binding_type } from "./role_binding_type_pb";
 import type { Role } from "./role_type_pb";
 import { file_osac_private_v1_role_type } from "./role_type_pb";
+import type { Secret } from "./secret_type_pb";
+import { file_osac_private_v1_secret_type } from "./secret_type_pb";
 import type { SecurityGroup } from "./security_group_type_pb";
 import { file_osac_private_v1_security_group_type } from "./security_group_type_pb";
 import type { StorageBackend } from "./storage_backend_type_pb";
@@ -89,7 +91,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file osac/private/v1/event_type.proto.
  */
 export const file_osac_private_v1_event_type: GenFile = /*@__PURE__*/
-  fileDesc("CiBvc2FjL3ByaXZhdGUvdjEvZXZlbnRfdHlwZS5wcm90bxIPb3NhYy5wcml2YXRlLnYxIuEPCgVFdmVudBIKCgJpZBgBIAEoCRIoCgR0eXBlGAIgASgOMhoub3NhYy5wcml2YXRlLnYxLkV2ZW50VHlwZRIrCgdjbHVzdGVyGAMgASgLMhgub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJIABI8ChBjbHVzdGVyX3RlbXBsYXRlGAQgASgLMiAub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJUZW1wbGF0ZUgAEi4KCWhvc3RfdHlwZRgFIAEoCzIZLm9zYWMucHJpdmF0ZS52MS5Ib3N0VHlwZUgAEiMKA2h1YhgGIAEoCzIULm9zYWMucHJpdmF0ZS52MS5IdWJIABJNChljb21wdXRlX2luc3RhbmNlX3RlbXBsYXRlGAcgASgLMigub3NhYy5wcml2YXRlLnYxLkNvbXB1dGVJbnN0YW5jZVRlbXBsYXRlSAASPAoQY29tcHV0ZV9pbnN0YW5jZRgIIAEoCzIgLm9zYWMucHJpdmF0ZS52MS5Db21wdXRlSW5zdGFuY2VIABI2Cg1uZXR3b3JrX2NsYXNzGAsgASgLMh0ub3NhYy5wcml2YXRlLnYxLk5ldHdvcmtDbGFzc0gAEikKBnN1Ym5ldBgMIAEoCzIXLm9zYWMucHJpdmF0ZS52MS5TdWJuZXRIABI6Cg92aXJ0dWFsX25ldHdvcmsYDSABKAsyHy5vc2FjLnByaXZhdGUudjEuVmlydHVhbE5ldHdvcmtIABI4Cg5zZWN1cml0eV9ncm91cBgOIAEoCzIeLm9zYWMucHJpdmF0ZS52MS5TZWN1cml0eUdyb3VwSAASNwoOcHVibGljX2lwX3Bvb2wYECABKAsyHS5vc2FjLnByaXZhdGUudjEuUHVibGljSVBQb29sSAASLgoJcHVibGljX2lwGBEgASgLMhkub3NhYy5wcml2YXRlLnYxLlB1YmxpY0lQSAASJQoEdXNlchgTIAEoCzIVLm9zYWMucHJpdmF0ZS52MS5Vc2VySAASJQoEcm9sZRgUIAEoCzIVLm9zYWMucHJpdmF0ZS52MS5Sb2xlSAASNAoMcm9sZV9iaW5kaW5nGBUgASgLMhwub3NhYy5wcml2YXRlLnYxLlJvbGVCaW5kaW5nSAASQwoUY2x1c3Rlcl9jYXRhbG9nX2l0ZW0YFiABKAsyIy5vc2FjLnByaXZhdGUudjEuQ2x1c3RlckNhdGFsb2dJdGVtSAASVAodY29tcHV0ZV9pbnN0YW5jZV9jYXRhbG9nX2l0ZW0YFyABKAsyKy5vc2FjLnByaXZhdGUudjEuQ29tcHV0ZUluc3RhbmNlQ2F0YWxvZ0l0ZW1IABIrCgdwcm9qZWN0GBggASgLMhgub3NhYy5wcml2YXRlLnYxLlByb2plY3RIABJDChRwdWJsaWNfaXBfYXR0YWNobWVudBgZIAEoCzIjLm9zYWMucHJpdmF0ZS52MS5QdWJsaWNJUEF0dGFjaG1lbnRIABI2Cg1pbnN0YW5jZV90eXBlGBogASgLMh0ub3NhYy5wcml2YXRlLnYxLkluc3RhbmNlVHlwZUgAEkEKE2JhcmVfbWV0YWxfaW5zdGFuY2UYGyABKAsyIi5vc2FjLnByaXZhdGUudjEuQmFyZU1ldGFsSW5zdGFuY2VIABJSChxiYXJlX21ldGFsX2luc3RhbmNlX3RlbXBsYXRlGBwgASgLMioub3NhYy5wcml2YXRlLnYxLkJhcmVNZXRhbEluc3RhbmNlVGVtcGxhdGVIABJZCiBiYXJlX21ldGFsX2luc3RhbmNlX2NhdGFsb2dfaXRlbRgdIAEoCzItLm9zYWMucHJpdmF0ZS52MS5CYXJlTWV0YWxJbnN0YW5jZUNhdGFsb2dJdGVtSAASOgoPc3RvcmFnZV9iYWNrZW5kGB4gASgLMh8ub3NhYy5wcml2YXRlLnYxLlN0b3JhZ2VCYWNrZW5kSAASKQoGdGVuYW50GB8gASgLMhcub3NhYy5wcml2YXRlLnYxLlRlbmFudEgAEj4KEWlkZW50aXR5X3Byb3ZpZGVyGCAgASgLMiEub3NhYy5wcml2YXRlLnYxLklkZW50aXR5UHJvdmlkZXJIABJAChJwcm9qZWN0X21lbWJlcnNoaXAYISABKAsyIi5vc2FjLnByaXZhdGUudjEuUHJvamVjdE1lbWJlcnNoaXBIABI7ChBleHRlcm5hbF9pcF9wb29sGCIgASgLMh8ub3NhYy5wcml2YXRlLnYxLkV4dGVybmFsSVBQb29sSAASMgoLZXh0ZXJuYWxfaXAYIyABKAsyGy5vc2FjLnByaXZhdGUudjEuRXh0ZXJuYWxJUEgAEkcKFmV4dGVybmFsX2lwX2F0dGFjaG1lbnQYJCABKAsyJS5vc2FjLnByaXZhdGUudjEuRXh0ZXJuYWxJUEF0dGFjaG1lbnRIABIyCgtuYXRfZ2F0ZXdheRglIAEoCzIbLm9zYWMucHJpdmF0ZS52MS5OQVRHYXRld2F5SAASOgoPY2x1c3Rlcl92ZXJzaW9uGCYgASgLMh8ub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJWZXJzaW9uSAASNAoMc3RvcmFnZV90aWVyGCcgASgLMhwub3NhYy5wcml2YXRlLnYxLlN0b3JhZ2VUaWVySABCCQoHcGF5bG9hZEoECBIQEyqkAQoJRXZlbnRUeXBlEhoKFkVWRU5UX1RZUEVfVU5TUEVDSUZJRUQQABIdChlFVkVOVF9UWVBFX09CSkVDVF9DUkVBVEVEEAESHQoZRVZFTlRfVFlQRV9PQkpFQ1RfVVBEQVRFRBACEh0KGUVWRU5UX1RZUEVfT0JKRUNUX0RFTEVURUQQAxIeChpFVkVOVF9UWVBFX09CSkVDVF9TSUdOQUxFRBAEYgZwcm90bzM", [file_osac_private_v1_baremetal_instance_catalog_item_type, file_osac_private_v1_baremetal_instance_template_type, file_osac_private_v1_baremetal_instance_type, file_osac_private_v1_cluster_catalog_item_type, file_osac_private_v1_cluster_template_type, file_osac_private_v1_cluster_version_type, file_osac_private_v1_cluster_type, file_osac_private_v1_compute_instance_catalog_item_type, file_osac_private_v1_compute_instance_template_type, file_osac_private_v1_compute_instance_type, file_osac_private_v1_external_ip_attachment_type, file_osac_private_v1_external_ip_pool_type, file_osac_private_v1_external_ip_type, file_osac_private_v1_host_type_type, file_osac_private_v1_hub_type, file_osac_private_v1_identity_provider_type, file_osac_private_v1_instance_type_type, file_osac_private_v1_nat_gateway_type, file_osac_private_v1_network_class_type, file_osac_private_v1_project_membership_type, file_osac_private_v1_project_type, file_osac_private_v1_tenant_type, file_osac_private_v1_public_ip_attachment_type, file_osac_private_v1_public_ip_pool_type, file_osac_private_v1_public_ip_type, file_osac_private_v1_role_binding_type, file_osac_private_v1_role_type, file_osac_private_v1_security_group_type, file_osac_private_v1_storage_backend_type, file_osac_private_v1_storage_tier_type, file_osac_private_v1_subnet_type, file_osac_private_v1_user_type, file_osac_private_v1_virtual_network_type]);
+  fileDesc("CiBvc2FjL3ByaXZhdGUvdjEvZXZlbnRfdHlwZS5wcm90bxIPb3NhYy5wcml2YXRlLnYxIowQCgVFdmVudBIKCgJpZBgBIAEoCRIoCgR0eXBlGAIgASgOMhoub3NhYy5wcml2YXRlLnYxLkV2ZW50VHlwZRIrCgdjbHVzdGVyGAMgASgLMhgub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJIABI8ChBjbHVzdGVyX3RlbXBsYXRlGAQgASgLMiAub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJUZW1wbGF0ZUgAEi4KCWhvc3RfdHlwZRgFIAEoCzIZLm9zYWMucHJpdmF0ZS52MS5Ib3N0VHlwZUgAEiMKA2h1YhgGIAEoCzIULm9zYWMucHJpdmF0ZS52MS5IdWJIABJNChljb21wdXRlX2luc3RhbmNlX3RlbXBsYXRlGAcgASgLMigub3NhYy5wcml2YXRlLnYxLkNvbXB1dGVJbnN0YW5jZVRlbXBsYXRlSAASPAoQY29tcHV0ZV9pbnN0YW5jZRgIIAEoCzIgLm9zYWMucHJpdmF0ZS52MS5Db21wdXRlSW5zdGFuY2VIABI2Cg1uZXR3b3JrX2NsYXNzGAsgASgLMh0ub3NhYy5wcml2YXRlLnYxLk5ldHdvcmtDbGFzc0gAEikKBnN1Ym5ldBgMIAEoCzIXLm9zYWMucHJpdmF0ZS52MS5TdWJuZXRIABI6Cg92aXJ0dWFsX25ldHdvcmsYDSABKAsyHy5vc2FjLnByaXZhdGUudjEuVmlydHVhbE5ldHdvcmtIABI4Cg5zZWN1cml0eV9ncm91cBgOIAEoCzIeLm9zYWMucHJpdmF0ZS52MS5TZWN1cml0eUdyb3VwSAASNwoOcHVibGljX2lwX3Bvb2wYECABKAsyHS5vc2FjLnByaXZhdGUudjEuUHVibGljSVBQb29sSAASLgoJcHVibGljX2lwGBEgASgLMhkub3NhYy5wcml2YXRlLnYxLlB1YmxpY0lQSAASJQoEdXNlchgTIAEoCzIVLm9zYWMucHJpdmF0ZS52MS5Vc2VySAASJQoEcm9sZRgUIAEoCzIVLm9zYWMucHJpdmF0ZS52MS5Sb2xlSAASNAoMcm9sZV9iaW5kaW5nGBUgASgLMhwub3NhYy5wcml2YXRlLnYxLlJvbGVCaW5kaW5nSAASQwoUY2x1c3Rlcl9jYXRhbG9nX2l0ZW0YFiABKAsyIy5vc2FjLnByaXZhdGUudjEuQ2x1c3RlckNhdGFsb2dJdGVtSAASVAodY29tcHV0ZV9pbnN0YW5jZV9jYXRhbG9nX2l0ZW0YFyABKAsyKy5vc2FjLnByaXZhdGUudjEuQ29tcHV0ZUluc3RhbmNlQ2F0YWxvZ0l0ZW1IABIrCgdwcm9qZWN0GBggASgLMhgub3NhYy5wcml2YXRlLnYxLlByb2plY3RIABJDChRwdWJsaWNfaXBfYXR0YWNobWVudBgZIAEoCzIjLm9zYWMucHJpdmF0ZS52MS5QdWJsaWNJUEF0dGFjaG1lbnRIABI2Cg1pbnN0YW5jZV90eXBlGBogASgLMh0ub3NhYy5wcml2YXRlLnYxLkluc3RhbmNlVHlwZUgAEkEKE2JhcmVfbWV0YWxfaW5zdGFuY2UYGyABKAsyIi5vc2FjLnByaXZhdGUudjEuQmFyZU1ldGFsSW5zdGFuY2VIABJSChxiYXJlX21ldGFsX2luc3RhbmNlX3RlbXBsYXRlGBwgASgLMioub3NhYy5wcml2YXRlLnYxLkJhcmVNZXRhbEluc3RhbmNlVGVtcGxhdGVIABJZCiBiYXJlX21ldGFsX2luc3RhbmNlX2NhdGFsb2dfaXRlbRgdIAEoCzItLm9zYWMucHJpdmF0ZS52MS5CYXJlTWV0YWxJbnN0YW5jZUNhdGFsb2dJdGVtSAASOgoPc3RvcmFnZV9iYWNrZW5kGB4gASgLMh8ub3NhYy5wcml2YXRlLnYxLlN0b3JhZ2VCYWNrZW5kSAASKQoGdGVuYW50GB8gASgLMhcub3NhYy5wcml2YXRlLnYxLlRlbmFudEgAEj4KEWlkZW50aXR5X3Byb3ZpZGVyGCAgASgLMiEub3NhYy5wcml2YXRlLnYxLklkZW50aXR5UHJvdmlkZXJIABJAChJwcm9qZWN0X21lbWJlcnNoaXAYISABKAsyIi5vc2FjLnByaXZhdGUudjEuUHJvamVjdE1lbWJlcnNoaXBIABI7ChBleHRlcm5hbF9pcF9wb29sGCIgASgLMh8ub3NhYy5wcml2YXRlLnYxLkV4dGVybmFsSVBQb29sSAASMgoLZXh0ZXJuYWxfaXAYIyABKAsyGy5vc2FjLnByaXZhdGUudjEuRXh0ZXJuYWxJUEgAEkcKFmV4dGVybmFsX2lwX2F0dGFjaG1lbnQYJCABKAsyJS5vc2FjLnByaXZhdGUudjEuRXh0ZXJuYWxJUEF0dGFjaG1lbnRIABIyCgtuYXRfZ2F0ZXdheRglIAEoCzIbLm9zYWMucHJpdmF0ZS52MS5OQVRHYXRld2F5SAASOgoPY2x1c3Rlcl92ZXJzaW9uGCYgASgLMh8ub3NhYy5wcml2YXRlLnYxLkNsdXN0ZXJWZXJzaW9uSAASNAoMc3RvcmFnZV90aWVyGCcgASgLMhwub3NhYy5wcml2YXRlLnYxLlN0b3JhZ2VUaWVySAASKQoGc2VjcmV0GCggASgLMhcub3NhYy5wcml2YXRlLnYxLlNlY3JldEgAQgkKB3BheWxvYWRKBAgSEBMqpAEKCUV2ZW50VHlwZRIaChZFVkVOVF9UWVBFX1VOU1BFQ0lGSUVEEAASHQoZRVZFTlRfVFlQRV9PQkpFQ1RfQ1JFQVRFRBABEh0KGUVWRU5UX1RZUEVfT0JKRUNUX1VQREFURUQQAhIdChlFVkVOVF9UWVBFX09CSkVDVF9ERUxFVEVEEAMSHgoaRVZFTlRfVFlQRV9PQkpFQ1RfU0lHTkFMRUQQBGIGcHJvdG8z", [file_osac_private_v1_baremetal_instance_catalog_item_type, file_osac_private_v1_baremetal_instance_template_type, file_osac_private_v1_baremetal_instance_type, file_osac_private_v1_cluster_catalog_item_type, file_osac_private_v1_cluster_template_type, file_osac_private_v1_cluster_version_type, file_osac_private_v1_cluster_type, file_osac_private_v1_compute_instance_catalog_item_type, file_osac_private_v1_compute_instance_template_type, file_osac_private_v1_compute_instance_type, file_osac_private_v1_external_ip_attachment_type, file_osac_private_v1_external_ip_pool_type, file_osac_private_v1_external_ip_type, file_osac_private_v1_host_type_type, file_osac_private_v1_hub_type, file_osac_private_v1_identity_provider_type, file_osac_private_v1_instance_type_type, file_osac_private_v1_nat_gateway_type, file_osac_private_v1_network_class_type, file_osac_private_v1_project_membership_type, file_osac_private_v1_project_type, file_osac_private_v1_tenant_type, file_osac_private_v1_public_ip_attachment_type, file_osac_private_v1_public_ip_pool_type, file_osac_private_v1_public_ip_type, file_osac_private_v1_role_binding_type, file_osac_private_v1_role_type, file_osac_private_v1_secret_type, file_osac_private_v1_security_group_type, file_osac_private_v1_storage_backend_type, file_osac_private_v1_storage_tier_type, file_osac_private_v1_subnet_type, file_osac_private_v1_user_type, file_osac_private_v1_virtual_network_type]);
 
 /**
  * Represents events delivered by the server.
@@ -314,6 +316,12 @@ export type Event = Message<"osac.private.v1.Event"> & {
      */
     value: StorageTier;
     case: "storageTier";
+  } | {
+    /**
+     * @generated from field: osac.private.v1.Secret secret = 40;
+     */
+    value: Secret;
+    case: "secret";
   } | { case: undefined; value?: undefined };
 };
 
diff --git a/libs/types/src/osac/private/v1/host_type_type_pb.ts b/libs/types/src/osac/private/v1/host_type_type_pb.ts
index 01071810..432c7fdc 100644
--- a/libs/types/src/osac/private/v1/host_type_type_pb.ts
+++ b/libs/types/src/osac/private/v1/host_type_type_pb.ts
@@ -28,6 +28,8 @@ export const file_osac_private_v1_host_type_type: GenFile = /*@__PURE__*/
   fileDesc("CiRvc2FjL3ByaXZhdGUvdjEvaG9zdF90eXBlX3R5cGUucHJvdG8SD29zYWMucHJpdmF0ZS52MSKeAQoISG9zdFR5cGUSCgoCaWQYASABKAkSKwoIbWV0YWRhdGEYAiABKAsyGS5vc2FjLnByaXZhdGUudjEuTWV0YWRhdGESDQoFdGl0bGUYAyABKAkSEwoLZGVzY3JpcHRpb24YBCABKAkSNQoKaW50ZXJmYWNlcxgFIAMoCzIhLm9zYWMucHJpdmF0ZS52MS5OZXR3b3JrSW50ZXJmYWNlIkMKEE5ldHdvcmtJbnRlcmZhY2USDAoEbmFtZRgBIAEoCRIMCgRyb2xlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJYgZwcm90bzM", [file_osac_private_v1_metadata_type]);
 
 /**
+ * buf:lint:ignore OSAC_OBJECT_SHAPE
+ *
  * @generated from message osac.private.v1.HostType
  */
 export type HostType = Message<"osac.private.v1.HostType"> & {
diff --git a/libs/types/src/osac/private/v1/network_class_type_pb.ts b/libs/types/src/osac/private/v1/network_class_type_pb.ts
index fb4ba11b..1ba5136e 100644
--- a/libs/types/src/osac/private/v1/network_class_type_pb.ts
+++ b/libs/types/src/osac/private/v1/network_class_type_pb.ts
@@ -44,6 +44,8 @@ export const file_osac_private_v1_network_class_type: GenFile = /*@__PURE__*/
  * creating VirtualNetworks. The `implementation_strategy` field is the key identifier that VirtualNetwork resources
  * reference to select their network backend.
  *
+ * buf:lint:ignore OSAC_OBJECT_SHAPE
+ *
  * @generated from message osac.private.v1.NetworkClass
  */
 export type NetworkClass = Message<"osac.private.v1.NetworkClass"> & {
diff --git a/libs/types/src/osac/private/v1/project_membership_type_pb.ts b/libs/types/src/osac/private/v1/project_membership_type_pb.ts
index 1fe9463d..5a4c1350 100644
--- a/libs/types/src/osac/private/v1/project_membership_type_pb.ts
+++ b/libs/types/src/osac/private/v1/project_membership_type_pb.ts
@@ -25,7 +25,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file osac/private/v1/project_membership_type.proto.
  */
 export const file_osac_private_v1_project_membership_type: GenFile = /*@__PURE__*/
-  fileDesc("Ci1vc2FjL3ByaXZhdGUvdjEvcHJvamVjdF9tZW1iZXJzaGlwX3R5cGUucHJvdG8SD29zYWMucHJpdmF0ZS52MSK8AQoRUHJvamVjdE1lbWJlcnNoaXASCgoCaWQYASABKAkSKwoIbWV0YWRhdGEYAiABKAsyGS5vc2FjLnByaXZhdGUudjEuTWV0YWRhdGESNAoEc3BlYxgDIAEoCzImLm9zYWMucHJpdmF0ZS52MS5Qcm9qZWN0TWVtYmVyc2hpcFNwZWMSOAoGc3RhdHVzGAQgASgLMigub3NhYy5wcml2YXRlLnYxLlByb2plY3RNZW1iZXJzaGlwU3RhdHVzIngKFVByb2plY3RNZW1iZXJzaGlwU3BlYxIPCgdwcm9qZWN0GAEgASgJEjQKBHJvbGUYAiABKA4yJi5vc2FjLnByaXZhdGUudjEuUHJvamVjdE1lbWJlcnNoaXBSb2xlEg4KBHVzZXIYAyABKAlIAEIICgZtZW1iZXIicwoXUHJvamVjdE1lbWJlcnNoaXBTdGF0dXMSNgoFc3RhdGUYASABKA4yJy5vc2FjLnByaXZhdGUudjEuUHJvamVjdE1lbWJlcnNoaXBTdGF0ZRIUCgdtZXNzYWdlGAIgASgJSACIAQFCCgoIX21lc3NhZ2UqiQEKFVByb2plY3RNZW1iZXJzaGlwUm9sZRInCiNQUk9KRUNUX01FTUJFUlNISVBfUk9MRV9VTlNQRUNJRklFRBAAEiIKHlBST0pFQ1RfTUVNQkVSU0hJUF9ST0xFX1ZJRVdFUhABEiMKH1BST0pFQ1RfTUVNQkVSU0hJUF9ST0xFX01BTkFHRVIQAiqxAQoWUHJvamVjdE1lbWJlcnNoaXBTdGF0ZRIoCiRQUk9KRUNUX01FTUJFUlNISVBfU1RBVEVfVU5TUEVDSUZJRUQQABIkCiBQUk9KRUNUX01FTUJFUlNISVBfU1RBVEVfUEVORElORxABEiIKHlBST0pFQ1RfTUVNQkVSU0hJUF9TVEFURV9SRUFEWRACEiMKH1BST0pFQ1RfTUVNQkVSU0hJUF9TVEFURV9GQUlMRUQQA2IGcHJvdG8z", [file_osac_private_v1_metadata_type]);
+  fileDesc("Ci1vc2FjL3ByaXZhdGUvdjEvcHJvamVjdF9tZW1iZXJzaGlwX3R5cGUucHJvdG8SD29zYWMucHJpdmF0ZS52MSK8AQoRUHJvamVjdE1lbWJlcnNoaXASCgoCaWQYASABKAkSKwoIbWV0YWRhdGEYAiABKAsyGS5vc2FjLnByaXZhdGUudjEuTWV0YWRhdGESNAoEc3BlYxgDIAEoCzImLm9zYWMucHJpdmF0ZS52MS5Qcm9qZWN0TWVtYmVyc2hpcFNwZWMSOAoGc3RhdHVzGAQgASgLMigub3NhYy5wcml2YXRlLnYxLlByb2plY3RNZW1iZXJzaGlwU3RhdHVzIlwKFVByb2plY3RNZW1iZXJzaGlwU3BlYxI0CgRyb2xlGAIgASgOMiYub3NhYy5wcml2YXRlLnYxLlByb2plY3RNZW1iZXJzaGlwUm9sZRINCgV1c2VycxgDIAMoCSKCAQoXUHJvamVjdE1lbWJlcnNoaXBTdGF0dXMSNgoFc3RhdGUYASABKA4yJy5vc2FjLnByaXZhdGUudjEuUHJvamVjdE1lbWJlcnNoaXBTdGF0ZRIUCgdtZXNzYWdlGAIgASgJSACIAQESDQoFdXNlcnMYAyADKAlCCgoIX21lc3NhZ2UqiQEKFVByb2plY3RNZW1iZXJzaGlwUm9sZRInCiNQUk9KRUNUX01FTUJFUlNISVBfUk9MRV9VTlNQRUNJRklFRBAAEiIKHlBST0pFQ1RfTUVNQkVSU0hJUF9ST0xFX1ZJRVdFUhABEiMKH1BST0pFQ1RfTUVNQkVSU0hJUF9ST0xFX01BTkFHRVIQAiqxAQoWUHJvamVjdE1lbWJlcnNoaXBTdGF0ZRIoCiRQUk9KRUNUX01FTUJFUlNISVBfU1RBVEVfVU5TUEVDSUZJRUQQABIkCiBQUk9KRUNUX01FTUJFUlNISVBfU1RBVEVfUEVORElORxABEiIKHlBST0pFQ1RfTUVNQkVSU0hJUF9TVEFURV9SRUFEWRACEiMKH1BST0pFQ1RfTUVNQkVSU0hJUF9TVEFURV9GQUlMRUQQA2IGcHJvdG8z", [file_osac_private_v1_metadata_type]);
 
 /**
  * ProjectMembership represents a member's association with a project and their role within it.
@@ -70,39 +70,25 @@ export const ProjectMembershipSchema: GenMessage<ProjectMembership> = /*@__PURE_
   messageDesc(file_osac_private_v1_project_membership_type, 0);
 
 /**
- * Describes a member of a project.
+ * Describes the members of a project.
  *
  * @generated from message osac.private.v1.ProjectMembershipSpec
  */
 export type ProjectMembershipSpec = Message<"osac.private.v1.ProjectMembershipSpec"> & {
   /**
-   * Reference to the project that this membership applies to. This is the unique identifier (ID) of the Project object,
-   * not the project name.
-   *
-   * @generated from field: string project = 1;
-   */
-  project: string;
-
-  /**
-   * Role of the member in the project. This indicates whether the member is a viewer, manager, etc.
+   * Role of the members in the project. This indicates whether the members are viewers, managers, etc.
    *
    * @generated from field: osac.private.v1.ProjectMembershipRole role = 2;
    */
   role: ProjectMembershipRole;
 
   /**
-   * Unique identifier of the member. Currently members are users (referenced by their User object ID), but this leaves
-   * room for adding other kinds of members in the future, like groups.
+   * Identifiers of the users that are members of the project. These are user identifiers (the `id` field of User
+   * objects), not usernames or email addresses.
    *
-   * @generated from oneof osac.private.v1.ProjectMembershipSpec.member
+   * @generated from field: repeated string users = 3;
    */
-  member: {
-    /**
-     * @generated from field: string user = 3;
-     */
-    value: string;
-    case: "user";
-  } | { case: undefined; value?: undefined };
+  users: string[];
 };
 
 /**
@@ -132,6 +118,15 @@ export type ProjectMembershipStatus = Message<"osac.private.v1.ProjectMembership
    * @generated from field: optional string message = 2;
    */
   message?: string | undefined;
+
+  /**
+   * List of user IDs that have been successfully synced to the identity provider. This tracks which users
+   * currently have the role assigned, allowing the controller to detect when users are added or removed from
+   * the membership.
+   *
+   * @generated from field: repeated string users = 3;
+   */
+  users: string[];
 };
 
 /**
diff --git a/libs/types/src/osac/private/v1/public_ip_type_pb.ts b/libs/types/src/osac/private/v1/public_ip_type_pb.ts
index c4ac03d8..f9a95ad4 100644
--- a/libs/types/src/osac/private/v1/public_ip_type_pb.ts
+++ b/libs/types/src/osac/private/v1/public_ip_type_pb.ts
@@ -22,14 +22,13 @@ import type { IPFamily } from "./ip_family_type_pb";
 import { file_osac_private_v1_ip_family_type } from "./ip_family_type_pb";
 import type { Metadata } from "./metadata_type_pb";
 import { file_osac_private_v1_metadata_type } from "./metadata_type_pb";
-import { file_osac_private_v1_public_ip_pool_type } from "./public_ip_pool_type_pb";
 import type { Message } from "@bufbuild/protobuf";
 
 /**
  * Describes the file osac/private/v1/public_ip_type.proto.
  */
 export const file_osac_private_v1_public_ip_type: GenFile = /*@__PURE__*/
-  fileDesc("CiRvc2FjL3ByaXZhdGUvdjEvcHVibGljX2lwX3R5cGUucHJvdG8SD29zYWMucHJpdmF0ZS52MSKhAQoIUHVibGljSVASCgoCaWQYASABKAkSKwoIbWV0YWRhdGEYAiABKAsyGS5vc2FjLnByaXZhdGUudjEuTWV0YWRhdGESKwoEc3BlYxgDIAEoCzIdLm9zYWMucHJpdmF0ZS52MS5QdWJsaWNJUFNwZWMSLwoGc3RhdHVzGAQgASgLMh8ub3NhYy5wcml2YXRlLnYxLlB1YmxpY0lQU3RhdHVzIlQKDFB1YmxpY0lQU3BlYxIRCgRwb29sGAEgASgJQgPgQQUSMQoJaXBfZmFtaWx5GAIgASgOMhkub3NhYy5wcml2YXRlLnYxLklQRmFtaWx5QgPgQQUivQEKDlB1YmxpY0lQU3RhdHVzEjIKBXN0YXRlGAEgASgOMh4ub3NhYy5wcml2YXRlLnYxLlB1YmxpY0lQU3RhdGVCA+BBAxIZCgdtZXNzYWdlGAIgASgJQgPgQQNIAIgBARIQCgNodWIYAyABKAlCA+BBAxIUCgdhZGRyZXNzGAQgASgJQgPgQQMSEQoEcG9vbBgFIAEoCUID4EEDEhUKCGF0dGFjaGVkGAYgASgIQgPgQQNCCgoIX21lc3NhZ2UqpgEKDVB1YmxpY0lQU3RhdGUSHwobUFVCTElDX0lQX1NUQVRFX1VOU1BFQ0lGSUVEEAASGwoXUFVCTElDX0lQX1NUQVRFX1BFTkRJTkcQARIdChlQVUJMSUNfSVBfU1RBVEVfQUxMT0NBVEVEEAISGgoWUFVCTElDX0lQX1NUQVRFX0ZBSUxFRBADEhwKGFBVQkxJQ19JUF9TVEFURV9ERUxFVElORxAEYgZwcm90bzM", [file_google_api_field_behavior, file_osac_private_v1_ip_family_type, file_osac_private_v1_metadata_type, file_osac_private_v1_public_ip_pool_type]);
+  fileDesc("CiRvc2FjL3ByaXZhdGUvdjEvcHVibGljX2lwX3R5cGUucHJvdG8SD29zYWMucHJpdmF0ZS52MSKhAQoIUHVibGljSVASCgoCaWQYASABKAkSKwoIbWV0YWRhdGEYAiABKAsyGS5vc2FjLnByaXZhdGUudjEuTWV0YWRhdGESKwoEc3BlYxgDIAEoCzIdLm9zYWMucHJpdmF0ZS52MS5QdWJsaWNJUFNwZWMSLwoGc3RhdHVzGAQgASgLMh8ub3NhYy5wcml2YXRlLnYxLlB1YmxpY0lQU3RhdHVzIlQKDFB1YmxpY0lQU3BlYxIRCgRwb29sGAEgASgJQgPgQQUSMQoJaXBfZmFtaWx5GAIgASgOMhkub3NhYy5wcml2YXRlLnYxLklQRmFtaWx5QgPgQQUivQEKDlB1YmxpY0lQU3RhdHVzEjIKBXN0YXRlGAEgASgOMh4ub3NhYy5wcml2YXRlLnYxLlB1YmxpY0lQU3RhdGVCA+BBAxIZCgdtZXNzYWdlGAIgASgJQgPgQQNIAIgBARIQCgNodWIYAyABKAlCA+BBAxIUCgdhZGRyZXNzGAQgASgJQgPgQQMSEQoEcG9vbBgFIAEoCUID4EEDEhUKCGF0dGFjaGVkGAYgASgIQgPgQQNCCgoIX21lc3NhZ2UqpgEKDVB1YmxpY0lQU3RhdGUSHwobUFVCTElDX0lQX1NUQVRFX1VOU1BFQ0lGSUVEEAASGwoXUFVCTElDX0lQX1NUQVRFX1BFTkRJTkcQARIdChlQVUJMSUNfSVBfU1RBVEVfQUxMT0NBVEVEEAISGgoWUFVCTElDX0lQX1NUQVRFX0ZBSUxFRBADEhwKGFBVQkxJQ19JUF9TVEFURV9ERUxFVElORxAEYgZwcm90bzM", [file_google_api_field_behavior, file_osac_private_v1_ip_family_type, file_osac_private_v1_metadata_type]);
 
 /**
  * Represents a public IP address allocated from a PublicIPPool.
diff --git a/libs/types/src/osac/private/v1/secret_type_pb.ts b/libs/types/src/osac/private/v1/secret_type_pb.ts
new file mode 100644
index 00000000..43921c4a
--- /dev/null
+++ b/libs/types/src/osac/private/v1/secret_type_pb.ts
@@ -0,0 +1,167 @@
+//
+// Copyright (c) 2026 Red Hat, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+// an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations under the License.
+//
+
+// @generated by protoc-gen-es v2.12.0 with parameter "target=ts"
+// @generated from file osac/private/v1/secret_type.proto (package osac.private.v1, syntax proto3)
+/* eslint-disable */
+
+import type { GenEnum, GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
+import { enumDesc, fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
+import type { Metadata } from "./metadata_type_pb";
+import { file_osac_private_v1_metadata_type } from "./metadata_type_pb";
+import type { Message } from "@bufbuild/protobuf";
+
+/**
+ * Describes the file osac/private/v1/secret_type.proto.
+ */
+export const file_osac_private_v1_secret_type: GenFile = /*@__PURE__*/
+  fileDesc("CiFvc2FjL3ByaXZhdGUvdjEvc2VjcmV0X3R5cGUucHJvdG8SD29zYWMucHJpdmF0ZS52MSKbAQoGU2VjcmV0EgoKAmlkGAEgASgJEisKCG1ldGFkYXRhGAIgASgLMhkub3NhYy5wcml2YXRlLnYxLk1ldGFkYXRhEikKBHNwZWMYAyABKAsyGy5vc2FjLnByaXZhdGUudjEuU2VjcmV0U3BlYxItCgZzdGF0dXMYBCABKAsyHS5vc2FjLnByaXZhdGUudjEuU2VjcmV0U3RhdHVzIpYCCgpTZWNyZXRTcGVjEjMKBGRhdGEYASADKAsyJS5vc2FjLnByaXZhdGUudjEuU2VjcmV0U3BlYy5EYXRhRW50cnkSLwoHYmFja2VuZBgCIAEoDjIeLm9zYWMucHJpdmF0ZS52MS5TZWNyZXRCYWNrZW5kEkEKC2Nvb3JkaW5hdGVzGAMgAygLMiwub3NhYy5wcml2YXRlLnYxLlNlY3JldFNwZWMuQ29vcmRpbmF0ZXNFbnRyeRorCglEYXRhRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgMOgI4ARoyChBDb29yZGluYXRlc0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToCOAEiiwEKDFNlY3JldFN0YXR1cxJGCg1yZXNvbHZlZF9kYXRhGAEgAygLMi8ub3NhYy5wcml2YXRlLnYxLlNlY3JldFN0YXR1cy5SZXNvbHZlZERhdGFFbnRyeRozChFSZXNvbHZlZERhdGFFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAw6AjgBKmEKDVNlY3JldEJhY2tlbmQSHgoaU0VDUkVUX0JBQ0tFTkRfVU5TUEVDSUZJRUQQABIYChRTRUNSRVRfQkFDS0VORF9WQVVMVBABEhYKElNFQ1JFVF9CQUNLRU5EX0hVQhACYgZwcm90bzM", [file_osac_private_v1_metadata_type]);
+
+/**
+ * Represents a secret containing opaque key-value data.
+ *
+ * Secrets store sensitive information such as TLS certificates, pull secrets, and credentials. Each secret holds a map
+ * of named binary values and optionally references a storage backend (such as Vault or Hub) for external secret
+ * management. The `coordinates` field carries backend-specific location metadata used to resolve the secret in the
+ * external system.
+ *
+ * @generated from message osac.private.v1.Secret
+ */
+export type Secret = Message<"osac.private.v1.Secret"> & {
+  /**
+   * Unique identifier of the secret.
+   *
+   * @generated from field: string id = 1;
+   */
+  id: string;
+
+  /**
+   * Metadata of the secret.
+   *
+   * @generated from field: osac.private.v1.Metadata metadata = 2;
+   */
+  metadata?: Metadata | undefined;
+
+  /**
+   * Desired state of the secret.
+   *
+   * @generated from field: osac.private.v1.SecretSpec spec = 3;
+   */
+  spec?: SecretSpec | undefined;
+
+  /**
+   * Observed state of the secret, populated by the server.
+   *
+   * @generated from field: osac.private.v1.SecretStatus status = 4;
+   */
+  status?: SecretStatus | undefined;
+};
+
+/**
+ * Describes the message osac.private.v1.Secret.
+ * Use `create(SecretSchema)` to create a new message.
+ */
+export const SecretSchema: GenMessage<Secret> = /*@__PURE__*/
+  messageDesc(file_osac_private_v1_secret_type, 0);
+
+/**
+ * Desired state of a secret.
+ *
+ * @generated from message osac.private.v1.SecretSpec
+ */
+export type SecretSpec = Message<"osac.private.v1.SecretSpec"> & {
+  /**
+   * Opaque key-value data. Each key identifies a named entry (for example, `crt` or `key`) and the
+   * corresponding value is the raw secret material.
+   *
+   * @generated from field: map<string, bytes> data = 1;
+   */
+  data: { [key: string]: Uint8Array };
+
+  /**
+   * Storage backend used to manage this secret.
+   *
+   * @generated from field: osac.private.v1.SecretBackend backend = 2;
+   */
+  backend: SecretBackend;
+
+  /**
+   * Backend-specific location metadata.
+   *
+   * @generated from field: map<string, string> coordinates = 3;
+   */
+  coordinates: { [key: string]: string };
+};
+
+/**
+ * Describes the message osac.private.v1.SecretSpec.
+ * Use `create(SecretSpecSchema)` to create a new message.
+ */
+export const SecretSpecSchema: GenMessage<SecretSpec> = /*@__PURE__*/
+  messageDesc(file_osac_private_v1_secret_type, 1);
+
+/**
+ * Observed state of a secret, populated by the server.
+ *
+ * @generated from message osac.private.v1.SecretStatus
+ */
+export type SecretStatus = Message<"osac.private.v1.SecretStatus"> & {
+  /**
+   * The secret's resolved key-value data. Present in Get responses; omitted from List responses.
+   *
+   * @generated from field: map<string, bytes> resolved_data = 1;
+   */
+  resolvedData: { [key: string]: Uint8Array };
+};
+
+/**
+ * Describes the message osac.private.v1.SecretStatus.
+ * Use `create(SecretStatusSchema)` to create a new message.
+ */
+export const SecretStatusSchema: GenMessage<SecretStatus> = /*@__PURE__*/
+  messageDesc(file_osac_private_v1_secret_type, 2);
+
+/**
+ * Storage backends for secret management.
+ *
+ * @generated from enum osac.private.v1.SecretBackend
+ */
+export enum SecretBackend {
+  /**
+   * Backend is unknown or the secret is stored inline.
+   *
+   * @generated from enum value: SECRET_BACKEND_UNSPECIFIED = 0;
+   */
+  UNSPECIFIED = 0,
+
+  /**
+   * Secret is managed by HashiCorp Vault.
+   *
+   * @generated from enum value: SECRET_BACKEND_VAULT = 1;
+   */
+  VAULT = 1,
+
+  /**
+   * Secret is managed by the OSAC Hub.
+   *
+   * @generated from enum value: SECRET_BACKEND_HUB = 2;
+   */
+  HUB = 2,
+}
+
+/**
+ * Describes the enum osac.private.v1.SecretBackend.
+ */
+export const SecretBackendSchema: GenEnum<SecretBackend> = /*@__PURE__*/
+  enumDesc(file_osac_private_v1_secret_type, 0);
+
diff --git a/libs/types/src/osac/private/v1/secrets_service_pb.ts b/libs/types/src/osac/private/v1/secrets_service_pb.ts
new file mode 100644
index 00000000..4c4593f4
--- /dev/null
+++ b/libs/types/src/osac/private/v1/secrets_service_pb.ts
@@ -0,0 +1,378 @@
+//
+// Copyright (c) 2026 Red Hat, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+// an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations under the License.
+//
+
+// @generated by protoc-gen-es v2.12.0 with parameter "target=ts"
+// @generated from file osac/private/v1/secrets_service.proto (package osac.private.v1, syntax proto3)
+/* eslint-disable */
+
+import type { GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
+import { fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";
+import { file_google_api_annotations } from "../../../google/api/annotations_pb";
+import type { FieldMask } from "../../../google/protobuf/field_mask_pb";
+import { file_google_protobuf_field_mask } from "../../../google/protobuf/field_mask_pb";
+import type { Secret } from "./secret_type_pb";
+import { file_osac_private_v1_secret_type } from "./secret_type_pb";
+import type { Message } from "@bufbuild/protobuf";
+
+/**
+ * Describes the file osac/private/v1/secrets_service.proto.
+ */
+export const file_osac_private_v1_secrets_service: GenFile = /*@__PURE__*/
+  fileDesc("CiVvc2FjL3ByaXZhdGUvdjEvc2VjcmV0c19zZXJ2aWNlLnByb3RvEg9vc2FjLnByaXZhdGUudjEikAEKElNlY3JldHNMaXN0UmVxdWVzdBITCgZvZmZzZXQYASABKAVIAIgBARISCgVsaW1pdBgCIAEoBUgBiAEBEhMKBmZpbHRlchgDIAEoCUgCiAEBEhIKBW9yZGVyGAQgASgJSAOIAQFCCQoHX29mZnNldEIICgZfbGltaXRCCQoHX2ZpbHRlckIICgZfb3JkZXIiWgoTU2VjcmV0c0xpc3RSZXNwb25zZRIMCgRzaXplGAEgASgFEg0KBXRvdGFsGAIgASgFEiYKBWl0ZW1zGAMgAygLMhcub3NhYy5wcml2YXRlLnYxLlNlY3JldCIfChFTZWNyZXRzR2V0UmVxdWVzdBIKCgJpZBgBIAEoCSI9ChJTZWNyZXRzR2V0UmVzcG9uc2USJwoGb2JqZWN0GAEgASgLMhcub3NhYy5wcml2YXRlLnYxLlNlY3JldCI/ChRTZWNyZXRzQ3JlYXRlUmVxdWVzdBInCgZvYmplY3QYASABKAsyFy5vc2FjLnByaXZhdGUudjEuU2VjcmV0IkAKFVNlY3JldHNDcmVhdGVSZXNwb25zZRInCgZvYmplY3QYASABKAsyFy5vc2FjLnByaXZhdGUudjEuU2VjcmV0In4KFFNlY3JldHNVcGRhdGVSZXF1ZXN0EicKBm9iamVjdBgBIAEoCzIXLm9zYWMucHJpdmF0ZS52MS5TZWNyZXQSLwoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrEgwKBGxvY2sYAyABKAgiQAoVU2VjcmV0c1VwZGF0ZVJlc3BvbnNlEicKBm9iamVjdBgBIAEoCzIXLm9zYWMucHJpdmF0ZS52MS5TZWNyZXQiIgoUU2VjcmV0c0RlbGV0ZVJlcXVlc3QSCgoCaWQYASABKAkiFwoVU2VjcmV0c0RlbGV0ZVJlc3BvbnNlIiIKFFNlY3JldHNTaWduYWxSZXF1ZXN0EgoKAmlkGAEgASgJIhcKFVNlY3JldHNTaWduYWxSZXNwb25zZTL3BQoHU2VjcmV0cxJyCgRMaXN0EiMub3NhYy5wcml2YXRlLnYxLlNlY3JldHNMaXN0UmVxdWVzdBokLm9zYWMucHJpdmF0ZS52MS5TZWNyZXRzTGlzdFJlc3BvbnNlIh+C0+STAhkSFy9hcGkvcHJpdmF0ZS92MS9zZWNyZXRzEnwKA0dldBIiLm9zYWMucHJpdmF0ZS52MS5TZWNyZXRzR2V0UmVxdWVzdBojLm9zYWMucHJpdmF0ZS52MS5TZWNyZXRzR2V0UmVzcG9uc2UiLILT5JMCJmIGb2JqZWN0EhwvYXBpL3ByaXZhdGUvdjEvc2VjcmV0cy97aWR9EogBCgZDcmVhdGUSJS5vc2FjLnByaXZhdGUudjEuU2VjcmV0c0NyZWF0ZVJlcXVlc3QaJi5vc2FjLnByaXZhdGUudjEuU2VjcmV0c0NyZWF0ZVJlc3BvbnNlIi+C0+STAik6Bm9iamVjdGIGb2JqZWN0IhcvYXBpL3ByaXZhdGUvdjEvc2VjcmV0cxKUAQoGVXBkYXRlEiUub3NhYy5wcml2YXRlLnYxLlNlY3JldHNVcGRhdGVSZXF1ZXN0GiYub3NhYy5wcml2YXRlLnYxLlNlY3JldHNVcGRhdGVSZXNwb25zZSI7gtPkkwI1OgZvYmplY3RiBm9iamVjdDIjL2FwaS9wcml2YXRlL3YxL3NlY3JldHMve29iamVjdC5pZH0SfQoGRGVsZXRlEiUub3NhYy5wcml2YXRlLnYxLlNlY3JldHNEZWxldGVSZXF1ZXN0GiYub3NhYy5wcml2YXRlLnYxLlNlY3JldHNEZWxldGVSZXNwb25zZSIkgtPkkwIeKhwvYXBpL3ByaXZhdGUvdjEvc2VjcmV0cy97aWR9ElkKBlNpZ25hbBIlLm9zYWMucHJpdmF0ZS52MS5TZWNyZXRzU2lnbmFsUmVxdWVzdBomLm9zYWMucHJpdmF0ZS52MS5TZWNyZXRzU2lnbmFsUmVzcG9uc2UiAGIGcHJvdG8z", [file_google_api_annotations, file_google_protobuf_field_mask, file_osac_private_v1_secret_type]);
+
+/**
+ * @generated from message osac.private.v1.SecretsListRequest
+ */
+export type SecretsListRequest = Message<"osac.private.v1.SecretsListRequest"> & {
+  /**
+   * Index of the first result. If not specified the default value will be zero.
+   *
+   * @generated from field: optional int32 offset = 1;
+   */
+  offset?: number | undefined;
+
+  /**
+   * Maximum number of results to be returned by the server. When not specified all the results will be returned. Note
+   * that there may not be enough results to return, and that the server may decide, for performance reasons, to return
+   * less results than requested.
+   *
+   * @generated from field: optional int32 limit = 2;
+   */
+  limit?: number | undefined;
+
+  /**
+   * Filter criteria.
+   *
+   * The value of this parameter is a [CEL](https://cel.dev) expression used to select which objects to return. The
+   * built-in `this` variable refers to the object being tested and `now` refers to the current date and time. If the
+   * expression evaluates to `true` the object is included in the results. For example, to retrieve all secrets with
+   * a Vault backend:
+   *
+   *     this.spec.backend == SECRET_BACKEND_VAULT
+   *
+   * If this isn't provided, or if the value is empty, then all the secrets that the user has permission to see will be
+   * returned. Not all CEL constructs are currently supported for implementation reasons; see the filter documentation
+   * (docs/FILTER.md) for the full details.
+   *
+   * @generated from field: optional string filter = 3;
+   */
+  filter?: string | undefined;
+
+  /**
+   * Order criteria.
+   *
+   * The syntax of this parameter is similar to the syntax of the _order by_ clause of a SQL statement, but using the
+   * names of the attributes of the secret instead of the names of the columns of a table. For example, in order to
+   * sort the secrets descending by name the value should be:
+   *
+   *     metadata.name desc
+   *
+   * If the parameter isn't provided, or if the value is empty, then the order of the results is undefined.
+   *
+   * @generated from field: optional string order = 4;
+   */
+  order?: string | undefined;
+};
+
+/**
+ * Describes the message osac.private.v1.SecretsListRequest.
+ * Use `create(SecretsListRequestSchema)` to create a new message.
+ */
+export const SecretsListRequestSchema: GenMessage<SecretsListRequest> = /*@__PURE__*/
+  messageDesc(file_osac_private_v1_secrets_service, 0);
+
+/**
+ * @generated from message osac.private.v1.SecretsListResponse
+ */
+export type SecretsListResponse = Message<"osac.private.v1.SecretsListResponse"> & {
+  /**
+   * Actual number of items returned. Note that this may be smaller than the value requested in the `limit` parameter
+   * of the request if there are not enough items, or if the system decides that returning that number of items isn't
+   * feasible or convenient for performance reasons.
+   *
+   * @generated from field: int32 size = 1;
+   */
+  size: number;
+
+  /**
+   * Total number of items of the collection that match the search criteria, regardless of the number of results
+   * requested with the `limit` parameter.
+   *
+   * @generated from field: int32 total = 2;
+   */
+  total: number;
+
+  /**
+   * List of results.
+   *
+   * @generated from field: repeated osac.private.v1.Secret items = 3;
+   */
+  items: Secret[];
+};
+
+/**
+ * Describes the message osac.private.v1.SecretsListResponse.
+ * Use `create(SecretsListResponseSchema)` to create a new message.
+ */
+export const SecretsListResponseSchema: GenMessage<SecretsListResponse> = /*@__PURE__*/
+  messageDesc(file_osac_private_v1_secrets_service, 1);
+
+/**
+ * @generated from message osac.private.v1.SecretsGetRequest
+ */
+export type SecretsGetRequest = Message<"osac.private.v1.SecretsGetRequest"> & {
+  /**
+   * @generated from field: string id = 1;
+   */
+  id: string;
+};
+
+/**
+ * Describes the message osac.private.v1.SecretsGetRequest.
+ * Use `create(SecretsGetRequestSchema)` to create a new message.
+ */
+export const SecretsGetRequestSchema: GenMessage<SecretsGetRequest> = /*@__PURE__*/
+  messageDesc(file_osac_private_v1_secrets_service, 2);
+
+/**
+ * @generated from message osac.private.v1.SecretsGetResponse
+ */
+export type SecretsGetResponse = Message<"osac.private.v1.SecretsGetResponse"> & {
+  /**
+   * @generated from field: osac.private.v1.Secret object = 1;
+   */
+  object?: Secret | undefined;
+};
+
+/**
+ * Describes the message osac.private.v1.SecretsGetResponse.
+ * Use `create(SecretsGetResponseSchema)` to create a new message.
+ */
+export const SecretsGetResponseSchema: GenMessage<SecretsGetResponse> = /*@__PURE__*/
+  messageDesc(file_osac_private_v1_secrets_service, 3);
+
+/**
+ * @generated from message osac.private.v1.SecretsCreateRequest
+ */
+export type SecretsCreateRequest = Message<"osac.private.v1.SecretsCreateRequest"> & {
+  /**
+   * @generated from field: osac.private.v1.Secret object = 1;
+   */
+  object?: Secret | undefined;
+};
+
+/**
+ * Describes the message osac.private.v1.SecretsCreateRequest.
+ * Use `create(SecretsCreateRequestSchema)` to create a new message.
+ */
+export const SecretsCreateRequestSchema: GenMessage<SecretsCreateRequest> = /*@__PURE__*/
+  messageDesc(file_osac_private_v1_secrets_service, 4);
+
+/**
+ * @generated from message osac.private.v1.SecretsCreateResponse
+ */
+export type SecretsCreateResponse = Message<"osac.private.v1.SecretsCreateResponse"> & {
+  /**
+   * @generated from field: osac.private.v1.Secret object = 1;
+   */
+  object?: Secret | undefined;
+};
+
+/**
+ * Describes the message osac.private.v1.SecretsCreateResponse.
+ * Use `create(SecretsCreateResponseSchema)` to create a new message.
+ */
+export const SecretsCreateResponseSchema: GenMessage<SecretsCreateResponse> = /*@__PURE__*/
+  messageDesc(file_osac_private_v1_secrets_service, 5);
+
+/**
+ * @generated from message osac.private.v1.SecretsUpdateRequest
+ */
+export type SecretsUpdateRequest = Message<"osac.private.v1.SecretsUpdateRequest"> & {
+  /**
+   * @generated from field: osac.private.v1.Secret object = 1;
+   */
+  object?: Secret | undefined;
+
+  /**
+   * @generated from field: google.protobuf.FieldMask update_mask = 2;
+   */
+  updateMask?: FieldMask | undefined;
+
+  /**
+   * Lock enables optimistic locking. When set to true, the server verifies that the current version of the object
+   * matches the value of the metadata.version field of the submitted object. If they differ the update will be
+   * rejected. This is useful to prevent lost updates when multiple clients are modifying the same object concurrently.
+   *
+   * @generated from field: bool lock = 3;
+   */
+  lock: boolean;
+};
+
+/**
+ * Describes the message osac.private.v1.SecretsUpdateRequest.
+ * Use `create(SecretsUpdateRequestSchema)` to create a new message.
+ */
+export const SecretsUpdateRequestSchema: GenMessage<SecretsUpdateRequest> = /*@__PURE__*/
+  messageDesc(file_osac_private_v1_secrets_service, 6);
+
+/**
+ * @generated from message osac.private.v1.SecretsUpdateResponse
+ */
+export type SecretsUpdateResponse = Message<"osac.private.v1.SecretsUpdateResponse"> & {
+  /**
+   * @generated from field: osac.private.v1.Secret object = 1;
+   */
+  object?: Secret | undefined;
+};
+
+/**
+ * Describes the message osac.private.v1.SecretsUpdateResponse.
+ * Use `create(SecretsUpdateResponseSchema)` to create a new message.
+ */
+export const SecretsUpdateResponseSchema: GenMessage<SecretsUpdateResponse> = /*@__PURE__*/
+  messageDesc(file_osac_private_v1_secrets_service, 7);
+
+/**
+ * @generated from message osac.private.v1.SecretsDeleteRequest
+ */
+export type SecretsDeleteRequest = Message<"osac.private.v1.SecretsDeleteRequest"> & {
+  /**
+   * @generated from field: string id = 1;
+   */
+  id: string;
+};
+
+/**
+ * Describes the message osac.private.v1.SecretsDeleteRequest.
+ * Use `create(SecretsDeleteRequestSchema)` to create a new message.
+ */
+export const SecretsDeleteRequestSchema: GenMessage<SecretsDeleteRequest> = /*@__PURE__*/
+  messageDesc(file_osac_private_v1_secrets_service, 8);
+
+/**
+ * @generated from message osac.private.v1.SecretsDeleteResponse
+ */
+export type SecretsDeleteResponse = Message<"osac.private.v1.SecretsDeleteResponse"> & {
+};
+
+/**
+ * Describes the message osac.private.v1.SecretsDeleteResponse.
+ * Use `create(SecretsDeleteResponseSchema)` to create a new message.
+ */
+export const SecretsDeleteResponseSchema: GenMessage<SecretsDeleteResponse> = /*@__PURE__*/
+  messageDesc(file_osac_private_v1_secrets_service, 9);
+
+/**
+ * @generated from message osac.private.v1.SecretsSignalRequest
+ */
+export type SecretsSignalRequest = Message<"osac.private.v1.SecretsSignalRequest"> & {
+  /**
+   * @generated from field: string id = 1;
+   */
+  id: string;
+};
+
+/**
+ * Describes the message osac.private.v1.SecretsSignalRequest.
+ * Use `create(SecretsSignalRequestSchema)` to create a new message.
+ */
+export const SecretsSignalRequestSchema: GenMessage<SecretsSignalRequest> = /*@__PURE__*/
+  messageDesc(file_osac_private_v1_secrets_service, 10);
+
+/**
+ * @generated from message osac.private.v1.SecretsSignalResponse
+ */
+export type SecretsSignalResponse = Message<"osac.private.v1.SecretsSignalResponse"> & {
+};
+
+/**
+ * Describes the message osac.private.v1.SecretsSignalResponse.
+ * Use `create(SecretsSignalResponseSchema)` to create a new message.
+ */
+export const SecretsSignalResponseSchema: GenMessage<SecretsSignalResponse> = /*@__PURE__*/
+  messageDesc(file_osac_private_v1_secrets_service, 11);
+
+/**
+ * Service for managing secrets through the private API.
+ *
+ * Provides full CRUD access to secrets, including backend and coordinates fields that are not exposed through the
+ * public API. Used by controllers and administrators for secret lifecycle management and synchronization with
+ * external storage backends.
+ *
+ * @generated from service osac.private.v1.Secrets
+ */
+export const Secrets: GenService<{
+  /**
+   * Retrieves the list of secrets.
+   *
+   * @generated from rpc osac.private.v1.Secrets.List
+   */
+  list: {
+    methodKind: "unary";
+    input: typeof SecretsListRequestSchema;
+    output: typeof SecretsListResponseSchema;
+  },
+  /**
+   * Retrieves the details of one specific secret.
+   *
+   * @generated from rpc osac.private.v1.Secrets.Get
+   */
+  get: {
+    methodKind: "unary";
+    input: typeof SecretsGetRequestSchema;
+    output: typeof SecretsGetResponseSchema;
+  },
+  /**
+   * Creates a new secret.
+   *
+   * @generated from rpc osac.private.v1.Secrets.Create
+   */
+  create: {
+    methodKind: "unary";
+    input: typeof SecretsCreateRequestSchema;
+    output: typeof SecretsCreateResponseSchema;
+  },
+  /**
+   * Updates an existing secret.
+   *
+   * @generated from rpc osac.private.v1.Secrets.Update
+   */
+  update: {
+    methodKind: "unary";
+    input: typeof SecretsUpdateRequestSchema;
+    output: typeof SecretsUpdateResponseSchema;
+  },
+  /**
+   * Deletes a secret.
+   *
+   * @generated from rpc osac.private.v1.Secrets.Delete
+   */
+  delete: {
+    methodKind: "unary";
+    input: typeof SecretsDeleteRequestSchema;
+    output: typeof SecretsDeleteResponseSchema;
+  },
+  /**
+   * Signals that the secret may need reconciliation with its storage backend.
+   *
+   * @generated from rpc osac.private.v1.Secrets.Signal
+   */
+  signal: {
+    methodKind: "unary";
+    input: typeof SecretsSignalRequestSchema;
+    output: typeof SecretsSignalResponseSchema;
+  },
+}> = /*@__PURE__*/
+  serviceDesc(file_osac_private_v1_secrets_service, 0);
+
diff --git a/libs/types/src/osac/public/v1/baremetal_instance_catalog_item_type_pb.ts b/libs/types/src/osac/public/v1/baremetal_instance_catalog_item_type_pb.ts
index 34fd50a9..88dbb749 100644
--- a/libs/types/src/osac/public/v1/baremetal_instance_catalog_item_type_pb.ts
+++ b/libs/types/src/osac/public/v1/baremetal_instance_catalog_item_type_pb.ts
@@ -33,6 +33,8 @@ export const file_osac_public_v1_baremetal_instance_catalog_item_type: GenFile =
  * A bare metal instance catalog item defines a curated hardware offering that references an underlying bare metal
  * instance template.
  *
+ * buf:lint:ignore OSAC_OBJECT_SHAPE
+ *
  * @generated from message osac.public.v1.BareMetalInstanceCatalogItem
  */
 export type BareMetalInstanceCatalogItem = Message<"osac.public.v1.BareMetalInstanceCatalogItem"> & {
diff --git a/libs/types/src/osac/public/v1/baremetal_instance_template_type_pb.ts b/libs/types/src/osac/public/v1/baremetal_instance_template_type_pb.ts
index a2c73b03..45cbb5e3 100644
--- a/libs/types/src/osac/public/v1/baremetal_instance_template_type_pb.ts
+++ b/libs/types/src/osac/public/v1/baremetal_instance_template_type_pb.ts
@@ -35,6 +35,8 @@ export const file_osac_public_v1_baremetal_instance_template_type: GenFile = /*@
  * A bare metal instance template defines a hardware profile (host type, OS image, network configuration)
  * that can be used to create bare metal instances via a catalog item.
  *
+ * buf:lint:ignore OSAC_OBJECT_SHAPE
+ *
  * @generated from message osac.public.v1.BareMetalInstanceTemplate
  */
 export type BareMetalInstanceTemplate = Message<"osac.public.v1.BareMetalInstanceTemplate"> & {
diff --git a/libs/types/src/osac/public/v1/cluster_catalog_item_type_pb.ts b/libs/types/src/osac/public/v1/cluster_catalog_item_type_pb.ts
index d9064289..5e753aca 100644
--- a/libs/types/src/osac/public/v1/cluster_catalog_item_type_pb.ts
+++ b/libs/types/src/osac/public/v1/cluster_catalog_item_type_pb.ts
@@ -33,6 +33,8 @@ export const file_osac_public_v1_cluster_catalog_item_type: GenFile = /*@__PURE_
  * A cluster catalog item defines a curated infrastructure offering that references an underlying cluster template.
  * Admins control which fields users can set, enforce defaults, and validate input via JSON Schema.
  *
+ * buf:lint:ignore OSAC_OBJECT_SHAPE
+ *
  * @generated from message osac.public.v1.ClusterCatalogItem
  */
 export type ClusterCatalogItem = Message<"osac.public.v1.ClusterCatalogItem"> & {
diff --git a/libs/types/src/osac/public/v1/cluster_template_type_pb.ts b/libs/types/src/osac/public/v1/cluster_template_type_pb.ts
index 4f5cf2d5..b70b7b01 100644
--- a/libs/types/src/osac/public/v1/cluster_template_type_pb.ts
+++ b/libs/types/src/osac/public/v1/cluster_template_type_pb.ts
@@ -35,6 +35,8 @@ export const file_osac_public_v1_cluster_template_type: GenFile = /*@__PURE__*/
  * A cluster template defines a type of cluster that can be created by the user. Note that the user doesn't create these
  * templates: the system provides a collection of them, and the user chooses one.
  *
+ * buf:lint:ignore OSAC_OBJECT_SHAPE
+ *
  * @generated from message osac.public.v1.ClusterTemplate
  */
 export type ClusterTemplate = Message<"osac.public.v1.ClusterTemplate"> & {
diff --git a/libs/types/src/osac/public/v1/cluster_type_pb.ts b/libs/types/src/osac/public/v1/cluster_type_pb.ts
index f2ec7add..96830175 100644
--- a/libs/types/src/osac/public/v1/cluster_type_pb.ts
+++ b/libs/types/src/osac/public/v1/cluster_type_pb.ts
@@ -31,7 +31,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file osac/public/v1/cluster_type.proto.
  */
 export const file_osac_public_v1_cluster_type: GenFile = /*@__PURE__*/
-  fileDesc("CiFvc2FjL3B1YmxpYy92MS9jbHVzdGVyX3R5cGUucHJvdG8SDm9zYWMucHVibGljLnYxIpsBCgdDbHVzdGVyEgoKAmlkGAEgASgJEioKCG1ldGFkYXRhGAIgASgLMhgub3NhYy5wdWJsaWMudjEuTWV0YWRhdGESKQoEc3BlYxgDIAEoCzIbLm9zYWMucHVibGljLnYxLkNsdXN0ZXJTcGVjEi0KBnN0YXR1cxgEIAEoCzIdLm9zYWMucHVibGljLnYxLkNsdXN0ZXJTdGF0dXMi9wQKC0NsdXN0ZXJTcGVjEhAKCHRlbXBsYXRlGAEgASgJElAKE3RlbXBsYXRlX3BhcmFtZXRlcnMYAiADKAsyMy5vc2FjLnB1YmxpYy52MS5DbHVzdGVyU3BlYy5UZW1wbGF0ZVBhcmFtZXRlcnNFbnRyeRI8Cglub2RlX3NldHMYAyADKAsyKS5vc2FjLnB1YmxpYy52MS5DbHVzdGVyU3BlYy5Ob2RlU2V0c0VudHJ5EhgKC3B1bGxfc2VjcmV0GAQgASgJSACIAQESGwoOc3NoX3B1YmxpY19rZXkYBSABKAlIAYgBARIaCg1yZWxlYXNlX2ltYWdlGAYgASgJSAKIAQESNAoHbmV0d29yaxgHIAEoCzIeLm9zYWMucHVibGljLnYxLkNsdXN0ZXJOZXR3b3JrSAOIAQESFAoMY2F0YWxvZ19pdGVtGAggASgJEkQKEm5ldHdvcmtfYXR0YWNobWVudBgJIAEoCzIoLm9zYWMucHVibGljLnYxLkNsdXN0ZXJOZXR3b3JrQXR0YWNobWVudBpPChdUZW1wbGF0ZVBhcmFtZXRlcnNFbnRyeRILCgNrZXkYASABKAkSIwoFdmFsdWUYAiABKAsyFC5nb29nbGUucHJvdG9idWYuQW55OgI4ARpPCg1Ob2RlU2V0c0VudHJ5EgsKA2tleRgBIAEoCRItCgV2YWx1ZRgCIAEoCzIeLm9zYWMucHVibGljLnYxLkNsdXN0ZXJOb2RlU2V0OgI4AUIOCgxfcHVsbF9zZWNyZXRCEQoPX3NzaF9wdWJsaWNfa2V5QhAKDl9yZWxlYXNlX2ltYWdlQgoKCF9uZXR3b3JrImAKDkNsdXN0ZXJOZXR3b3JrEhUKCHBvZF9jaWRyGAEgASgJSACIAQESGQoMc2VydmljZV9jaWRyGAIgASgJSAGIAQFCCwoJX3BvZF9jaWRyQg8KDV9zZXJ2aWNlX2NpZHIi2QIKDUNsdXN0ZXJTdGF0dXMSKwoFc3RhdGUYASABKA4yHC5vc2FjLnB1YmxpYy52MS5DbHVzdGVyU3RhdGUSNAoKY29uZGl0aW9ucxgCIAMoCzIgLm9zYWMucHVibGljLnYxLkNsdXN0ZXJDb25kaXRpb24SDwoHYXBpX3VybBgDIAEoCRITCgtjb25zb2xlX3VybBgEIAEoCRI+Cglub2RlX3NldHMYBSADKAsyKy5vc2FjLnB1YmxpYy52MS5DbHVzdGVyU3RhdHVzLk5vZGVTZXRzRW50cnkSFAoMYXBpX2VuZHBvaW50GAYgASgJEhgKEGluZ3Jlc3NfZW5kcG9pbnQYByABKAkaTwoNTm9kZVNldHNFbnRyeRILCgNrZXkYASABKAkSLQoFdmFsdWUYAiABKAsyHi5vc2FjLnB1YmxpYy52MS5DbHVzdGVyTm9kZVNldDoCOAEi8wEKEENsdXN0ZXJDb25kaXRpb24SMgoEdHlwZRgBIAEoDjIkLm9zYWMucHVibGljLnYxLkNsdXN0ZXJDb25kaXRpb25UeXBlEi8KBnN0YXR1cxgCIAEoDjIfLm9zYWMucHVibGljLnYxLkNvbmRpdGlvblN0YXR1cxI4ChRsYXN0X3RyYW5zaXRpb25fdGltZRgDIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASEwoGcmVhc29uGAQgASgJSACIAQESFAoHbWVzc2FnZRgFIAEoCUgBiAEBQgkKB19yZWFzb25CCgoIX21lc3NhZ2UiQwoYQ2x1c3Rlck5ldHdvcmtBdHRhY2htZW50Eg4KBnN1Ym5ldBgBIAEoCRIXCg9zZWN1cml0eV9ncm91cHMYAiADKAkiMQoOQ2x1c3Rlck5vZGVTZXQSEQoJaG9zdF90eXBlGAEgASgJEgwKBHNpemUYAiABKAUqfwoMQ2x1c3RlclN0YXRlEh0KGUNMVVNURVJfU1RBVEVfVU5TUEVDSUZJRUQQABIdChlDTFVTVEVSX1NUQVRFX1BST0dSRVNTSU5HEAESFwoTQ0xVU1RFUl9TVEFURV9SRUFEWRACEhgKFENMVVNURVJfU1RBVEVfRkFJTEVEEAMq0AEKFENsdXN0ZXJDb25kaXRpb25UeXBlEiYKIkNMVVNURVJfQ09ORElUSU9OX1RZUEVfVU5TUEVDSUZJRUQQABImCiJDTFVTVEVSX0NPTkRJVElPTl9UWVBFX1BST0dSRVNTSU5HEAESIAocQ0xVU1RFUl9DT05ESVRJT05fVFlQRV9SRUFEWRACEiEKHUNMVVNURVJfQ09ORElUSU9OX1RZUEVfRkFJTEVEEAMSIwofQ0xVU1RFUl9DT05ESVRJT05fVFlQRV9ERUdSQURFRBAEYgZwcm90bzM", [file_google_protobuf_any, file_google_protobuf_timestamp, file_osac_public_v1_condition_status_type, file_osac_public_v1_metadata_type]);
+  fileDesc("CiFvc2FjL3B1YmxpYy92MS9jbHVzdGVyX3R5cGUucHJvdG8SDm9zYWMucHVibGljLnYxIpsBCgdDbHVzdGVyEgoKAmlkGAEgASgJEioKCG1ldGFkYXRhGAIgASgLMhgub3NhYy5wdWJsaWMudjEuTWV0YWRhdGESKQoEc3BlYxgDIAEoCzIbLm9zYWMucHVibGljLnYxLkNsdXN0ZXJTcGVjEi0KBnN0YXR1cxgEIAEoCzIdLm9zYWMucHVibGljLnYxLkNsdXN0ZXJTdGF0dXMi9wQKC0NsdXN0ZXJTcGVjEhAKCHRlbXBsYXRlGAEgASgJElAKE3RlbXBsYXRlX3BhcmFtZXRlcnMYAiADKAsyMy5vc2FjLnB1YmxpYy52MS5DbHVzdGVyU3BlYy5UZW1wbGF0ZVBhcmFtZXRlcnNFbnRyeRI8Cglub2RlX3NldHMYAyADKAsyKS5vc2FjLnB1YmxpYy52MS5DbHVzdGVyU3BlYy5Ob2RlU2V0c0VudHJ5EhgKC3B1bGxfc2VjcmV0GAQgASgJSACIAQESGwoOc3NoX3B1YmxpY19rZXkYBSABKAlIAYgBARIaCg1yZWxlYXNlX2ltYWdlGAYgASgJSAKIAQESNAoHbmV0d29yaxgHIAEoCzIeLm9zYWMucHVibGljLnYxLkNsdXN0ZXJOZXR3b3JrSAOIAQESFAoMY2F0YWxvZ19pdGVtGAggASgJEkQKEm5ldHdvcmtfYXR0YWNobWVudBgJIAEoCzIoLm9zYWMucHVibGljLnYxLkNsdXN0ZXJOZXR3b3JrQXR0YWNobWVudBpPChdUZW1wbGF0ZVBhcmFtZXRlcnNFbnRyeRILCgNrZXkYASABKAkSIwoFdmFsdWUYAiABKAsyFC5nb29nbGUucHJvdG9idWYuQW55OgI4ARpPCg1Ob2RlU2V0c0VudHJ5EgsKA2tleRgBIAEoCRItCgV2YWx1ZRgCIAEoCzIeLm9zYWMucHVibGljLnYxLkNsdXN0ZXJOb2RlU2V0OgI4AUIOCgxfcHVsbF9zZWNyZXRCEQoPX3NzaF9wdWJsaWNfa2V5QhAKDl9yZWxlYXNlX2ltYWdlQgoKCF9uZXR3b3JrImAKDkNsdXN0ZXJOZXR3b3JrEhUKCHBvZF9jaWRyGAEgASgJSACIAQESGQoMc2VydmljZV9jaWRyGAIgASgJSAGIAQFCCwoJX3BvZF9jaWRyQg8KDV9zZXJ2aWNlX2NpZHIi2QIKDUNsdXN0ZXJTdGF0dXMSKwoFc3RhdGUYASABKA4yHC5vc2FjLnB1YmxpYy52MS5DbHVzdGVyU3RhdGUSNAoKY29uZGl0aW9ucxgCIAMoCzIgLm9zYWMucHVibGljLnYxLkNsdXN0ZXJDb25kaXRpb24SDwoHYXBpX3VybBgDIAEoCRITCgtjb25zb2xlX3VybBgEIAEoCRI+Cglub2RlX3NldHMYBSADKAsyKy5vc2FjLnB1YmxpYy52MS5DbHVzdGVyU3RhdHVzLk5vZGVTZXRzRW50cnkSFAoMYXBpX2VuZHBvaW50GAYgASgJEhgKEGluZ3Jlc3NfZW5kcG9pbnQYByABKAkaTwoNTm9kZVNldHNFbnRyeRILCgNrZXkYASABKAkSLQoFdmFsdWUYAiABKAsyHi5vc2FjLnB1YmxpYy52MS5DbHVzdGVyTm9kZVNldDoCOAEi8wEKEENsdXN0ZXJDb25kaXRpb24SMgoEdHlwZRgBIAEoDjIkLm9zYWMucHVibGljLnYxLkNsdXN0ZXJDb25kaXRpb25UeXBlEi8KBnN0YXR1cxgCIAEoDjIfLm9zYWMucHVibGljLnYxLkNvbmRpdGlvblN0YXR1cxI4ChRsYXN0X3RyYW5zaXRpb25fdGltZRgDIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASEwoGcmVhc29uGAQgASgJSACIAQESFAoHbWVzc2FnZRgFIAEoCUgBiAEBQgkKB19yZWFzb25CCgoIX21lc3NhZ2UiQwoYQ2x1c3Rlck5ldHdvcmtBdHRhY2htZW50Eg4KBnN1Ym5ldBgBIAEoCRIXCg9zZWN1cml0eV9ncm91cHMYAiADKAkiMQoOQ2x1c3Rlck5vZGVTZXQSEQoJaG9zdF90eXBlGAEgASgJEgwKBHNpemUYAiABKAUqvAEKDENsdXN0ZXJTdGF0ZRIdChlDTFVTVEVSX1NUQVRFX1VOU1BFQ0lGSUVEEAASHQoZQ0xVU1RFUl9TVEFURV9QUk9HUkVTU0lORxABEhcKE0NMVVNURVJfU1RBVEVfUkVBRFkQAhIYChRDTFVTVEVSX1NUQVRFX0ZBSUxFRBADEhoKFkNMVVNURVJfU1RBVEVfREVMRVRJTkcQBBIfChtDTFVTVEVSX1NUQVRFX0RFTEVURV9GQUlMRUQQBSrQAQoUQ2x1c3RlckNvbmRpdGlvblR5cGUSJgoiQ0xVU1RFUl9DT05ESVRJT05fVFlQRV9VTlNQRUNJRklFRBAAEiYKIkNMVVNURVJfQ09ORElUSU9OX1RZUEVfUFJPR1JFU1NJTkcQARIgChxDTFVTVEVSX0NPTkRJVElPTl9UWVBFX1JFQURZEAISIQodQ0xVU1RFUl9DT05ESVRJT05fVFlQRV9GQUlMRUQQAxIjCh9DTFVTVEVSX0NPTkRJVElPTl9UWVBFX0RFR1JBREVEEARiBnByb3RvMw", [file_google_protobuf_any, file_google_protobuf_timestamp, file_osac_public_v1_condition_status_type, file_osac_public_v1_metadata_type]);
 
 /**
  * Contains the details of the cluster.
@@ -581,6 +581,25 @@ export enum ClusterState {
    * @generated from enum value: CLUSTER_STATE_FAILED = 3;
    */
   FAILED = 3,
+
+  /**
+   * The cluster is being deprovisioned.
+   *
+   * The cluster will be archived once deletion completes successfully.
+   *
+   * @generated from enum value: CLUSTER_STATE_DELETING = 4;
+   */
+  DELETING = 4,
+
+  /**
+   * The cluster deletion has failed.
+   *
+   * The deprovision operation encountered an error and could not complete.
+   * The status conditions will contain specific error details.
+   *
+   * @generated from enum value: CLUSTER_STATE_DELETE_FAILED = 5;
+   */
+  DELETE_FAILED = 5,
 }
 
 /**
diff --git a/libs/types/src/osac/public/v1/cluster_version_type_pb.ts b/libs/types/src/osac/public/v1/cluster_version_type_pb.ts
index 8045b5e9..d8d58956 100644
--- a/libs/types/src/osac/public/v1/cluster_version_type_pb.ts
+++ b/libs/types/src/osac/public/v1/cluster_version_type_pb.ts
@@ -17,6 +17,7 @@
 
 import type { GenEnum, GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
 import { enumDesc, fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
+import { file_buf_validate_validate } from "../../../buf/validate/validate_pb";
 import { file_google_api_field_behavior } from "../../../google/api/field_behavior_pb";
 import type { Timestamp } from "../../../google/protobuf/timestamp_pb";
 import { file_google_protobuf_timestamp } from "../../../google/protobuf/timestamp_pb";
@@ -28,14 +29,14 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file osac/public/v1/cluster_version_type.proto.
  */
 export const file_osac_public_v1_cluster_version_type: GenFile = /*@__PURE__*/
-  fileDesc("Cilvc2FjL3B1YmxpYy92MS9jbHVzdGVyX3ZlcnNpb25fdHlwZS5wcm90bxIOb3NhYy5wdWJsaWMudjEinAEKGUNsdXN0ZXJWZXJzaW9uRGVwcmVjYXRpb24SPgoVZGVwcmVjYXRpb25fdGltZXN0YW1wGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEj8KFm9ic29sZXNjZW5jZV90aW1lc3RhbXAYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMiNgodQ2x1c3RlclZlcnNpb25BbGxvd2VkVXBncmFkZXMSFQoNdmVyc2lvbl9uYW1lcxgBIAMoCSKwAQoOQ2x1c3RlclZlcnNpb24SCgoCaWQYASABKAkSKgoIbWV0YWRhdGEYAiABKAsyGC5vc2FjLnB1YmxpYy52MS5NZXRhZGF0YRIwCgRzcGVjGAMgASgLMiIub3NhYy5wdWJsaWMudjEuQ2x1c3RlclZlcnNpb25TcGVjEjQKBnN0YXR1cxgEIAEoCzIkLm9zYWMucHVibGljLnYxLkNsdXN0ZXJWZXJzaW9uU3RhdHVzIs0CChJDbHVzdGVyVmVyc2lvblNwZWMSGQoHZW5hYmxlZBgCIAEoCEID4EEBSACIAQESHAoKaXNfZGVmYXVsdBgDIAEoCEID4EEBSAGIAQESNwoFc3RhdGUYBCABKA4yIy5vc2FjLnB1YmxpYy52MS5DbHVzdGVyVmVyc2lvblN0YXRlQgPgQQESQwoLZGVwcmVjYXRpb24YBSABKAsyKS5vc2FjLnB1YmxpYy52MS5DbHVzdGVyVmVyc2lvbkRlcHJlY2F0aW9uQgPgQQESFwoHdmVyc2lvbhgGIAEoCUIG4EEC4EEFEkwKEGFsbG93ZWRfdXBncmFkZXMYByABKAsyLS5vc2FjLnB1YmxpYy52MS5DbHVzdGVyVmVyc2lvbkFsbG93ZWRVcGdyYWRlc0ID4EEBQgoKCF9lbmFibGVkQg0KC19pc19kZWZhdWx0IhYKFENsdXN0ZXJWZXJzaW9uU3RhdHVzKqgBChNDbHVzdGVyVmVyc2lvblN0YXRlEiUKIUNMVVNURVJfVkVSU0lPTl9TVEFURV9VTlNQRUNJRklFRBAAEiAKHENMVVNURVJfVkVSU0lPTl9TVEFURV9BQ1RJVkUQARIkCiBDTFVTVEVSX1ZFUlNJT05fU1RBVEVfREVQUkVDQVRFRBACEiIKHkNMVVNURVJfVkVSU0lPTl9TVEFURV9PQlNPTEVURRADYgZwcm90bzM", [file_google_api_field_behavior, file_google_protobuf_timestamp, file_osac_public_v1_metadata_type]);
+  fileDesc("Cilvc2FjL3B1YmxpYy92MS9jbHVzdGVyX3ZlcnNpb25fdHlwZS5wcm90bxIOb3NhYy5wdWJsaWMudjEinAEKGUNsdXN0ZXJWZXJzaW9uRGVwcmVjYXRpb24SPgoVZGVwcmVjYXRpb25fdGltZXN0YW1wGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEj8KFm9ic29sZXNjZW5jZV90aW1lc3RhbXAYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMiSwodQ2x1c3RlclZlcnNpb25BbGxvd2VkVXBncmFkZXMSKgoNdmVyc2lvbl9uYW1lcxgBIAMoCUITukgQkgENEOgHGAEiBnIEEAEYPyKwAQoOQ2x1c3RlclZlcnNpb24SCgoCaWQYASABKAkSKgoIbWV0YWRhdGEYAiABKAsyGC5vc2FjLnB1YmxpYy52MS5NZXRhZGF0YRIwCgRzcGVjGAMgASgLMiIub3NhYy5wdWJsaWMudjEuQ2x1c3RlclZlcnNpb25TcGVjEjQKBnN0YXR1cxgEIAEoCzIkLm9zYWMucHVibGljLnYxLkNsdXN0ZXJWZXJzaW9uU3RhdHVzIs0CChJDbHVzdGVyVmVyc2lvblNwZWMSGQoHZW5hYmxlZBgCIAEoCEID4EEBSACIAQESHAoKaXNfZGVmYXVsdBgDIAEoCEID4EEBSAGIAQESNwoFc3RhdGUYBCABKA4yIy5vc2FjLnB1YmxpYy52MS5DbHVzdGVyVmVyc2lvblN0YXRlQgPgQQESQwoLZGVwcmVjYXRpb24YBSABKAsyKS5vc2FjLnB1YmxpYy52MS5DbHVzdGVyVmVyc2lvbkRlcHJlY2F0aW9uQgPgQQESFwoHdmVyc2lvbhgGIAEoCUIG4EEC4EEFEkwKEGFsbG93ZWRfdXBncmFkZXMYByABKAsyLS5vc2FjLnB1YmxpYy52MS5DbHVzdGVyVmVyc2lvbkFsbG93ZWRVcGdyYWRlc0ID4EEBQgoKCF9lbmFibGVkQg0KC19pc19kZWZhdWx0IhYKFENsdXN0ZXJWZXJzaW9uU3RhdHVzKqgBChNDbHVzdGVyVmVyc2lvblN0YXRlEiUKIUNMVVNURVJfVkVSU0lPTl9TVEFURV9VTlNQRUNJRklFRBAAEiAKHENMVVNURVJfVkVSU0lPTl9TVEFURV9BQ1RJVkUQARIkCiBDTFVTVEVSX1ZFUlNJT05fU1RBVEVfREVQUkVDQVRFRBACEiIKHkNMVVNURVJfVkVSU0lPTl9TVEFURV9PQlNPTEVURRADYgZwcm90bzM", [file_buf_validate_validate, file_google_api_field_behavior, file_google_protobuf_timestamp, file_osac_public_v1_metadata_type]);
 
 /**
  * Contains deprecation details for a cluster version.
  *
  * The timestamps are managed by the server during lifecycle state transitions. The deprecation_timestamp is set when
- * the version transitions to DEPRECATED, and the obsolescence_timestamp is set when it transitions to OBSOLETE. Both
- * are cleared if the version returns to ACTIVE.
+ * the version transitions to DEPRECATED, and the obsolescence_timestamp is set when it transitions to OBSOLETE.
+ * Timestamps are retained as historical record when the version returns to ACTIVE.
  *
  * @generated from message osac.public.v1.ClusterVersionDeprecation
  */
@@ -76,6 +77,7 @@ export type ClusterVersionAllowedUpgrades = Message<"osac.public.v1.ClusterVersi
   /**
    * ClusterVersion names (metadata.name). Must reference existing, non-deleted ClusterVersions. When a target
    * version is deleted, it is automatically removed from all lists.
+   * No duplicate or empty entries are allowed.
    *
    * @generated from field: repeated string version_names = 1;
    */
@@ -257,7 +259,7 @@ export enum ClusterVersionState {
    * The cluster version is fully available for new cluster creation.
    *
    * This is the default state assigned on creation. Returning to ACTIVE from DEPRECATED or OBSOLETE
-   * clears the corresponding deprecation timestamps.
+   * retains the corresponding deprecation timestamps as historical record.
    *
    * @generated from enum value: CLUSTER_VERSION_STATE_ACTIVE = 1;
    */
diff --git a/libs/types/src/osac/public/v1/compute_instance_catalog_item_type_pb.ts b/libs/types/src/osac/public/v1/compute_instance_catalog_item_type_pb.ts
index 9f5d9c87..68c91c7a 100644
--- a/libs/types/src/osac/public/v1/compute_instance_catalog_item_type_pb.ts
+++ b/libs/types/src/osac/public/v1/compute_instance_catalog_item_type_pb.ts
@@ -33,6 +33,8 @@ export const file_osac_public_v1_compute_instance_catalog_item_type: GenFile = /
  * A compute instance catalog item defines a curated infrastructure offering that references an underlying compute
  * instance template.
  *
+ * buf:lint:ignore OSAC_OBJECT_SHAPE
+ *
  * @generated from message osac.public.v1.ComputeInstanceCatalogItem
  */
 export type ComputeInstanceCatalogItem = Message<"osac.public.v1.ComputeInstanceCatalogItem"> & {
diff --git a/libs/types/src/osac/public/v1/compute_instance_template_type_pb.ts b/libs/types/src/osac/public/v1/compute_instance_template_type_pb.ts
index bec6820f..fe6c61e7 100644
--- a/libs/types/src/osac/public/v1/compute_instance_template_type_pb.ts
+++ b/libs/types/src/osac/public/v1/compute_instance_template_type_pb.ts
@@ -35,6 +35,8 @@ export const file_osac_public_v1_compute_instance_template_type: GenFile = /*@__
  * A compute instance template defines a type of compute instance that can be created by the user. Note that the user doesn't create these
  * templates: the system provides a collection of them, and the user chooses one.
  *
+ * buf:lint:ignore OSAC_OBJECT_SHAPE
+ *
  * @generated from message osac.public.v1.ComputeInstanceTemplate
  */
 export type ComputeInstanceTemplate = Message<"osac.public.v1.ComputeInstanceTemplate"> & {
diff --git a/libs/types/src/osac/public/v1/compute_instance_type_pb.ts b/libs/types/src/osac/public/v1/compute_instance_type_pb.ts
index 3c3eaf1f..9409181d 100644
--- a/libs/types/src/osac/public/v1/compute_instance_type_pb.ts
+++ b/libs/types/src/osac/public/v1/compute_instance_type_pb.ts
@@ -31,7 +31,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file osac/public/v1/compute_instance_type.proto.
  */
 export const file_osac_public_v1_compute_instance_type: GenFile = /*@__PURE__*/
-  fileDesc("Cipvc2FjL3B1YmxpYy92MS9jb21wdXRlX2luc3RhbmNlX3R5cGUucHJvdG8SDm9zYWMucHVibGljLnYxIrMBCg9Db21wdXRlSW5zdGFuY2USCgoCaWQYASABKAkSKgoIbWV0YWRhdGEYAiABKAsyGC5vc2FjLnB1YmxpYy52MS5NZXRhZGF0YRIxCgRzcGVjGAMgASgLMiMub3NhYy5wdWJsaWMudjEuQ29tcHV0ZUluc3RhbmNlU3BlYxI1CgZzdGF0dXMYBCABKAsyJS5vc2FjLnB1YmxpYy52MS5Db21wdXRlSW5zdGFuY2VTdGF0dXMiPwoUQ29tcHV0ZUluc3RhbmNlSW1hZ2USEwoLc291cmNlX3R5cGUYASABKAkSEgoKc291cmNlX3JlZhgCIAEoCSInChNDb21wdXRlSW5zdGFuY2VEaXNrEhAKCHNpemVfZ2liGAEgASgFIjwKEU5ldHdvcmtBdHRhY2htZW50Eg4KBnN1Ym5ldBgBIAEoCRIXCg9zZWN1cml0eV9ncm91cHMYAiADKAki3AYKE0NvbXB1dGVJbnN0YW5jZVNwZWMSEAoIdGVtcGxhdGUYASABKAkSWAoTdGVtcGxhdGVfcGFyYW1ldGVycxgCIAMoCzI7Lm9zYWMucHVibGljLnYxLkNvbXB1dGVJbnN0YW5jZVNwZWMuVGVtcGxhdGVQYXJhbWV0ZXJzRW50cnkSPQoUcmVzdGFydF9yZXF1ZXN0ZWRfYXQYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wSACIAQESOAoFaW1hZ2UYBCABKAsyJC5vc2FjLnB1YmxpYy52MS5Db21wdXRlSW5zdGFuY2VJbWFnZUgBiAEBEhQKB3NzaF9rZXkYByABKAlIAogBARI7Cglib290X2Rpc2sYCCABKAsyIy5vc2FjLnB1YmxpYy52MS5Db21wdXRlSW5zdGFuY2VEaXNrSAOIAQESPQoQYWRkaXRpb25hbF9kaXNrcxgJIAMoCzIjLm9zYWMucHVibGljLnYxLkNvbXB1dGVJbnN0YW5jZURpc2sSGQoMcnVuX3N0cmF0ZWd5GAogASgJSASIAQESFgoJdXNlcl9kYXRhGAsgASgJSAWIAQESPgoTbmV0d29ya19hdHRhY2htZW50cxgOIAMoCzIhLm9zYWMucHVibGljLnYxLk5ldHdvcmtBdHRhY2htZW50EhQKDGNhdGFsb2dfaXRlbRgPIAEoCRIXCgppc193aW5kb3dzGBAgASgISAaIAQESGgoNaW5zdGFuY2VfdHlwZRgRIAEoCUgHiAEBGk8KF1RlbXBsYXRlUGFyYW1ldGVyc0VudHJ5EgsKA2tleRgBIAEoCRIjCgV2YWx1ZRgCIAEoCzIULmdvb2dsZS5wcm90b2J1Zi5Bbnk6AjgBQhcKFV9yZXN0YXJ0X3JlcXVlc3RlZF9hdEIICgZfaW1hZ2VCCgoIX3NzaF9rZXlCDAoKX2Jvb3RfZGlza0IPCg1fcnVuX3N0cmF0ZWd5QgwKCl91c2VyX2RhdGFCDQoLX2lzX3dpbmRvd3NCEAoOX2luc3RhbmNlX3R5cGVKBAgFEAZKBAgGEAdKBAgMEA1KBAgNEA5SBWNvcmVzUgptZW1vcnlfZ2liUgZzdWJuZXRSD3NlY3VyaXR5X2dyb3VwcyKUAgoVQ29tcHV0ZUluc3RhbmNlU3RhdHVzEjMKBXN0YXRlGAEgASgOMiQub3NhYy5wdWJsaWMudjEuQ29tcHV0ZUluc3RhbmNlU3RhdGUSPAoKY29uZGl0aW9ucxgCIAMoCzIoLm9zYWMucHVibGljLnYxLkNvbXB1dGVJbnN0YW5jZUNvbmRpdGlvbhIbChNpbnRlcm5hbF9pcF9hZGRyZXNzGAMgASgJEjoKEWxhc3RfcmVzdGFydGVkX2F0GAQgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEgAiAEBEhkKEXB1YmxpY19pcF9hZGRyZXNzGAUgASgJQhQKEl9sYXN0X3Jlc3RhcnRlZF9hdCKDAgoYQ29tcHV0ZUluc3RhbmNlQ29uZGl0aW9uEjoKBHR5cGUYASABKA4yLC5vc2FjLnB1YmxpYy52MS5Db21wdXRlSW5zdGFuY2VDb25kaXRpb25UeXBlEi8KBnN0YXR1cxgCIAEoDjIfLm9zYWMucHVibGljLnYxLkNvbmRpdGlvblN0YXR1cxI4ChRsYXN0X3RyYW5zaXRpb25fdGltZRgDIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASEwoGcmVhc29uGAQgASgJSACIAQESFAoHbWVzc2FnZRgFIAEoCUgBiAEBQgkKB19yZWFzb25CCgoIX21lc3NhZ2UquwIKFENvbXB1dGVJbnN0YW5jZVN0YXRlEiYKIkNPTVBVVEVfSU5TVEFOQ0VfU1RBVEVfVU5TUEVDSUZJRUQQABIjCh9DT01QVVRFX0lOU1RBTkNFX1NUQVRFX1NUQVJUSU5HEAESIgoeQ09NUFVURV9JTlNUQU5DRV9TVEFURV9SVU5OSU5HEAISIQodQ09NUFVURV9JTlNUQU5DRV9TVEFURV9GQUlMRUQQAxIjCh9DT01QVVRFX0lOU1RBTkNFX1NUQVRFX0RFTEVUSU5HEAQSIwofQ09NUFVURV9JTlNUQU5DRV9TVEFURV9TVE9QUElORxAFEiIKHkNPTVBVVEVfSU5TVEFOQ0VfU1RBVEVfU1RPUFBFRBAGEiEKHUNPTVBVVEVfSU5TVEFOQ0VfU1RBVEVfUEFVU0VEEAcqiQMKHENvbXB1dGVJbnN0YW5jZUNvbmRpdGlvblR5cGUSLworQ09NUFVURV9JTlNUQU5DRV9DT05ESVRJT05fVFlQRV9VTlNQRUNJRklFRBAAEjkKNUNPTVBVVEVfSU5TVEFOQ0VfQ09ORElUSU9OX1RZUEVfQ09ORklHVVJBVElPTl9BUFBMSUVEEAESKQolQ09NUFVURV9JTlNUQU5DRV9DT05ESVRJT05fVFlQRV9SRUFEWRACEjcKM0NPTVBVVEVfSU5TVEFOQ0VfQ09ORElUSU9OX1RZUEVfUkVTVEFSVF9JTl9QUk9HUkVTUxADEjIKLkNPTVBVVEVfSU5TVEFOQ0VfQ09ORElUSU9OX1RZUEVfUkVTVEFSVF9GQUlMRUQQBBIvCitDT01QVVRFX0lOU1RBTkNFX0NPTkRJVElPTl9UWVBFX1BST1ZJU0lPTkVEEAUSNAowQ09NUFVURV9JTlNUQU5DRV9DT05ESVRJT05fVFlQRV9SRVNUQVJUX1JFUVVJUkVEEAZiBnByb3RvMw", [file_google_protobuf_any, file_google_protobuf_timestamp, file_osac_public_v1_condition_status_type, file_osac_public_v1_metadata_type]);
+  fileDesc("Cipvc2FjL3B1YmxpYy92MS9jb21wdXRlX2luc3RhbmNlX3R5cGUucHJvdG8SDm9zYWMucHVibGljLnYxIrMBCg9Db21wdXRlSW5zdGFuY2USCgoCaWQYASABKAkSKgoIbWV0YWRhdGEYAiABKAsyGC5vc2FjLnB1YmxpYy52MS5NZXRhZGF0YRIxCgRzcGVjGAMgASgLMiMub3NhYy5wdWJsaWMudjEuQ29tcHV0ZUluc3RhbmNlU3BlYxI1CgZzdGF0dXMYBCABKAsyJS5vc2FjLnB1YmxpYy52MS5Db21wdXRlSW5zdGFuY2VTdGF0dXMiPwoUQ29tcHV0ZUluc3RhbmNlSW1hZ2USEwoLc291cmNlX3R5cGUYASABKAkSEgoKc291cmNlX3JlZhgCIAEoCSInChNDb21wdXRlSW5zdGFuY2VEaXNrEhAKCHNpemVfZ2liGAEgASgFIjwKEU5ldHdvcmtBdHRhY2htZW50Eg4KBnN1Ym5ldBgBIAEoCRIXCg9zZWN1cml0eV9ncm91cHMYAiADKAki6gYKE0NvbXB1dGVJbnN0YW5jZVNwZWMSEAoIdGVtcGxhdGUYASABKAkSWAoTdGVtcGxhdGVfcGFyYW1ldGVycxgCIAMoCzI7Lm9zYWMucHVibGljLnYxLkNvbXB1dGVJbnN0YW5jZVNwZWMuVGVtcGxhdGVQYXJhbWV0ZXJzRW50cnkSPQoUcmVzdGFydF9yZXF1ZXN0ZWRfYXQYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wSACIAQESOAoFaW1hZ2UYBCABKAsyJC5vc2FjLnB1YmxpYy52MS5Db21wdXRlSW5zdGFuY2VJbWFnZUgBiAEBEhsKDnNzaF9wdWJsaWNfa2V5GAcgASgJSAKIAQESOwoJYm9vdF9kaXNrGAggASgLMiMub3NhYy5wdWJsaWMudjEuQ29tcHV0ZUluc3RhbmNlRGlza0gDiAEBEj0KEGFkZGl0aW9uYWxfZGlza3MYCSADKAsyIy5vc2FjLnB1YmxpYy52MS5Db21wdXRlSW5zdGFuY2VEaXNrEhkKDHJ1bl9zdHJhdGVneRgKIAEoCUgEiAEBEhYKCXVzZXJfZGF0YRgLIAEoCUgFiAEBEj4KE25ldHdvcmtfYXR0YWNobWVudHMYDiADKAsyIS5vc2FjLnB1YmxpYy52MS5OZXR3b3JrQXR0YWNobWVudBIUCgxjYXRhbG9nX2l0ZW0YDyABKAkSFwoKaXNfd2luZG93cxgQIAEoCEgGiAEBEhoKDWluc3RhbmNlX3R5cGUYESABKAlIB4gBARpPChdUZW1wbGF0ZVBhcmFtZXRlcnNFbnRyeRILCgNrZXkYASABKAkSIwoFdmFsdWUYAiABKAsyFC5nb29nbGUucHJvdG9idWYuQW55OgI4AUIXChVfcmVzdGFydF9yZXF1ZXN0ZWRfYXRCCAoGX2ltYWdlQhEKD19zc2hfcHVibGljX2tleUIMCgpfYm9vdF9kaXNrQg8KDV9ydW5fc3RyYXRlZ3lCDAoKX3VzZXJfZGF0YUINCgtfaXNfd2luZG93c0IQCg5faW5zdGFuY2VfdHlwZUoECAUQBkoECAYQB0oECAwQDUoECA0QDlIFY29yZXNSCm1lbW9yeV9naWJSBnN1Ym5ldFIPc2VjdXJpdHlfZ3JvdXBzIpYCChVDb21wdXRlSW5zdGFuY2VTdGF0dXMSMwoFc3RhdGUYASABKA4yJC5vc2FjLnB1YmxpYy52MS5Db21wdXRlSW5zdGFuY2VTdGF0ZRI8Cgpjb25kaXRpb25zGAIgAygLMigub3NhYy5wdWJsaWMudjEuQ29tcHV0ZUluc3RhbmNlQ29uZGl0aW9uEhsKE2ludGVybmFsX2lwX2FkZHJlc3MYAyABKAkSOgoRbGFzdF9yZXN0YXJ0ZWRfYXQYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wSACIAQESGwoTZXh0ZXJuYWxfaXBfYWRkcmVzcxgFIAEoCUIUChJfbGFzdF9yZXN0YXJ0ZWRfYXQigwIKGENvbXB1dGVJbnN0YW5jZUNvbmRpdGlvbhI6CgR0eXBlGAEgASgOMiwub3NhYy5wdWJsaWMudjEuQ29tcHV0ZUluc3RhbmNlQ29uZGl0aW9uVHlwZRIvCgZzdGF0dXMYAiABKA4yHy5vc2FjLnB1YmxpYy52MS5Db25kaXRpb25TdGF0dXMSOAoUbGFzdF90cmFuc2l0aW9uX3RpbWUYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEhMKBnJlYXNvbhgEIAEoCUgAiAEBEhQKB21lc3NhZ2UYBSABKAlIAYgBAUIJCgdfcmVhc29uQgoKCF9tZXNzYWdlKrsCChRDb21wdXRlSW5zdGFuY2VTdGF0ZRImCiJDT01QVVRFX0lOU1RBTkNFX1NUQVRFX1VOU1BFQ0lGSUVEEAASIwofQ09NUFVURV9JTlNUQU5DRV9TVEFURV9TVEFSVElORxABEiIKHkNPTVBVVEVfSU5TVEFOQ0VfU1RBVEVfUlVOTklORxACEiEKHUNPTVBVVEVfSU5TVEFOQ0VfU1RBVEVfRkFJTEVEEAMSIwofQ09NUFVURV9JTlNUQU5DRV9TVEFURV9ERUxFVElORxAEEiMKH0NPTVBVVEVfSU5TVEFOQ0VfU1RBVEVfU1RPUFBJTkcQBRIiCh5DT01QVVRFX0lOU1RBTkNFX1NUQVRFX1NUT1BQRUQQBhIhCh1DT01QVVRFX0lOU1RBTkNFX1NUQVRFX1BBVVNFRBAHKokDChxDb21wdXRlSW5zdGFuY2VDb25kaXRpb25UeXBlEi8KK0NPTVBVVEVfSU5TVEFOQ0VfQ09ORElUSU9OX1RZUEVfVU5TUEVDSUZJRUQQABI5CjVDT01QVVRFX0lOU1RBTkNFX0NPTkRJVElPTl9UWVBFX0NPTkZJR1VSQVRJT05fQVBQTElFRBABEikKJUNPTVBVVEVfSU5TVEFOQ0VfQ09ORElUSU9OX1RZUEVfUkVBRFkQAhI3CjNDT01QVVRFX0lOU1RBTkNFX0NPTkRJVElPTl9UWVBFX1JFU1RBUlRfSU5fUFJPR1JFU1MQAxIyCi5DT01QVVRFX0lOU1RBTkNFX0NPTkRJVElPTl9UWVBFX1JFU1RBUlRfRkFJTEVEEAQSLworQ09NUFVURV9JTlNUQU5DRV9DT05ESVRJT05fVFlQRV9QUk9WSVNJT05FRBAFEjQKMENPTVBVVEVfSU5TVEFOQ0VfQ09ORElUSU9OX1RZUEVfUkVTVEFSVF9SRVFVSVJFRBAGYgZwcm90bzM", [file_google_protobuf_any, file_google_protobuf_timestamp, file_osac_public_v1_condition_status_type, file_osac_public_v1_metadata_type]);
 
 /**
  * Contains the details of the compute instance.
@@ -246,9 +246,9 @@ export type ComputeInstanceSpec = Message<"osac.public.v1.ComputeInstanceSpec">
   /**
    * SSH public key.
    *
-   * @generated from field: optional string ssh_key = 7;
+   * @generated from field: optional string ssh_public_key = 7;
    */
-  sshKey?: string | undefined;
+  sshPublicKey?: string | undefined;
 
   /**
    * Boot disk configuration.
@@ -423,11 +423,11 @@ export type ComputeInstanceStatus = Message<"osac.public.v1.ComputeInstanceStatu
   lastRestartedAt?: Timestamp | undefined;
 
   /**
-   * Public IP address attached to the compute instance.
+   * External IP address attached to the compute instance.
    *
-   * @generated from field: string public_ip_address = 5;
+   * @generated from field: string external_ip_address = 5;
    */
-  publicIpAddress: string;
+  externalIpAddress: string;
 };
 
 /**
diff --git a/libs/types/src/osac/public/v1/event_type_pb.ts b/libs/types/src/osac/public/v1/event_type_pb.ts
index da56cf60..eeff8a14 100644
--- a/libs/types/src/osac/public/v1/event_type_pb.ts
+++ b/libs/types/src/osac/public/v1/event_type_pb.ts
@@ -17,6 +17,8 @@
 
 import type { GenEnum, GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
 import { enumDesc, fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
+import type { BareMetalInstance } from "./baremetal_instance_type_pb";
+import { file_osac_public_v1_baremetal_instance_type } from "./baremetal_instance_type_pb";
 import type { ClusterTemplate } from "./cluster_template_type_pb";
 import { file_osac_public_v1_cluster_template_type } from "./cluster_template_type_pb";
 import type { Cluster } from "./cluster_type_pb";
@@ -35,6 +37,8 @@ import type { RoleBinding } from "./role_binding_type_pb";
 import { file_osac_public_v1_role_binding_type } from "./role_binding_type_pb";
 import type { Project } from "./project_type_pb";
 import { file_osac_public_v1_project_type } from "./project_type_pb";
+import type { Secret } from "./secret_type_pb";
+import { file_osac_public_v1_secret_type } from "./secret_type_pb";
 import type { Role } from "./role_type_pb";
 import { file_osac_public_v1_role_type } from "./role_type_pb";
 import type { Tenant } from "./tenant_type_pb";
@@ -45,7 +49,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file osac/public/v1/event_type.proto.
  */
 export const file_osac_public_v1_event_type: GenFile = /*@__PURE__*/
-  fileDesc("Ch9vc2FjL3B1YmxpYy92MS9ldmVudF90eXBlLnByb3RvEg5vc2FjLnB1YmxpYy52MSKNBQoFRXZlbnQSCgoCaWQYASABKAkSJwoEdHlwZRgCIAEoDjIZLm9zYWMucHVibGljLnYxLkV2ZW50VHlwZRIqCgdjbHVzdGVyGAMgASgLMhcub3NhYy5wdWJsaWMudjEuQ2x1c3RlckgAEjsKEGNsdXN0ZXJfdGVtcGxhdGUYBCABKAsyHy5vc2FjLnB1YmxpYy52MS5DbHVzdGVyVGVtcGxhdGVIABItCglob3N0X3R5cGUYBSABKAsyGC5vc2FjLnB1YmxpYy52MS5Ib3N0VHlwZUgAEkwKGWNvbXB1dGVfaW5zdGFuY2VfdGVtcGxhdGUYByABKAsyJy5vc2FjLnB1YmxpYy52MS5Db21wdXRlSW5zdGFuY2VUZW1wbGF0ZUgAEjsKEGNvbXB1dGVfaW5zdGFuY2UYCCABKAsyHy5vc2FjLnB1YmxpYy52MS5Db21wdXRlSW5zdGFuY2VIABIkCgRyb2xlGAkgASgLMhQub3NhYy5wdWJsaWMudjEuUm9sZUgAEjMKDHJvbGVfYmluZGluZxgKIAEoCzIbLm9zYWMucHVibGljLnYxLlJvbGVCaW5kaW5nSAASKgoHcHJvamVjdBgLIAEoCzIXLm9zYWMucHVibGljLnYxLlByb2plY3RIABI1Cg1pbnN0YW5jZV90eXBlGAwgASgLMhwub3NhYy5wdWJsaWMudjEuSW5zdGFuY2VUeXBlSAASKAoGdGVuYW50GA0gASgLMhYub3NhYy5wdWJsaWMudjEuVGVuYW50SAASOQoPY2x1c3Rlcl92ZXJzaW9uGA4gASgLMh4ub3NhYy5wdWJsaWMudjEuQ2x1c3RlclZlcnNpb25IAEIJCgdwYXlsb2FkKoQBCglFdmVudFR5cGUSGgoWRVZFTlRfVFlQRV9VTlNQRUNJRklFRBAAEh0KGUVWRU5UX1RZUEVfT0JKRUNUX0NSRUFURUQQARIdChlFVkVOVF9UWVBFX09CSkVDVF9VUERBVEVEEAISHQoZRVZFTlRfVFlQRV9PQkpFQ1RfREVMRVRFRBADYgZwcm90bzM", [file_osac_public_v1_cluster_template_type, file_osac_public_v1_cluster_type, file_osac_public_v1_cluster_version_type, file_osac_public_v1_compute_instance_template_type, file_osac_public_v1_compute_instance_type, file_osac_public_v1_host_type_type, file_osac_public_v1_instance_type_type, file_osac_public_v1_role_binding_type, file_osac_public_v1_project_type, file_osac_public_v1_role_type, file_osac_public_v1_tenant_type]);
+  fileDesc("Ch9vc2FjL3B1YmxpYy92MS9ldmVudF90eXBlLnByb3RvEg5vc2FjLnB1YmxpYy52MSL5BQoFRXZlbnQSCgoCaWQYASABKAkSJwoEdHlwZRgCIAEoDjIZLm9zYWMucHVibGljLnYxLkV2ZW50VHlwZRIqCgdjbHVzdGVyGAMgASgLMhcub3NhYy5wdWJsaWMudjEuQ2x1c3RlckgAEjsKEGNsdXN0ZXJfdGVtcGxhdGUYBCABKAsyHy5vc2FjLnB1YmxpYy52MS5DbHVzdGVyVGVtcGxhdGVIABItCglob3N0X3R5cGUYBSABKAsyGC5vc2FjLnB1YmxpYy52MS5Ib3N0VHlwZUgAEkwKGWNvbXB1dGVfaW5zdGFuY2VfdGVtcGxhdGUYByABKAsyJy5vc2FjLnB1YmxpYy52MS5Db21wdXRlSW5zdGFuY2VUZW1wbGF0ZUgAEjsKEGNvbXB1dGVfaW5zdGFuY2UYCCABKAsyHy5vc2FjLnB1YmxpYy52MS5Db21wdXRlSW5zdGFuY2VIABIkCgRyb2xlGAkgASgLMhQub3NhYy5wdWJsaWMudjEuUm9sZUgAEjMKDHJvbGVfYmluZGluZxgKIAEoCzIbLm9zYWMucHVibGljLnYxLlJvbGVCaW5kaW5nSAASKgoHcHJvamVjdBgLIAEoCzIXLm9zYWMucHVibGljLnYxLlByb2plY3RIABI1Cg1pbnN0YW5jZV90eXBlGAwgASgLMhwub3NhYy5wdWJsaWMudjEuSW5zdGFuY2VUeXBlSAASKAoGdGVuYW50GA0gASgLMhYub3NhYy5wdWJsaWMudjEuVGVuYW50SAASOQoPY2x1c3Rlcl92ZXJzaW9uGA4gASgLMh4ub3NhYy5wdWJsaWMudjEuQ2x1c3RlclZlcnNpb25IABJAChNiYXJlX21ldGFsX2luc3RhbmNlGA8gASgLMiEub3NhYy5wdWJsaWMudjEuQmFyZU1ldGFsSW5zdGFuY2VIABIoCgZzZWNyZXQYECABKAsyFi5vc2FjLnB1YmxpYy52MS5TZWNyZXRIAEIJCgdwYXlsb2FkKoQBCglFdmVudFR5cGUSGgoWRVZFTlRfVFlQRV9VTlNQRUNJRklFRBAAEh0KGUVWRU5UX1RZUEVfT0JKRUNUX0NSRUFURUQQARIdChlFVkVOVF9UWVBFX09CSkVDVF9VUERBVEVEEAISHQoZRVZFTlRfVFlQRV9PQkpFQ1RfREVMRVRFRBADYgZwcm90bzM", [file_osac_public_v1_baremetal_instance_type, file_osac_public_v1_cluster_template_type, file_osac_public_v1_cluster_type, file_osac_public_v1_cluster_version_type, file_osac_public_v1_compute_instance_template_type, file_osac_public_v1_compute_instance_type, file_osac_public_v1_host_type_type, file_osac_public_v1_instance_type_type, file_osac_public_v1_role_binding_type, file_osac_public_v1_project_type, file_osac_public_v1_secret_type, file_osac_public_v1_role_type, file_osac_public_v1_tenant_type]);
 
 /**
  * Represents events delivered by the server.
@@ -138,6 +142,18 @@ export type Event = Message<"osac.public.v1.Event"> & {
      */
     value: ClusterVersion;
     case: "clusterVersion";
+  } | {
+    /**
+     * @generated from field: osac.public.v1.BareMetalInstance bare_metal_instance = 15;
+     */
+    value: BareMetalInstance;
+    case: "bareMetalInstance";
+  } | {
+    /**
+     * @generated from field: osac.public.v1.Secret secret = 16;
+     */
+    value: Secret;
+    case: "secret";
   } | { case: undefined; value?: undefined };
 };
 
diff --git a/libs/types/src/osac/public/v1/host_type_type_pb.ts b/libs/types/src/osac/public/v1/host_type_type_pb.ts
index 42fda2d8..4d2db069 100644
--- a/libs/types/src/osac/public/v1/host_type_type_pb.ts
+++ b/libs/types/src/osac/public/v1/host_type_type_pb.ts
@@ -37,6 +37,8 @@ export const file_osac_public_v1_host_type_type: GenFile = /*@__PURE__*/
  *
  * The detailed chracteristics of the host (CPU, memory, GPU, etc) will be in the `description` field.
  *
+ * buf:lint:ignore OSAC_OBJECT_SHAPE
+ *
  * @generated from message osac.public.v1.HostType
  */
 export type HostType = Message<"osac.public.v1.HostType"> & {
diff --git a/libs/types/src/osac/public/v1/network_class_type_pb.ts b/libs/types/src/osac/public/v1/network_class_type_pb.ts
index 10cea98c..af8dbead 100644
--- a/libs/types/src/osac/public/v1/network_class_type_pb.ts
+++ b/libs/types/src/osac/public/v1/network_class_type_pb.ts
@@ -44,6 +44,8 @@ export const file_osac_public_v1_network_class_type: GenFile = /*@__PURE__*/
  * Users query available NetworkClasses to discover which network types they can choose when
  * creating VirtualNetworks.
  *
+ * buf:lint:ignore OSAC_OBJECT_SHAPE
+ *
  * @generated from message osac.public.v1.NetworkClass
  */
 export type NetworkClass = Message<"osac.public.v1.NetworkClass"> & {
diff --git a/libs/types/src/osac/public/v1/project_membership_type_pb.ts b/libs/types/src/osac/public/v1/project_membership_type_pb.ts
index 68745fbd..176729d7 100644
--- a/libs/types/src/osac/public/v1/project_membership_type_pb.ts
+++ b/libs/types/src/osac/public/v1/project_membership_type_pb.ts
@@ -25,7 +25,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file osac/public/v1/project_membership_type.proto.
  */
 export const file_osac_public_v1_project_membership_type: GenFile = /*@__PURE__*/
-  fileDesc("Cixvc2FjL3B1YmxpYy92MS9wcm9qZWN0X21lbWJlcnNoaXBfdHlwZS5wcm90bxIOb3NhYy5wdWJsaWMudjEiuQEKEVByb2plY3RNZW1iZXJzaGlwEgoKAmlkGAEgASgJEioKCG1ldGFkYXRhGAIgASgLMhgub3NhYy5wdWJsaWMudjEuTWV0YWRhdGESMwoEc3BlYxgDIAEoCzIlLm9zYWMucHVibGljLnYxLlByb2plY3RNZW1iZXJzaGlwU3BlYxI3CgZzdGF0dXMYBCABKAsyJy5vc2FjLnB1YmxpYy52MS5Qcm9qZWN0TWVtYmVyc2hpcFN0YXR1cyJ3ChVQcm9qZWN0TWVtYmVyc2hpcFNwZWMSDwoHcHJvamVjdBgBIAEoCRIzCgRyb2xlGAIgASgOMiUub3NhYy5wdWJsaWMudjEuUHJvamVjdE1lbWJlcnNoaXBSb2xlEg4KBHVzZXIYAyABKAlIAEIICgZtZW1iZXIicgoXUHJvamVjdE1lbWJlcnNoaXBTdGF0dXMSNQoFc3RhdGUYASABKA4yJi5vc2FjLnB1YmxpYy52MS5Qcm9qZWN0TWVtYmVyc2hpcFN0YXRlEhQKB21lc3NhZ2UYAiABKAlIAIgBAUIKCghfbWVzc2FnZSqJAQoVUHJvamVjdE1lbWJlcnNoaXBSb2xlEicKI1BST0pFQ1RfTUVNQkVSU0hJUF9ST0xFX1VOU1BFQ0lGSUVEEAASIgoeUFJPSkVDVF9NRU1CRVJTSElQX1JPTEVfVklFV0VSEAESIwofUFJPSkVDVF9NRU1CRVJTSElQX1JPTEVfTUFOQUdFUhACKrEBChZQcm9qZWN0TWVtYmVyc2hpcFN0YXRlEigKJFBST0pFQ1RfTUVNQkVSU0hJUF9TVEFURV9VTlNQRUNJRklFRBAAEiQKIFBST0pFQ1RfTUVNQkVSU0hJUF9TVEFURV9QRU5ESU5HEAESIgoeUFJPSkVDVF9NRU1CRVJTSElQX1NUQVRFX1JFQURZEAISIwofUFJPSkVDVF9NRU1CRVJTSElQX1NUQVRFX0ZBSUxFRBADYgZwcm90bzM", [file_osac_public_v1_metadata_type]);
+  fileDesc("Cixvc2FjL3B1YmxpYy92MS9wcm9qZWN0X21lbWJlcnNoaXBfdHlwZS5wcm90bxIOb3NhYy5wdWJsaWMudjEiuQEKEVByb2plY3RNZW1iZXJzaGlwEgoKAmlkGAEgASgJEioKCG1ldGFkYXRhGAIgASgLMhgub3NhYy5wdWJsaWMudjEuTWV0YWRhdGESMwoEc3BlYxgDIAEoCzIlLm9zYWMucHVibGljLnYxLlByb2plY3RNZW1iZXJzaGlwU3BlYxI3CgZzdGF0dXMYBCABKAsyJy5vc2FjLnB1YmxpYy52MS5Qcm9qZWN0TWVtYmVyc2hpcFN0YXR1cyJbChVQcm9qZWN0TWVtYmVyc2hpcFNwZWMSMwoEcm9sZRgCIAEoDjIlLm9zYWMucHVibGljLnYxLlByb2plY3RNZW1iZXJzaGlwUm9sZRINCgV1c2VycxgDIAMoCSJyChdQcm9qZWN0TWVtYmVyc2hpcFN0YXR1cxI1CgVzdGF0ZRgBIAEoDjImLm9zYWMucHVibGljLnYxLlByb2plY3RNZW1iZXJzaGlwU3RhdGUSFAoHbWVzc2FnZRgCIAEoCUgAiAEBQgoKCF9tZXNzYWdlKokBChVQcm9qZWN0TWVtYmVyc2hpcFJvbGUSJwojUFJPSkVDVF9NRU1CRVJTSElQX1JPTEVfVU5TUEVDSUZJRUQQABIiCh5QUk9KRUNUX01FTUJFUlNISVBfUk9MRV9WSUVXRVIQARIjCh9QUk9KRUNUX01FTUJFUlNISVBfUk9MRV9NQU5BR0VSEAIqsQEKFlByb2plY3RNZW1iZXJzaGlwU3RhdGUSKAokUFJPSkVDVF9NRU1CRVJTSElQX1NUQVRFX1VOU1BFQ0lGSUVEEAASJAogUFJPSkVDVF9NRU1CRVJTSElQX1NUQVRFX1BFTkRJTkcQARIiCh5QUk9KRUNUX01FTUJFUlNISVBfU1RBVEVfUkVBRFkQAhIjCh9QUk9KRUNUX01FTUJFUlNISVBfU1RBVEVfRkFJTEVEEANiBnByb3RvMw", [file_osac_public_v1_metadata_type]);
 
 /**
  * ProjectMembership represents a member's association with a project and their role within it.
@@ -70,39 +70,25 @@ export const ProjectMembershipSchema: GenMessage<ProjectMembership> = /*@__PURE_
   messageDesc(file_osac_public_v1_project_membership_type, 0);
 
 /**
- * Describes a member of a project.
+ * Describes the members of a project.
  *
  * @generated from message osac.public.v1.ProjectMembershipSpec
  */
 export type ProjectMembershipSpec = Message<"osac.public.v1.ProjectMembershipSpec"> & {
   /**
-   * Reference to the project that this membership applies to. This is the unique identifier (ID) of the Project object,
-   * not the project name.
-   *
-   * @generated from field: string project = 1;
-   */
-  project: string;
-
-  /**
-   * Role of the member in the project. This indicates whether the member is a viewer, manager, etc.
+   * Role of the members in the project. This indicates whether the members are viewers, managers, etc.
    *
    * @generated from field: osac.public.v1.ProjectMembershipRole role = 2;
    */
   role: ProjectMembershipRole;
 
   /**
-   * Unique identifier of the member. Currently members are users (referenced by their User object ID), but this leaves
-   * room for adding other kinds of members in the future, like groups.
+   * Identifiers of the users that are members of the project. These are user identifiers (the `id` field of User
+   * objects), not usernames or email addresses.
    *
-   * @generated from oneof osac.public.v1.ProjectMembershipSpec.member
+   * @generated from field: repeated string users = 3;
    */
-  member: {
-    /**
-     * @generated from field: string user = 3;
-     */
-    value: string;
-    case: "user";
-  } | { case: undefined; value?: undefined };
+  users: string[];
 };
 
 /**
diff --git a/libs/types/src/osac/public/v1/public_ip_type_pb.ts b/libs/types/src/osac/public/v1/public_ip_type_pb.ts
index cd0328fe..3a94a661 100644
--- a/libs/types/src/osac/public/v1/public_ip_type_pb.ts
+++ b/libs/types/src/osac/public/v1/public_ip_type_pb.ts
@@ -22,14 +22,13 @@ import type { IPFamily } from "./ip_family_type_pb";
 import { file_osac_public_v1_ip_family_type } from "./ip_family_type_pb";
 import type { Metadata } from "./metadata_type_pb";
 import { file_osac_public_v1_metadata_type } from "./metadata_type_pb";
-import { file_osac_public_v1_public_ip_pool_type } from "./public_ip_pool_type_pb";
 import type { Message } from "@bufbuild/protobuf";
 
 /**
  * Describes the file osac/public/v1/public_ip_type.proto.
  */
 export const file_osac_public_v1_public_ip_type: GenFile = /*@__PURE__*/
-  fileDesc("CiNvc2FjL3B1YmxpYy92MS9wdWJsaWNfaXBfdHlwZS5wcm90bxIOb3NhYy5wdWJsaWMudjEingEKCFB1YmxpY0lQEgoKAmlkGAEgASgJEioKCG1ldGFkYXRhGAIgASgLMhgub3NhYy5wdWJsaWMudjEuTWV0YWRhdGESKgoEc3BlYxgDIAEoCzIcLm9zYWMucHVibGljLnYxLlB1YmxpY0lQU3BlYxIuCgZzdGF0dXMYBCABKAsyHi5vc2FjLnB1YmxpYy52MS5QdWJsaWNJUFN0YXR1cyJTCgxQdWJsaWNJUFNwZWMSEQoEcG9vbBgBIAEoCUID4EEFEjAKCWlwX2ZhbWlseRgCIAEoDjIYLm9zYWMucHVibGljLnYxLklQRmFtaWx5QgPgQQUiqgEKDlB1YmxpY0lQU3RhdHVzEjEKBXN0YXRlGAEgASgOMh0ub3NhYy5wdWJsaWMudjEuUHVibGljSVBTdGF0ZUID4EEDEhkKB21lc3NhZ2UYAiABKAlCA+BBA0gAiAEBEhQKB2FkZHJlc3MYAyABKAlCA+BBAxIRCgRwb29sGAQgASgJQgPgQQMSFQoIYXR0YWNoZWQYBSABKAhCA+BBA0IKCghfbWVzc2FnZSqmAQoNUHVibGljSVBTdGF0ZRIfChtQVUJMSUNfSVBfU1RBVEVfVU5TUEVDSUZJRUQQABIbChdQVUJMSUNfSVBfU1RBVEVfUEVORElORxABEh0KGVBVQkxJQ19JUF9TVEFURV9BTExPQ0FURUQQAhIaChZQVUJMSUNfSVBfU1RBVEVfRkFJTEVEEAMSHAoYUFVCTElDX0lQX1NUQVRFX0RFTEVUSU5HEARiBnByb3RvMw", [file_google_api_field_behavior, file_osac_public_v1_ip_family_type, file_osac_public_v1_metadata_type, file_osac_public_v1_public_ip_pool_type]);
+  fileDesc("CiNvc2FjL3B1YmxpYy92MS9wdWJsaWNfaXBfdHlwZS5wcm90bxIOb3NhYy5wdWJsaWMudjEingEKCFB1YmxpY0lQEgoKAmlkGAEgASgJEioKCG1ldGFkYXRhGAIgASgLMhgub3NhYy5wdWJsaWMudjEuTWV0YWRhdGESKgoEc3BlYxgDIAEoCzIcLm9zYWMucHVibGljLnYxLlB1YmxpY0lQU3BlYxIuCgZzdGF0dXMYBCABKAsyHi5vc2FjLnB1YmxpYy52MS5QdWJsaWNJUFN0YXR1cyJTCgxQdWJsaWNJUFNwZWMSEQoEcG9vbBgBIAEoCUID4EEFEjAKCWlwX2ZhbWlseRgCIAEoDjIYLm9zYWMucHVibGljLnYxLklQRmFtaWx5QgPgQQUiqgEKDlB1YmxpY0lQU3RhdHVzEjEKBXN0YXRlGAEgASgOMh0ub3NhYy5wdWJsaWMudjEuUHVibGljSVBTdGF0ZUID4EEDEhkKB21lc3NhZ2UYAiABKAlCA+BBA0gAiAEBEhQKB2FkZHJlc3MYAyABKAlCA+BBAxIRCgRwb29sGAQgASgJQgPgQQMSFQoIYXR0YWNoZWQYBSABKAhCA+BBA0IKCghfbWVzc2FnZSqmAQoNUHVibGljSVBTdGF0ZRIfChtQVUJMSUNfSVBfU1RBVEVfVU5TUEVDSUZJRUQQABIbChdQVUJMSUNfSVBfU1RBVEVfUEVORElORxABEh0KGVBVQkxJQ19JUF9TVEFURV9BTExPQ0FURUQQAhIaChZQVUJMSUNfSVBfU1RBVEVfRkFJTEVEEAMSHAoYUFVCTElDX0lQX1NUQVRFX0RFTEVUSU5HEARiBnByb3RvMw", [file_google_api_field_behavior, file_osac_public_v1_ip_family_type, file_osac_public_v1_metadata_type]);
 
 /**
  * Represents a public IP address allocated from a PublicIPPool.
diff --git a/libs/types/src/osac/public/v1/secret_type_pb.ts b/libs/types/src/osac/public/v1/secret_type_pb.ts
new file mode 100644
index 00000000..6d3122f7
--- /dev/null
+++ b/libs/types/src/osac/public/v1/secret_type_pb.ts
@@ -0,0 +1,120 @@
+//
+// Copyright (c) 2026 Red Hat, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+// an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations under the License.
+//
+
+// @generated by protoc-gen-es v2.12.0 with parameter "target=ts"
+// @generated from file osac/public/v1/secret_type.proto (package osac.public.v1, syntax proto3)
+/* eslint-disable */
+
+import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
+import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
+import { file_buf_validate_validate } from "../../../buf/validate/validate_pb";
+import type { Metadata } from "./metadata_type_pb";
+import { file_osac_public_v1_metadata_type } from "./metadata_type_pb";
+import type { Message } from "@bufbuild/protobuf";
+
+/**
+ * Describes the file osac/public/v1/secret_type.proto.
+ */
+export const file_osac_public_v1_secret_type: GenFile = /*@__PURE__*/
+  fileDesc("CiBvc2FjL3B1YmxpYy92MS9zZWNyZXRfdHlwZS5wcm90bxIOb3NhYy5wdWJsaWMudjEimAEKBlNlY3JldBIKCgJpZBgBIAEoCRIqCghtZXRhZGF0YRgCIAEoCzIYLm9zYWMucHVibGljLnYxLk1ldGFkYXRhEigKBHNwZWMYAyABKAsyGi5vc2FjLnB1YmxpYy52MS5TZWNyZXRTcGVjEiwKBnN0YXR1cxgEIAEoCzIcLm9zYWMucHVibGljLnYxLlNlY3JldFN0YXR1cyJ7CgpTZWNyZXRTcGVjEkAKBGRhdGEYASADKAsyJC5vc2FjLnB1YmxpYy52MS5TZWNyZXRTcGVjLkRhdGFFbnRyeUIMukgJmgEGIgRyAhABGisKCURhdGFFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAw6AjgBIooBCgxTZWNyZXRTdGF0dXMSRQoNcmVzb2x2ZWRfZGF0YRgBIAMoCzIuLm9zYWMucHVibGljLnYxLlNlY3JldFN0YXR1cy5SZXNvbHZlZERhdGFFbnRyeRozChFSZXNvbHZlZERhdGFFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAw6AjgBYgZwcm90bzM", [file_buf_validate_validate, file_osac_public_v1_metadata_type]);
+
+/**
+ * Represents a secret containing opaque key-value data.
+ *
+ * Secrets store sensitive information such as TLS certificates, pull secrets, and credentials. Each secret holds a map
+ * of named binary values. For example, a TLS secret might contain entries named `tls.crt` and `tls.key`.
+ *
+ * Secrets are scoped to a tenant and can be referenced by other resources that require sensitive configuration data.
+ *
+ * @generated from message osac.public.v1.Secret
+ */
+export type Secret = Message<"osac.public.v1.Secret"> & {
+  /**
+   * Unique identifier of the secret.
+   *
+   * @generated from field: string id = 1;
+   */
+  id: string;
+
+  /**
+   * Metadata of the secret.
+   *
+   * @generated from field: osac.public.v1.Metadata metadata = 2;
+   */
+  metadata?: Metadata | undefined;
+
+  /**
+   * Desired state of the secret.
+   *
+   * @generated from field: osac.public.v1.SecretSpec spec = 3;
+   */
+  spec?: SecretSpec | undefined;
+
+  /**
+   * Observed state of the secret, populated by the server.
+   *
+   * @generated from field: osac.public.v1.SecretStatus status = 4;
+   */
+  status?: SecretStatus | undefined;
+};
+
+/**
+ * Describes the message osac.public.v1.Secret.
+ * Use `create(SecretSchema)` to create a new message.
+ */
+export const SecretSchema: GenMessage<Secret> = /*@__PURE__*/
+  messageDesc(file_osac_public_v1_secret_type, 0);
+
+/**
+ * Desired state of a secret.
+ *
+ * @generated from message osac.public.v1.SecretSpec
+ */
+export type SecretSpec = Message<"osac.public.v1.SecretSpec"> & {
+  /**
+   * Opaque key-value data. Each key identifies a named entry (for example, `crt` or `key`) and the
+   * corresponding value is the raw secret material.
+   *
+   * @generated from field: map<string, bytes> data = 1;
+   */
+  data: { [key: string]: Uint8Array };
+};
+
+/**
+ * Describes the message osac.public.v1.SecretSpec.
+ * Use `create(SecretSpecSchema)` to create a new message.
+ */
+export const SecretSpecSchema: GenMessage<SecretSpec> = /*@__PURE__*/
+  messageDesc(file_osac_public_v1_secret_type, 1);
+
+/**
+ * Observed state of a secret, populated by the server.
+ *
+ * @generated from message osac.public.v1.SecretStatus
+ */
+export type SecretStatus = Message<"osac.public.v1.SecretStatus"> & {
+  /**
+   * The secret's resolved key-value data. Present in Get responses; omitted from List responses.
+   *
+   * @generated from field: map<string, bytes> resolved_data = 1;
+   */
+  resolvedData: { [key: string]: Uint8Array };
+};
+
+/**
+ * Describes the message osac.public.v1.SecretStatus.
+ * Use `create(SecretStatusSchema)` to create a new message.
+ */
+export const SecretStatusSchema: GenMessage<SecretStatus> = /*@__PURE__*/
+  messageDesc(file_osac_public_v1_secret_type, 2);
+
diff --git a/libs/types/src/osac/public/v1/secrets_service_pb.ts b/libs/types/src/osac/public/v1/secrets_service_pb.ts
new file mode 100644
index 00000000..7aa6eb43
--- /dev/null
+++ b/libs/types/src/osac/public/v1/secrets_service_pb.ts
@@ -0,0 +1,373 @@
+//
+// Copyright (c) 2026 Red Hat, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+// an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations under the License.
+//
+
+// @generated by protoc-gen-es v2.12.0 with parameter "target=ts"
+// @generated from file osac/public/v1/secrets_service.proto (package osac.public.v1, syntax proto3)
+/* eslint-disable */
+
+import type { GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
+import { fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";
+import { file_google_api_annotations } from "../../../google/api/annotations_pb";
+import type { FieldMask } from "../../../google/protobuf/field_mask_pb";
+import { file_google_protobuf_field_mask } from "../../../google/protobuf/field_mask_pb";
+import type { Secret } from "./secret_type_pb";
+import { file_osac_public_v1_secret_type } from "./secret_type_pb";
+import type { Message } from "@bufbuild/protobuf";
+
+/**
+ * Describes the file osac/public/v1/secrets_service.proto.
+ */
+export const file_osac_public_v1_secrets_service: GenFile = /*@__PURE__*/
+  fileDesc("CiRvc2FjL3B1YmxpYy92MS9zZWNyZXRzX3NlcnZpY2UucHJvdG8SDm9zYWMucHVibGljLnYxIpABChJTZWNyZXRzTGlzdFJlcXVlc3QSEwoGb2Zmc2V0GAEgASgFSACIAQESEgoFbGltaXQYAiABKAVIAYgBARITCgZmaWx0ZXIYAyABKAlIAogBARISCgVvcmRlchgEIAEoCUgDiAEBQgkKB19vZmZzZXRCCAoGX2xpbWl0QgkKB19maWx0ZXJCCAoGX29yZGVyIlkKE1NlY3JldHNMaXN0UmVzcG9uc2USDAoEc2l6ZRgBIAEoBRINCgV0b3RhbBgCIAEoBRIlCgVpdGVtcxgDIAMoCzIWLm9zYWMucHVibGljLnYxLlNlY3JldCIfChFTZWNyZXRzR2V0UmVxdWVzdBIKCgJpZBgBIAEoCSI8ChJTZWNyZXRzR2V0UmVzcG9uc2USJgoGb2JqZWN0GAEgASgLMhYub3NhYy5wdWJsaWMudjEuU2VjcmV0Ij4KFFNlY3JldHNDcmVhdGVSZXF1ZXN0EiYKBm9iamVjdBgBIAEoCzIWLm9zYWMucHVibGljLnYxLlNlY3JldCI/ChVTZWNyZXRzQ3JlYXRlUmVzcG9uc2USJgoGb2JqZWN0GAEgASgLMhYub3NhYy5wdWJsaWMudjEuU2VjcmV0In0KFFNlY3JldHNVcGRhdGVSZXF1ZXN0EiYKBm9iamVjdBgBIAEoCzIWLm9zYWMucHVibGljLnYxLlNlY3JldBIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSDAoEbG9jaxgDIAEoCCI/ChVTZWNyZXRzVXBkYXRlUmVzcG9uc2USJgoGb2JqZWN0GAEgASgLMhYub3NhYy5wdWJsaWMudjEuU2VjcmV0IiIKFFNlY3JldHNEZWxldGVSZXF1ZXN0EgoKAmlkGAEgASgJIhcKFVNlY3JldHNEZWxldGVSZXNwb25zZTKmBQoHU2VjcmV0cxJ0CgRMaXN0EiIub3NhYy5wdWJsaWMudjEuU2VjcmV0c0xpc3RSZXF1ZXN0GiMub3NhYy5wdWJsaWMudjEuU2VjcmV0c0xpc3RSZXNwb25zZSIjgtPkkwIdEhsvYXBpL2Z1bGZpbGxtZW50L3YxL3NlY3JldHMSfgoDR2V0EiEub3NhYy5wdWJsaWMudjEuU2VjcmV0c0dldFJlcXVlc3QaIi5vc2FjLnB1YmxpYy52MS5TZWNyZXRzR2V0UmVzcG9uc2UiMILT5JMCKmIGb2JqZWN0EiAvYXBpL2Z1bGZpbGxtZW50L3YxL3NlY3JldHMve2lkfRKKAQoGQ3JlYXRlEiQub3NhYy5wdWJsaWMudjEuU2VjcmV0c0NyZWF0ZVJlcXVlc3QaJS5vc2FjLnB1YmxpYy52MS5TZWNyZXRzQ3JlYXRlUmVzcG9uc2UiM4LT5JMCLToGb2JqZWN0YgZvYmplY3QiGy9hcGkvZnVsZmlsbG1lbnQvdjEvc2VjcmV0cxKWAQoGVXBkYXRlEiQub3NhYy5wdWJsaWMudjEuU2VjcmV0c1VwZGF0ZVJlcXVlc3QaJS5vc2FjLnB1YmxpYy52MS5TZWNyZXRzVXBkYXRlUmVzcG9uc2UiP4LT5JMCOToGb2JqZWN0YgZvYmplY3QyJy9hcGkvZnVsZmlsbG1lbnQvdjEvc2VjcmV0cy97b2JqZWN0LmlkfRJ/CgZEZWxldGUSJC5vc2FjLnB1YmxpYy52MS5TZWNyZXRzRGVsZXRlUmVxdWVzdBolLm9zYWMucHVibGljLnYxLlNlY3JldHNEZWxldGVSZXNwb25zZSIogtPkkwIiKiAvYXBpL2Z1bGZpbGxtZW50L3YxL3NlY3JldHMve2lkfWIGcHJvdG8z", [file_google_api_annotations, file_google_protobuf_field_mask, file_osac_public_v1_secret_type]);
+
+/**
+ * Request message for listing secrets.
+ *
+ * @generated from message osac.public.v1.SecretsListRequest
+ */
+export type SecretsListRequest = Message<"osac.public.v1.SecretsListRequest"> & {
+  /**
+   * Index of the first result. If not specified the default value will be zero.
+   *
+   * @generated from field: optional int32 offset = 1;
+   */
+  offset?: number | undefined;
+
+  /**
+   * Maximum number of results to be returned by the server. When not specified all the results will be returned. Note
+   * that there may not be enough results to return, and that the server may decide, for performance reasons, to return
+   * less results than requested.
+   *
+   * @generated from field: optional int32 limit = 2;
+   */
+  limit?: number | undefined;
+
+  /**
+   * Filter criteria.
+   *
+   * The value of this parameter is a [CEL](https://cel.dev) expression used to select which objects to return. The
+   * built-in `this` variable refers to the object being tested and `now` refers to the current date and time. If the
+   * expression evaluates to `true` the object is included in the results. For example, to retrieve all secrets with
+   * names starting with `tls`:
+   *
+   *     this.metadata.name.startsWith("tls")
+   *
+   * If this isn't provided, or if the value is empty, then all the secrets that the user has permission to see will be
+   * returned. Not all CEL constructs are currently supported for implementation reasons; see the filter documentation
+   * (docs/FILTER.md) for the full details.
+   *
+   * @generated from field: optional string filter = 3;
+   */
+  filter?: string | undefined;
+
+  /**
+   * Order criteria.
+   *
+   * The syntax of this parameter is similar to the syntax of the _order by_ clause of a SQL statement, but using the
+   * names of the attributes of the secret instead of the names of the columns of a table. For example, in order to
+   * sort the secrets descending by name the value should be:
+   *
+   *     metadata.name desc
+   *
+   * If the parameter isn't provided, or if the value is empty, then the order of the results is undefined.
+   *
+   * @generated from field: optional string order = 4;
+   */
+  order?: string | undefined;
+};
+
+/**
+ * Describes the message osac.public.v1.SecretsListRequest.
+ * Use `create(SecretsListRequestSchema)` to create a new message.
+ */
+export const SecretsListRequestSchema: GenMessage<SecretsListRequest> = /*@__PURE__*/
+  messageDesc(file_osac_public_v1_secrets_service, 0);
+
+/**
+ * Response message for listing secrets.
+ *
+ * @generated from message osac.public.v1.SecretsListResponse
+ */
+export type SecretsListResponse = Message<"osac.public.v1.SecretsListResponse"> & {
+  /**
+   * Actual number of items returned. Note that this may be smaller than the value requested in the `limit` parameter
+   * of the request if there are not enough items, or if the system decides that returning that number of items isn't
+   * feasible or convenient for performance reasons.
+   *
+   * @generated from field: int32 size = 1;
+   */
+  size: number;
+
+  /**
+   * Total number of items of the collection that match the search criteria, regardless of the number of results
+   * requested with the `limit` parameter.
+   *
+   * @generated from field: int32 total = 2;
+   */
+  total: number;
+
+  /**
+   * List of results.
+   *
+   * @generated from field: repeated osac.public.v1.Secret items = 3;
+   */
+  items: Secret[];
+};
+
+/**
+ * Describes the message osac.public.v1.SecretsListResponse.
+ * Use `create(SecretsListResponseSchema)` to create a new message.
+ */
+export const SecretsListResponseSchema: GenMessage<SecretsListResponse> = /*@__PURE__*/
+  messageDesc(file_osac_public_v1_secrets_service, 1);
+
+/**
+ * Request message for getting a single secret.
+ *
+ * @generated from message osac.public.v1.SecretsGetRequest
+ */
+export type SecretsGetRequest = Message<"osac.public.v1.SecretsGetRequest"> & {
+  /**
+   * Unique identifier of the secret to retrieve.
+   *
+   * @generated from field: string id = 1;
+   */
+  id: string;
+};
+
+/**
+ * Describes the message osac.public.v1.SecretsGetRequest.
+ * Use `create(SecretsGetRequestSchema)` to create a new message.
+ */
+export const SecretsGetRequestSchema: GenMessage<SecretsGetRequest> = /*@__PURE__*/
+  messageDesc(file_osac_public_v1_secrets_service, 2);
+
+/**
+ * Response message for getting a single secret.
+ *
+ * @generated from message osac.public.v1.SecretsGetResponse
+ */
+export type SecretsGetResponse = Message<"osac.public.v1.SecretsGetResponse"> & {
+  /**
+   * The requested secret object.
+   *
+   * @generated from field: osac.public.v1.Secret object = 1;
+   */
+  object?: Secret | undefined;
+};
+
+/**
+ * Describes the message osac.public.v1.SecretsGetResponse.
+ * Use `create(SecretsGetResponseSchema)` to create a new message.
+ */
+export const SecretsGetResponseSchema: GenMessage<SecretsGetResponse> = /*@__PURE__*/
+  messageDesc(file_osac_public_v1_secrets_service, 3);
+
+/**
+ * Request message for creating a new secret.
+ *
+ * @generated from message osac.public.v1.SecretsCreateRequest
+ */
+export type SecretsCreateRequest = Message<"osac.public.v1.SecretsCreateRequest"> & {
+  /**
+   * The secret object to create.
+   *
+   * @generated from field: osac.public.v1.Secret object = 1;
+   */
+  object?: Secret | undefined;
+};
+
+/**
+ * Describes the message osac.public.v1.SecretsCreateRequest.
+ * Use `create(SecretsCreateRequestSchema)` to create a new message.
+ */
+export const SecretsCreateRequestSchema: GenMessage<SecretsCreateRequest> = /*@__PURE__*/
+  messageDesc(file_osac_public_v1_secrets_service, 4);
+
+/**
+ * Response message for creating a new secret.
+ *
+ * @generated from message osac.public.v1.SecretsCreateResponse
+ */
+export type SecretsCreateResponse = Message<"osac.public.v1.SecretsCreateResponse"> & {
+  /**
+   * The created secret object, including any server-generated fields.
+   *
+   * @generated from field: osac.public.v1.Secret object = 1;
+   */
+  object?: Secret | undefined;
+};
+
+/**
+ * Describes the message osac.public.v1.SecretsCreateResponse.
+ * Use `create(SecretsCreateResponseSchema)` to create a new message.
+ */
+export const SecretsCreateResponseSchema: GenMessage<SecretsCreateResponse> = /*@__PURE__*/
+  messageDesc(file_osac_public_v1_secrets_service, 5);
+
+/**
+ * Request message for updating an existing secret.
+ *
+ * @generated from message osac.public.v1.SecretsUpdateRequest
+ */
+export type SecretsUpdateRequest = Message<"osac.public.v1.SecretsUpdateRequest"> & {
+  /**
+   * The secret object with updated fields.
+   *
+   * @generated from field: osac.public.v1.Secret object = 1;
+   */
+  object?: Secret | undefined;
+
+  /**
+   * Field mask specifying which fields to update. If not provided, all fields will be updated.
+   *
+   * @generated from field: google.protobuf.FieldMask update_mask = 2;
+   */
+  updateMask?: FieldMask | undefined;
+
+  /**
+   * Lock enables optimistic locking. When set to true, the server verifies that the current version of the object
+   * matches the value of the metadata.version field of the submitted object. If they differ the update will be
+   * rejected. This is useful to prevent lost updates when multiple clients are modifying the same object concurrently.
+   *
+   * @generated from field: bool lock = 3;
+   */
+  lock: boolean;
+};
+
+/**
+ * Describes the message osac.public.v1.SecretsUpdateRequest.
+ * Use `create(SecretsUpdateRequestSchema)` to create a new message.
+ */
+export const SecretsUpdateRequestSchema: GenMessage<SecretsUpdateRequest> = /*@__PURE__*/
+  messageDesc(file_osac_public_v1_secrets_service, 6);
+
+/**
+ * Response message for updating an existing secret.
+ *
+ * @generated from message osac.public.v1.SecretsUpdateResponse
+ */
+export type SecretsUpdateResponse = Message<"osac.public.v1.SecretsUpdateResponse"> & {
+  /**
+   * The updated secret object.
+   *
+   * @generated from field: osac.public.v1.Secret object = 1;
+   */
+  object?: Secret | undefined;
+};
+
+/**
+ * Describes the message osac.public.v1.SecretsUpdateResponse.
+ * Use `create(SecretsUpdateResponseSchema)` to create a new message.
+ */
+export const SecretsUpdateResponseSchema: GenMessage<SecretsUpdateResponse> = /*@__PURE__*/
+  messageDesc(file_osac_public_v1_secrets_service, 7);
+
+/**
+ * Request message for deleting a secret.
+ *
+ * @generated from message osac.public.v1.SecretsDeleteRequest
+ */
+export type SecretsDeleteRequest = Message<"osac.public.v1.SecretsDeleteRequest"> & {
+  /**
+   * Unique identifier of the secret to delete.
+   *
+   * @generated from field: string id = 1;
+   */
+  id: string;
+};
+
+/**
+ * Describes the message osac.public.v1.SecretsDeleteRequest.
+ * Use `create(SecretsDeleteRequestSchema)` to create a new message.
+ */
+export const SecretsDeleteRequestSchema: GenMessage<SecretsDeleteRequest> = /*@__PURE__*/
+  messageDesc(file_osac_public_v1_secrets_service, 8);
+
+/**
+ * Response message for deleting a secret.
+ *
+ * @generated from message osac.public.v1.SecretsDeleteResponse
+ */
+export type SecretsDeleteResponse = Message<"osac.public.v1.SecretsDeleteResponse"> & {
+};
+
+/**
+ * Describes the message osac.public.v1.SecretsDeleteResponse.
+ * Use `create(SecretsDeleteResponseSchema)` to create a new message.
+ */
+export const SecretsDeleteResponseSchema: GenMessage<SecretsDeleteResponse> = /*@__PURE__*/
+  messageDesc(file_osac_public_v1_secrets_service, 9);
+
+/**
+ * Service for managing secrets.
+ *
+ * Secrets store sensitive key-value data such as TLS certificates, pull secrets, and credentials. They are scoped to
+ * a tenant and can be referenced by other resources that require sensitive configuration data.
+ *
+ * @generated from service osac.public.v1.Secrets
+ */
+export const Secrets: GenService<{
+  /**
+   * Retrieves the list of secrets.
+   *
+   * @generated from rpc osac.public.v1.Secrets.List
+   */
+  list: {
+    methodKind: "unary";
+    input: typeof SecretsListRequestSchema;
+    output: typeof SecretsListResponseSchema;
+  },
+  /**
+   * Retrieves the details of one specific secret.
+   *
+   * @generated from rpc osac.public.v1.Secrets.Get
+   */
+  get: {
+    methodKind: "unary";
+    input: typeof SecretsGetRequestSchema;
+    output: typeof SecretsGetResponseSchema;
+  },
+  /**
+   * Creates a new secret.
+   *
+   * @generated from rpc osac.public.v1.Secrets.Create
+   */
+  create: {
+    methodKind: "unary";
+    input: typeof SecretsCreateRequestSchema;
+    output: typeof SecretsCreateResponseSchema;
+  },
+  /**
+   * Updates an existing secret.
+   *
+   * @generated from rpc osac.public.v1.Secrets.Update
+   */
+  update: {
+    methodKind: "unary";
+    input: typeof SecretsUpdateRequestSchema;
+    output: typeof SecretsUpdateResponseSchema;
+  },
+  /**
+   * Deletes a secret.
+   *
+   * @generated from rpc osac.public.v1.Secrets.Delete
+   */
+  delete: {
+    methodKind: "unary";
+    input: typeof SecretsDeleteRequestSchema;
+    output: typeof SecretsDeleteResponseSchema;
+  },
+}> = /*@__PURE__*/
+  serviceDesc(file_osac_public_v1_secrets_service, 0);
+
diff --git a/libs/types/src/osac/public/v1/tenant_type_pb.ts b/libs/types/src/osac/public/v1/tenant_type_pb.ts
index 54588952..95403415 100644
--- a/libs/types/src/osac/public/v1/tenant_type_pb.ts
+++ b/libs/types/src/osac/public/v1/tenant_type_pb.ts
@@ -30,6 +30,8 @@ export const file_osac_public_v1_tenant_type: GenFile = /*@__PURE__*/
 /**
  * A tenant groups resources and users for a customer or business unit.
  *
+ * buf:lint:ignore OSAC_OBJECT_SHAPE
+ *
  * @generated from message osac.public.v1.Tenant
  */
 export type Tenant = Message<"osac.public.v1.Tenant"> & {
diff --git a/libs/ui-components/package.json b/libs/ui-components/package.json
index b91f0175..9ceee3a5 100644
--- a/libs/ui-components/package.json
+++ b/libs/ui-components/package.json
@@ -19,6 +19,7 @@
     "@xterm/addon-clipboard": "^0.1.0",
     "@xterm/addon-fit": "^0.10.0",
     "@xterm/xterm": "^5.5.0",
+    "ajv": "^8.20.0",
     "formik": "^2.4.9",
     "ip-address": "^10.2.0",
     "react": "^19.2.4",
diff --git a/libs/ui-components/src/NetworkTopologyPage.tsx b/libs/ui-components/src/NetworkTopologyPage.tsx
index 5340a811..39d2abc7 100644
--- a/libs/ui-components/src/NetworkTopologyPage.tsx
+++ b/libs/ui-components/src/NetworkTopologyPage.tsx
@@ -62,12 +62,7 @@ const readSubnet = (vm: ComputeInstance): string => {
 };
 
 const readIpAddress = (vm: ComputeInstance): string | undefined => {
-  return (
-    vm.status?.publicIpAddress?.trim() ||
-    vm.status?.internalIpAddress?.trim() ||
-    wireStr(vm.status, 'public_ip_address', 'publicIpAddress') ||
-    wireStr(vm.status, 'internal_ip_address', 'internalIpAddress', 'ipAddress')
-  );
+  return vm.status?.externalIpAddress || vm.status?.internalIpAddress;
 };
 
 const groupBySubnet = (vms: ComputeInstance[]): SubnetGroup[] => {
diff --git a/libs/ui-components/src/api/v1/cluster-templates.ts b/libs/ui-components/src/api/v1/cluster-templates.ts
index da0f6746..8a7760be 100644
--- a/libs/ui-components/src/api/v1/cluster-templates.ts
+++ b/libs/ui-components/src/api/v1/cluster-templates.ts
@@ -1,15 +1,16 @@
 import { ClusterTemplates } from '@osac/types';
 
 import { useApiFetch } from '../api-context';
-import { apiQueryKey } from '../types';
+import { ListParams, apiQueryKey } from '../types';
 import { useApiQuery } from '../use-api-query';
 
-export const useClusterTemplate = (id: string | undefined) => {
+export const useClusterTemplates = (params: ListParams = {}) => {
   const client = useApiFetch(ClusterTemplates);
   return useApiQuery({
-    queryKey: apiQueryKey('v1/cluster_templates', id ? [id] : undefined),
-    queryFn: () => client.get({ id: id ?? '' }),
-    select: (data) => data.object,
-    enabled: Boolean(id),
+    queryKey: apiQueryKey('v1/cluster_templates'),
+    queryFn: () => client.list(params),
+    select: (data) => {
+      return data.items;
+    },
   });
 };
diff --git a/libs/ui-components/src/api/v1/host-types.ts b/libs/ui-components/src/api/v1/host-types.ts
deleted file mode 100644
index 9931e90f..00000000
--- a/libs/ui-components/src/api/v1/host-types.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { type HostType, HostTypes } from '@osac/types';
-
-import { useApiFetch } from '../api-context';
-import { type ListParams, apiQueryKey } from '../types';
-import { resourceDisplayName } from './networking';
-import { useApiQuery } from '../use-api-query';
-
-type HostTypesQueryOptions = {
-  enabled?: boolean;
-};
-
-export const useHostTypes = (params: ListParams = {}, options: HostTypesQueryOptions = {}) => {
-  const client = useApiFetch(HostTypes);
-  return useApiQuery({
-    queryKey: apiQueryKey('v1/host_types', undefined, params),
-    queryFn: () => client.list(params),
-    select: (data) => data.items,
-    enabled: options.enabled ?? true,
-  });
-};
-
-export const useHostType = (id: string | undefined) => {
-  const client = useApiFetch(HostTypes);
-  return useApiQuery({
-    queryKey: apiQueryKey('v1/host_types', id ? [id] : undefined),
-    queryFn: () => client.get({ id: id ?? '' }),
-    select: (data) => data.object,
-    enabled: Boolean(id),
-  });
-};
-
-export const hostTypeDisplayName = (hostType: HostType): string =>
-  hostType.title?.trim() || resourceDisplayName(hostType.metadata, hostType.id);
diff --git a/libs/ui-components/src/api/v1/networking.ts b/libs/ui-components/src/api/v1/networking.ts
index af421235..ec9416c9 100644
--- a/libs/ui-components/src/api/v1/networking.ts
+++ b/libs/ui-components/src/api/v1/networking.ts
@@ -69,6 +69,20 @@ export const useSecurityGroups = (
   });
 };
 
+const securityGroupIdsFilter = (ids: string[]): string =>
+  ids.map((id) => `this.id == "${escapeCelStringLiteral(id)}"`).join(' || ');
+
+export const useSecurityGroupsByIds = (ids: string[]) => {
+  const client = useApiFetch(SecurityGroups);
+  const hasIds = ids.length > 0;
+  return useApiQuery({
+    queryKey: apiQueryKey('v1/security_groups', ids),
+    queryFn: () => client.list({ filter: securityGroupIdsFilter(ids) }),
+    select: (data) => data.items,
+    enabled: hasIds,
+  });
+};
+
 export const virtualNetworkFilterForSubnetList = (virtualNetworkId: string): string =>
   combineListFilters(virtualNetworkScopeFilter(virtualNetworkId), SUBNET_READY_LIST_FILTER);
 
diff --git a/libs/ui-components/src/components/BareMetalInstance/CreateWizard/BareMetalInstanceCreateWizard.tsx b/libs/ui-components/src/components/BareMetalInstance/CreateWizard/BareMetalInstanceCreateWizard.tsx
new file mode 100644
index 00000000..d74aca35
--- /dev/null
+++ b/libs/ui-components/src/components/BareMetalInstance/CreateWizard/BareMetalInstanceCreateWizard.tsx
@@ -0,0 +1,149 @@
+import { useState } from 'react';
+import { useNavigate, useParams } from 'react-router-dom';
+import {
+  Breadcrumb,
+  BreadcrumbItem,
+  Bullseye,
+  Button,
+  Content,
+  PageSection,
+  PageSectionTypes,
+  Spinner,
+  Title,
+  Wizard,
+  WizardStep,
+  WizardStepType,
+} from '@patternfly/react-core';
+import { Formik } from 'formik';
+
+import { BareMetalInstanceCatalogItem } from '@osac/types';
+
+import { buildBmCreatePayload } from './payload';
+import BareMetalConfigurationStep from './steps/BareMetalConfigurationStep';
+import BareMetalGeneralStep from './steps/BareMetalGeneralStep';
+import { BareMetalReview } from './steps/BareMetalReview';
+import { bmStepHasErrors, buildFullBmSchema } from './validation';
+import { type BareMetalInstanceWizardValues, buildBmInitialValues } from './values';
+import {
+  useBareMetalInstanceCatalogItems,
+  useCreateBareMetalInstance,
+} from '../../../api/v1/baremetal-instance';
+import { useTranslation } from '../../../hooks/useTranslation';
+import { CatalogStepContent } from '../../catalogProvision/shared/CatalogStepContent';
+import { FieldValidationProvider } from '../../Form/FieldValidationContext';
+import { LeaveFormConfirmation } from '../../Form/LeaveFormConfirmation';
+import { OSACWizardFooter } from '../../Wizard/OSACWizardFooter';
+
+export const BareMetalInstanceCreateWizard = () => {
+  const { t } = useTranslation();
+  const { catalogItemId } = useParams<{ catalogItemId?: string }>();
+  const { data: catalogItems = [], isLoading, error, refetch } = useBareMetalInstanceCatalogItems();
+
+  const navigate = useNavigate();
+  const createBareMetalInstance = useCreateBareMetalInstance();
+  const [currentStep, setCurrentStep] = useState<WizardStepType>();
+
+  if (isLoading) {
+    return (
+      <Bullseye>
+        <Spinner aria-label={t('Loading catalog')} />
+      </Bullseye>
+    );
+  }
+
+  const initialItem = catalogItemId
+    ? catalogItems.find((item) => item.id === catalogItemId)
+    : undefined;
+
+  const initialValues = buildBmInitialValues(initialItem);
+
+  const onSubmit = async (
+    values: BareMetalInstanceWizardValues,
+    helpers: { setStatus: (status: unknown) => void },
+  ) => {
+    try {
+      const instance = await createBareMetalInstance.mutateAsync(buildBmCreatePayload(values));
+      navigate(`/bare-metal/${instance?.id}`);
+    } catch (err) {
+      helpers.setStatus({
+        provisionError:
+          err instanceof Error ? err.message : t('Provisioning failed. Please try again.'),
+      });
+    }
+  };
+
+  return (
+    <Formik
+      initialValues={initialValues}
+      validationSchema={buildFullBmSchema(t)}
+      onSubmit={onSubmit}
+    >
+      {(formik) => (
+        <>
+          <PageSection hasBodyWrapper={false}>
+            <Breadcrumb>
+              <BreadcrumbItem>
+                <Button variant="link" isInline onClick={() => navigate('/bare-metal')}>
+                  {t('Bare Metal')}
+                </Button>
+              </BreadcrumbItem>
+              <BreadcrumbItem isActive>{t('Provision bare metal')}</BreadcrumbItem>
+            </Breadcrumb>
+            <Title headingLevel="h1" size="3xl">
+              {t('Provision bare metal')}
+            </Title>
+            <Content component="p">
+              {t('Provision a bare metal instance from a catalog item.')}
+            </Content>
+          </PageSection>
+          <FieldValidationProvider>
+            <LeaveFormConfirmation />
+            <PageSection
+              hasBodyWrapper={false}
+              type={PageSectionTypes.wizard}
+              aria-label={t('Bare metal provisioning wizard')}
+            >
+              <Wizard
+                navAriaLabel={t('Provision bare metal steps')}
+                isVisitRequired
+                footer={
+                  <OSACWizardFooter
+                    onCancel={() => navigate('/bare-metal')}
+                    stepHasErrors={bmStepHasErrors}
+                  />
+                }
+                onStepChange={(_, step) => {
+                  setCurrentStep(step);
+                }}
+              >
+                <WizardStep id="catalog" name={t('Catalog')}>
+                  {(!currentStep || currentStep?.id === 'catalog') && (
+                    <CatalogStepContent<BareMetalInstanceCatalogItem>
+                      catalogItems={catalogItems}
+                      error={error}
+                      onRefetch={() => void refetch()}
+                      onSelect={(item) => {
+                        formik.resetForm({ values: buildBmInitialValues(item) });
+                      }}
+                    />
+                  )}
+                </WizardStep>
+                <WizardStep id="general" name={t('General')}>
+                  {currentStep?.id === 'general' && <BareMetalGeneralStep />}
+                </WizardStep>
+                <WizardStep id="configuration" name={t('Configuration')}>
+                  {currentStep?.id === 'configuration' && <BareMetalConfigurationStep />}
+                </WizardStep>
+                <WizardStep id="review" name={t('Review')}>
+                  {currentStep?.id === 'review' && <BareMetalReview />}
+                </WizardStep>
+              </Wizard>
+            </PageSection>
+          </FieldValidationProvider>
+        </>
+      )}
+    </Formik>
+  );
+};
+
+export default BareMetalInstanceCreateWizard;
diff --git a/libs/ui-components/src/components/BareMetalInstance/CreateWizard/payload.ts b/libs/ui-components/src/components/BareMetalInstance/CreateWizard/payload.ts
new file mode 100644
index 00000000..af67047b
--- /dev/null
+++ b/libs/ui-components/src/components/BareMetalInstance/CreateWizard/payload.ts
@@ -0,0 +1,33 @@
+import type { MessageInitShape } from '@bufbuild/protobuf';
+
+import { BareMetalInstanceSchema } from '@osac/types';
+
+import type { BareMetalInstanceWizardValues } from './values';
+import { isFieldEditable } from '../../catalogProvision/utils';
+
+export const buildBmCreatePayload = (
+  values: BareMetalInstanceWizardValues,
+): MessageInitShape<typeof BareMetalInstanceSchema> => {
+  const fds = values.catalogItem?.fieldDefinitions || [];
+
+  const bmi: MessageInitShape<typeof BareMetalInstanceSchema> = {
+    metadata: values.metadata,
+    spec: {
+      catalogItem: values.catalogItem?.id,
+    },
+  };
+
+  if (bmi.spec) {
+    if (isFieldEditable('ssh_public_key', fds)) {
+      bmi.spec.sshPublicKey = values.spec.sshPublicKey;
+    }
+    if (isFieldEditable('run_strategy', fds)) {
+      bmi.spec.runStrategy = values.spec.runStrategy;
+    }
+    if (isFieldEditable('user_data', fds)) {
+      bmi.spec.userData = values.spec.userData;
+    }
+  }
+
+  return bmi;
+};
diff --git a/libs/ui-components/src/components/BareMetalInstance/CreateWizard/steps/BareMetalConfigurationStep.tsx b/libs/ui-components/src/components/BareMetalInstance/CreateWizard/steps/BareMetalConfigurationStep.tsx
new file mode 100644
index 00000000..78e54627
--- /dev/null
+++ b/libs/ui-components/src/components/BareMetalInstance/CreateWizard/steps/BareMetalConfigurationStep.tsx
@@ -0,0 +1,51 @@
+import { useFormikContext } from 'formik';
+import { type TFunction } from 'i18next';
+
+import UserDataField from '@osac/ui-components/components/catalogProvision/UserDataField';
+import { isFieldEditable } from '@osac/ui-components/components/catalogProvision/utils';
+import OsacForm from '@osac/ui-components/components/Form/OsacForm';
+import { SelectField } from '@osac/ui-components/components/Form/SelectField';
+
+import { useTranslation } from '../../../../hooks/useTranslation';
+import { BareMetalInstanceWizardValues } from '../values';
+
+export const runStrategies = (t: TFunction) => [
+  {
+    label: t('Always'),
+    value: 1,
+  },
+  {
+    label: t('Halted'),
+    value: 2,
+  },
+  {
+    label: t('Unspecified'),
+    value: 0,
+  },
+];
+
+const BareMetalConfigurationStep = () => {
+  const { t } = useTranslation();
+  const { values } = useFormikContext<BareMetalInstanceWizardValues>();
+
+  if (!values.catalogItem) {
+    return null;
+  }
+
+  const runStrategyEditable = isFieldEditable('run_strategy', values.catalogItem.fieldDefinitions);
+  return (
+    <OsacForm>
+      <SelectField
+        name={'spec.runStrategy'}
+        fieldId={'spec-run-strategy'}
+        label={t('Run strategy')}
+        options={runStrategies(t)}
+        autoSelectSingleOption={runStrategyEditable}
+        isDisabled={!runStrategyEditable}
+      />
+      <UserDataField fieldDefinitions={values.catalogItem.fieldDefinitions} />
+    </OsacForm>
+  );
+};
+
+export default BareMetalConfigurationStep;
diff --git a/libs/ui-components/src/components/BareMetalInstance/CreateWizard/steps/BareMetalGeneralStep.tsx b/libs/ui-components/src/components/BareMetalInstance/CreateWizard/steps/BareMetalGeneralStep.tsx
new file mode 100644
index 00000000..a5999129
--- /dev/null
+++ b/libs/ui-components/src/components/BareMetalInstance/CreateWizard/steps/BareMetalGeneralStep.tsx
@@ -0,0 +1,23 @@
+import { useFormikContext } from 'formik';
+
+import NameField from '@osac/ui-components/components/catalogProvision/NameField';
+import SshKeyField from '@osac/ui-components/components/catalogProvision/SshKeyField';
+import OsacForm from '@osac/ui-components/components/Form/OsacForm';
+
+import { BareMetalInstanceWizardValues } from '../values';
+
+const BareMetalGeneralStep = () => {
+  const { values } = useFormikContext<BareMetalInstanceWizardValues>();
+
+  if (!values.catalogItem) {
+    return null;
+  }
+  return (
+    <OsacForm>
+      <NameField />
+      <SshKeyField fieldDefinitions={values.catalogItem.fieldDefinitions} />
+    </OsacForm>
+  );
+};
+
+export default BareMetalGeneralStep;
diff --git a/libs/ui-components/src/components/BareMetalInstance/CreateWizard/steps/BareMetalReview.tsx b/libs/ui-components/src/components/BareMetalInstance/CreateWizard/steps/BareMetalReview.tsx
new file mode 100644
index 00000000..3624e26c
--- /dev/null
+++ b/libs/ui-components/src/components/BareMetalInstance/CreateWizard/steps/BareMetalReview.tsx
@@ -0,0 +1,58 @@
+import {
+  DescriptionList,
+  DescriptionListDescription,
+  DescriptionListGroup,
+  DescriptionListTerm,
+} from '@patternfly/react-core';
+import { useFormikContext } from 'formik';
+
+import { useTranslation } from '../../../../hooks/useTranslation';
+import type { BareMetalInstanceWizardValues } from '../values';
+import { runStrategies } from './BareMetalConfigurationStep';
+
+export const BareMetalReview = () => {
+  const { t } = useTranslation();
+  const { values } = useFormikContext<BareMetalInstanceWizardValues>();
+
+  if (!values.catalogItem) {
+    return null;
+  }
+
+  const sections = [
+    {
+      title: t('General'),
+      rows: [
+        { label: t('Name'), value: values.metadata.name },
+        { label: t('SSH public key'), value: values.spec.sshPublicKey || '-' },
+      ],
+    },
+    {
+      title: t('Configuration'),
+      rows: [
+        {
+          label: t('Run strategy'),
+          value:
+            runStrategies(t).find(({ value }) => value === values.spec.runStrategy)?.label || '-',
+        },
+        { label: t('User data'), value: values.spec.userData || '-' },
+      ],
+    },
+  ];
+
+  const rows = sections.flatMap((section) => section.rows);
+
+  return (
+    <DescriptionList isHorizontal isCompact aria-label={t('Review')}>
+      <DescriptionListGroup>
+        <DescriptionListTerm>{t('Catalog item')}</DescriptionListTerm>
+        <DescriptionListDescription>{values.catalogItem.title}</DescriptionListDescription>
+      </DescriptionListGroup>
+      {rows.map((row) => (
+        <DescriptionListGroup key={row.label}>
+          <DescriptionListTerm>{row.label}</DescriptionListTerm>
+          <DescriptionListDescription>{row.value}</DescriptionListDescription>
+        </DescriptionListGroup>
+      ))}
+    </DescriptionList>
+  );
+};
diff --git a/libs/ui-components/src/components/BareMetalInstance/CreateWizard/validation.ts b/libs/ui-components/src/components/BareMetalInstance/CreateWizard/validation.ts
new file mode 100644
index 00000000..3689c16c
--- /dev/null
+++ b/libs/ui-components/src/components/BareMetalInstance/CreateWizard/validation.ts
@@ -0,0 +1,49 @@
+import type { FormikErrors } from 'formik';
+import type { TFunction } from 'i18next';
+import * as Yup from 'yup';
+
+import { camelKeysToSnake } from '@osac/ui-components/utils/snakeCase';
+import { buildMetadataNameSchema } from '@osac/ui-components/validation/name';
+import { sshPublicKeySchema } from '@osac/ui-components/validation/ssh-public-key';
+import { userDataSchema } from '@osac/ui-components/validation/user-data';
+
+import { buildBmCreatePayload } from './payload';
+import type { BareMetalInstanceWizardValues } from './values';
+import { buildFieldSchema } from '../../catalogProvision/validation';
+
+export const buildFullBmSchema = (t: TFunction) => {
+  return Yup.lazy((values: BareMetalInstanceWizardValues) => {
+    const fds = values.catalogItem?.fieldDefinitions || [];
+    const payload = buildBmCreatePayload(values);
+    const snakeSpec = camelKeysToSnake(payload.spec ?? {}) as Record<string, unknown>;
+    const fieldSchema = buildFieldSchema(snakeSpec, fds);
+
+    return Yup.object({
+      catalogItem: Yup.object().required(t('Catalog item is required')),
+      metadata: Yup.object({
+        name: buildMetadataNameSchema(t),
+      }),
+      spec: Yup.object({
+        runStrategy: fieldSchema('run_strategy'),
+        sshPublicKey: fieldSchema('ssh_public_key', sshPublicKeySchema(t)),
+        userData: fieldSchema('user_data', userDataSchema(t)),
+      }),
+    });
+  });
+};
+
+export const bmStepHasErrors = (
+  stepId: string,
+  errors: FormikErrors<BareMetalInstanceWizardValues>,
+): boolean => {
+  switch (stepId) {
+    case 'catalog':
+      return Boolean(errors.catalogItem);
+    case 'general':
+      return Boolean(errors.metadata?.name || errors.spec?.sshPublicKey);
+    case 'configuration':
+      return Boolean(errors.spec?.runStrategy || errors.spec?.userData);
+    default:
+      return false;
+  }
+};
diff --git a/libs/ui-components/src/components/BareMetalInstance/CreateWizard/values.ts b/libs/ui-components/src/components/BareMetalInstance/CreateWizard/values.ts
new file mode 100644
index 00000000..1529c892
--- /dev/null
+++ b/libs/ui-components/src/components/BareMetalInstance/CreateWizard/values.ts
@@ -0,0 +1,71 @@
+import { BareMetalInstanceCatalogItem, BareMetalInstanceRunStrategy } from '@osac/types';
+
+import { getNumberDefaultValue, getStringDefaultValue } from '../../catalogProvision/utils';
+import { clearSchemaCache } from '../../catalogProvision/validation';
+
+export interface BareMetalInstanceWizardValues {
+  catalogItem: BareMetalInstanceCatalogItem | undefined;
+  metadata: {
+    name: string;
+  };
+  spec: {
+    runStrategy: BareMetalInstanceRunStrategy | undefined;
+    sshPublicKey: string;
+    userData: string;
+  };
+}
+
+const getEmptyBareMetalInstanceValues = (
+  catalogItem: BareMetalInstanceCatalogItem | undefined,
+): BareMetalInstanceWizardValues => ({
+  catalogItem,
+  metadata: { name: '' },
+  spec: {
+    runStrategy: undefined,
+    sshPublicKey: '',
+    userData: '',
+  },
+});
+
+export const buildBmInitialValues = (
+  item: BareMetalInstanceCatalogItem | undefined,
+): BareMetalInstanceWizardValues => {
+  clearSchemaCache();
+  const base = getEmptyBareMetalInstanceValues(item);
+  if (!item) {
+    return base;
+  }
+
+  const sshDefault = getStringDefaultValue('ssh_public_key', item.fieldDefinitions);
+
+  if (sshDefault) {
+    base.spec.sshPublicKey = sshDefault;
+  }
+
+  const userDataDefault = getStringDefaultValue('user_data', item.fieldDefinitions);
+
+  if (userDataDefault) {
+    base.spec.userData = userDataDefault;
+  }
+
+  const runStrategyDefault =
+    getStringDefaultValue('run_strategy', item.fieldDefinitions) ||
+    getNumberDefaultValue('run_strategy', item.fieldDefinitions);
+
+  switch (runStrategyDefault) {
+    case 0:
+    case 'BARE_METAL_INSTANCE_RUN_STRATEGY_UNSPECIFIED':
+      base.spec.runStrategy = BareMetalInstanceRunStrategy.UNSPECIFIED;
+      break;
+    case 1:
+    case 'BARE_METAL_INSTANCE_RUN_STRATEGY_ALWAYS':
+      base.spec.runStrategy = BareMetalInstanceRunStrategy.ALWAYS;
+      break;
+    case 2:
+    case 'BARE_METAL_INSTANCE_RUN_STRATEGY_HALTED':
+      base.spec.runStrategy = BareMetalInstanceRunStrategy.HALTED;
+      break;
+  }
+
+  return base;
+};
diff --git a/libs/ui-components/src/components/Cluster/ClusterStatusLabel.tsx b/libs/ui-components/src/components/Cluster/ClusterStatusLabel.tsx
index 205691af..71903c13 100644
--- a/libs/ui-components/src/components/Cluster/ClusterStatusLabel.tsx
+++ b/libs/ui-components/src/components/Cluster/ClusterStatusLabel.tsx
@@ -11,23 +11,14 @@ const CLUSTER_STATUS_MAP: Record<ClusterState, { status: StatusKind; text: strin
   [ClusterState.PROGRESSING]: { status: 'progressing', text: 'Provisioning' },
   [ClusterState.READY]: { status: 'ready', text: 'Ready' },
   [ClusterState.FAILED]: { status: 'failed', text: 'Failed' },
-};
-
-const resolveClusterStatus = (state?: ClusterState): { status: StatusKind; text: string } => {
-  switch (state) {
-    case ClusterState.PROGRESSING:
-      return CLUSTER_STATUS_MAP[ClusterState.PROGRESSING];
-    case ClusterState.READY:
-      return CLUSTER_STATUS_MAP[ClusterState.READY];
-    case ClusterState.FAILED:
-      return CLUSTER_STATUS_MAP[ClusterState.FAILED];
-    default:
-      return CLUSTER_STATUS_MAP[ClusterState.UNSPECIFIED];
-  }
+  [ClusterState.DELETING]: { status: 'progressing', text: 'Deleting' },
+  [ClusterState.DELETE_FAILED]: { status: 'failed', text: 'Delete failed' },
 };
 
 export const ClusterStatusLabel = ({ state }: ClusterStatusLabelProps) => {
-  const { status, text } = resolveClusterStatus(state);
+  const { status, text } = state
+    ? CLUSTER_STATUS_MAP[state]
+    : CLUSTER_STATUS_MAP[ClusterState.UNSPECIFIED];
 
   return <ResourceStatusLabel status={status} text={text} />;
 };
diff --git a/libs/ui-components/src/pages/tenant/ClusterCreatePage.test.tsx b/libs/ui-components/src/components/Cluster/CreateWizard/ClusterCreateWizard.test.tsx
similarity index 66%
rename from libs/ui-components/src/pages/tenant/ClusterCreatePage.test.tsx
rename to libs/ui-components/src/components/Cluster/CreateWizard/ClusterCreateWizard.test.tsx
index 42371498..e9717d7c 100644
--- a/libs/ui-components/src/pages/tenant/ClusterCreatePage.test.tsx
+++ b/libs/ui-components/src/components/Cluster/CreateWizard/ClusterCreateWizard.test.tsx
@@ -1,13 +1,67 @@
-import { Route, Routes } from 'react-router-dom';
-import { fireEvent, screen, waitFor, within } from '@testing-library/react';
-import { UserEvent } from '@testing-library/user-event';
+import { I18nextProvider } from 'react-i18next';
+import { RouterProvider, createMemoryRouter } from 'react-router-dom';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { fireEvent, render, screen, waitFor, within } from '@testing-library/react';
+import type { UserEvent } from '@testing-library/user-event';
+import userEvent from '@testing-library/user-event';
+import i18n from 'i18next';
 import { describe, expect, it, vi } from 'vitest';
 
 import type { Cluster, ClusterCatalogItem, ClustersCreateResponse } from '@osac/types';
 
-import { ClusterCreatePage } from './ClusterCreatePage';
-import type { MockApiFixtures } from '../../test-utils/createMockConnectTransport';
-import { renderWithProviders } from '../../test-utils/TestProviders';
+import ClusterCreateWizard from './ClusterCreateWizard';
+import en from '../../../../../i18n/locales/en/translation.json';
+import { ApiProvider } from '../../../api/api-context';
+import { createMockConnectTransport } from '../../../test-utils/createMockConnectTransport';
+import type {
+  MockApiFixtures,
+  MockTransportOverrides,
+} from '../../../test-utils/createMockConnectTransport';
+
+const createTestI18n = () => {
+  const instance = i18n.createInstance();
+  instance.init({
+    initImmediate: false,
+    lng: 'en',
+    fallbackLng: 'en',
+    resources: { en: { translation: en } },
+    interpolation: { escapeValue: false },
+  });
+  return instance;
+};
+
+const renderWithDataRouter = (
+  apiFixtures?: MockApiFixtures,
+  transportOverrides?: MockTransportOverrides,
+) => {
+  const i18nInstance = createTestI18n();
+  const transport = createMockConnectTransport(apiFixtures, transportOverrides);
+  const queryClient = new QueryClient({
+    defaultOptions: {
+      queries: { retry: false, refetchOnWindowFocus: false, refetchInterval: false },
+    },
+  });
+
+  const router = createMemoryRouter(
+    [
+      { path: '/clusters/create', element: <ClusterCreateWizard /> },
+      { path: '/clusters/:clusterId', element: <div>Cluster details route</div> },
+    ],
+    { initialEntries: ['/clusters/create'] },
+  );
+
+  const view = render(
+    <I18nextProvider i18n={i18nInstance}>
+      <ApiProvider transport={transport}>
+        <QueryClientProvider client={queryClient}>
+          <RouterProvider router={router} />
+        </QueryClientProvider>
+      </ApiProvider>
+    </I18nextProvider>,
+  );
+
+  return { ...view, user: userEvent.setup(), router };
+};
 
 const fillClusterGeneralStep = async (
   user: UserEvent,
@@ -21,15 +75,11 @@ const fillClusterGeneralStep = async (
   fireEvent.change(pullSecretInput, { target: { value: pullSecret } });
 };
 
-const fillClusterNodeSetRow = async (user: UserEvent, hostTypeLabel = 'ACME 1TB', size = '3') => {
+const fillClusterNodeSetRow = async (_user: UserEvent) => {
   await waitFor(() => {
-    expect(screen.getByText('Node set 1')).toBeInTheDocument();
+    expect(screen.getByText('Node Sets')).toBeInTheDocument();
   });
-  await user.click(screen.getByLabelText(/^Host type/));
-  await user.click(screen.getByRole('option', { name: hostTypeLabel }));
-  const sizeInput = screen.getByRole('spinbutton', { name: /^Nodes/ });
-  await user.clear(sizeInput);
-  await user.type(sizeInput, size);
+  expect(screen.getByRole('spinbutton', { name: /compute size/ })).toBeInTheDocument();
 };
 
 const catalogItemGroup = () => screen.getByRole('radiogroup', { name: 'Catalog item' });
@@ -180,20 +230,7 @@ describe('ClusterCreatePage', () => {
       };
     });
 
-    const { user } = renderWithProviders(
-      <Routes>
-        <Route path="/clusters/create" element={<ClusterCreatePage />} />
-        <Route
-          path="/clusters/:clusterId"
-          element={<div>Cluster details {createdCluster.id}</div>}
-        />
-      </Routes>,
-      {
-        routerEntries: ['/clusters/create'],
-        apiFixtures,
-        transportOverrides: { onClusterCreate },
-      },
-    );
+    const { user } = renderWithDataRouter(apiFixtures, { onClusterCreate });
 
     await selectCatalogItem(user, clusterCatalogItem.title);
     await clickWizardNext(user);
@@ -208,7 +245,7 @@ describe('ClusterCreatePage', () => {
     await user.click(screen.getByRole('button', { name: 'Create' }));
 
     await waitFor(() => {
-      expect(screen.getByText(`Cluster details ${createdCluster.id}`)).toBeInTheDocument();
+      expect(screen.getByText('Cluster details route')).toBeInTheDocument();
     });
 
     expect(onClusterCreate).toHaveBeenCalledTimes(1);
diff --git a/libs/ui-components/src/components/Cluster/CreateWizard/ClusterCreateWizard.tsx b/libs/ui-components/src/components/Cluster/CreateWizard/ClusterCreateWizard.tsx
new file mode 100644
index 00000000..fbc8dc74
--- /dev/null
+++ b/libs/ui-components/src/components/Cluster/CreateWizard/ClusterCreateWizard.tsx
@@ -0,0 +1,154 @@
+import { useState } from 'react';
+import { useNavigate, useParams } from 'react-router-dom';
+import {
+  Breadcrumb,
+  BreadcrumbItem,
+  Bullseye,
+  Button,
+  Content,
+  PageSection,
+  PageSectionTypes,
+  Spinner,
+  Title,
+  Wizard,
+  WizardStep,
+  WizardStepType,
+} from '@patternfly/react-core';
+import { Formik } from 'formik';
+
+import { useClusterTemplates } from '@osac/ui-components/api/v1/cluster-templates';
+
+import { buildClusterCreatePayload } from './payload';
+import ClusterConfigurationStep from './steps/ClusterConfigurationStep';
+import ClusterGeneralStep from './steps/ClusterGeneralStep';
+import ClusterNetworkingStep from './steps/ClusterNetworkingStep';
+import { ClusterReview } from './steps/ClusterReview';
+import { buildFullClusterSchema, clusterStepHasErrors } from './validation';
+import { type ClusterWizardValues, buildClusterInitialValues } from './values';
+import { useProvisionCluster } from '../../../api/v1/cluster';
+import { useClusterCatalogItems } from '../../../api/v1/cluster-catalog-item';
+import { useTranslation } from '../../../hooks/useTranslation';
+import { CatalogStepContent } from '../../catalogProvision/shared/CatalogStepContent';
+import { FieldValidationProvider } from '../../Form/FieldValidationContext';
+import { LeaveFormConfirmation } from '../../Form/LeaveFormConfirmation';
+import { OSACWizardFooter } from '../../Wizard/OSACWizardFooter';
+
+const ClusterCreateWizard = () => {
+  const navigate = useNavigate();
+  const { t } = useTranslation();
+  const { catalogItemId } = useParams<{ catalogItemId?: string }>();
+  const { data: catalogItems = [], isLoading, error, refetch } = useClusterCatalogItems();
+  const provisionCluster = useProvisionCluster();
+  const [currentStep, setCurrentStep] = useState<WizardStepType>();
+
+  const { data: clusterTemplates, isLoading: templatesLoading } = useClusterTemplates();
+
+  const initialItem = catalogItemId
+    ? catalogItems.find((item) => item.id === catalogItemId)
+    : undefined;
+
+  if (isLoading || templatesLoading) {
+    return (
+      <Bullseye>
+        <Spinner aria-label={t('Loading catalog')} />
+      </Bullseye>
+    );
+  }
+
+  const initialValues = buildClusterInitialValues(initialItem, clusterTemplates);
+
+  const onSubmit = async (
+    values: ClusterWizardValues,
+    helpers: { setStatus: (status: unknown) => void },
+  ) => {
+    try {
+      const cluster = await provisionCluster.mutateAsync(buildClusterCreatePayload(values));
+      navigate(`/clusters/${cluster?.id}`);
+    } catch (err) {
+      helpers.setStatus({
+        provisionError:
+          err instanceof Error ? err.message : t('Provisioning failed. Please try again.'),
+      });
+    }
+  };
+
+  return (
+    <Formik
+      initialValues={initialValues}
+      validationSchema={buildFullClusterSchema(t)}
+      onSubmit={onSubmit}
+    >
+      {(formik) => (
+        <>
+          <PageSection hasBodyWrapper={false}>
+            <Breadcrumb>
+              <BreadcrumbItem>
+                <Button variant="link" isInline onClick={() => navigate('/clusters')}>
+                  {t('Clusters')}
+                </Button>
+              </BreadcrumbItem>
+              <BreadcrumbItem isActive>{t('Create cluster')}</BreadcrumbItem>
+            </Breadcrumb>
+            <Title headingLevel="h1" size="3xl">
+              {t('Create cluster')}
+            </Title>
+            <Content component="p">
+              {t('Select a catalog item, configure, and provision an OpenShift cluster.')}
+            </Content>
+          </PageSection>
+          <FieldValidationProvider>
+            <LeaveFormConfirmation />
+            <PageSection
+              hasBodyWrapper={false}
+              type={PageSectionTypes.wizard}
+              aria-label={t('Create cluster wizard')}
+            >
+              <Wizard
+                navAriaLabel={t('Create cluster steps')}
+                isVisitRequired
+                footer={
+                  <OSACWizardFooter
+                    onCancel={() => navigate('/clusters')}
+                    stepHasErrors={clusterStepHasErrors}
+                  />
+                }
+                onStepChange={(_, step) => {
+                  setCurrentStep(step);
+                }}
+              >
+                <WizardStep id="catalog" name={t('Catalog')}>
+                  {(!currentStep || currentStep?.id === 'catalog') && (
+                    <CatalogStepContent
+                      catalogItems={catalogItems}
+                      error={error}
+                      onRefetch={() => void refetch()}
+                      onSelect={(item) => {
+                        formik.resetForm({
+                          values: buildClusterInitialValues(item, clusterTemplates),
+                        });
+                      }}
+                    />
+                  )}
+                </WizardStep>
+                <WizardStep id="general" name={t('General')}>
+                  {currentStep?.id === 'general' && <ClusterGeneralStep />}
+                </WizardStep>
+                <WizardStep id="configuration" name={t('Configuration')}>
+                  {currentStep?.id === 'configuration' && <ClusterConfigurationStep />}
+                </WizardStep>
+                <WizardStep id="networking" name={t('Networking')}>
+                  {currentStep?.id === 'networking' && <ClusterNetworkingStep />}
+                </WizardStep>
+                <WizardStep id="review" name={t('Review')}>
+                  {currentStep?.id === 'review' && <ClusterReview />}
+                </WizardStep>
+              </Wizard>
+            </PageSection>
+          </FieldValidationProvider>
+        </>
+      )}
+    </Formik>
+  );
+};
+
+export default ClusterCreateWizard;
diff --git a/libs/ui-components/src/components/Cluster/CreateWizard/payload.ts b/libs/ui-components/src/components/Cluster/CreateWizard/payload.ts
new file mode 100644
index 00000000..a0ef7a90
--- /dev/null
+++ b/libs/ui-components/src/components/Cluster/CreateWizard/payload.ts
@@ -0,0 +1,80 @@
+import type { MessageInitShape } from '@bufbuild/protobuf';
+
+import { ClusterSchema } from '@osac/types';
+
+import type { ClusterWizardValues } from './values';
+import { getFieldDefinition, isFieldEditable } from '../../catalogProvision/utils';
+
+export const buildClusterCreatePayload = (
+  values: ClusterWizardValues,
+): MessageInitShape<typeof ClusterSchema> => {
+  const fds = values.catalogItem?.fieldDefinitions || [];
+
+  const cluster: MessageInitShape<typeof ClusterSchema> = {
+    metadata: { name: values.metadata.name },
+    spec: {
+      catalogItem: values.catalogItem?.id,
+    },
+  };
+
+  if (cluster.spec) {
+    if (isFieldEditable('release_image', fds)) {
+      cluster.spec.releaseImage = values.spec.releaseImage;
+    }
+
+    if (isFieldEditable('pull_secret', fds)) {
+      cluster.spec.pullSecret = values.spec.pullSecret;
+    }
+
+    if (isFieldEditable('ssh_public_key', fds)) {
+      cluster.spec.sshPublicKey = values.spec.sshPublicKey;
+    }
+
+    if (isFieldEditable('network.pod_cidr', fds)) {
+      cluster.spec.network = {
+        ...cluster.spec.network,
+        podCidr: values.spec.network.podCidr,
+      };
+    }
+
+    if (isFieldEditable('network.service_cidr', fds)) {
+      cluster.spec.network = {
+        ...cluster.spec.network,
+        serviceCidr: values.spec.network.serviceCidr,
+      };
+    }
+
+    const nodeSetsFd = getFieldDefinition('node_sets', fds);
+
+    if (nodeSetsFd?.editable === true) {
+      const nodeSets = values.spec.nodeSetRows.reduce(
+        (acc, curr) => {
+          const nodeSetFd = getFieldDefinition(`node_sets.${curr.name}.size`, fds);
+
+          if (!nodeSetFd || nodeSetFd.editable === true) {
+            acc[curr.name] = {
+              size: curr.size,
+            };
+          }
+          return acc;
+        },
+        {} as { [key: string]: { size: number } },
+      );
+
+      cluster.spec.nodeSets = nodeSets;
+    } else if (!nodeSetsFd) {
+      for (const nodeSet of values.spec.nodeSetRows) {
+        if (isFieldEditable(`node_sets.${nodeSet.name}.size`, fds)) {
+          cluster.spec.nodeSets = {
+            ...(cluster.spec.nodeSets || {}),
+            [nodeSet.name]: {
+              size: nodeSet.size,
+            },
+          };
+        }
+      }
+    }
+  }
+
+  return cluster;
+};
diff --git a/libs/ui-components/src/components/Cluster/CreateWizard/steps/ClusterConfigurationStep.tsx b/libs/ui-components/src/components/Cluster/CreateWizard/steps/ClusterConfigurationStep.tsx
new file mode 100644
index 00000000..7daf6e5e
--- /dev/null
+++ b/libs/ui-components/src/components/Cluster/CreateWizard/steps/ClusterConfigurationStep.tsx
@@ -0,0 +1,54 @@
+import { FormSection, Stack, StackItem } from '@patternfly/react-core';
+import { useFormikContext } from 'formik';
+
+import { isFieldEditable } from '@osac/ui-components/components/catalogProvision/utils';
+
+import { useTranslation } from '../../../../hooks/useTranslation';
+import { InputField } from '../../../Form/InputField';
+import OsacForm from '../../../Form/OsacForm';
+import { type ClusterWizardValues } from '../values';
+
+const ClusterConfigurationStep = () => {
+  const { t } = useTranslation();
+  const { values } = useFormikContext<ClusterWizardValues>();
+
+  if (!values.catalogItem) {
+    return null;
+  }
+
+  return (
+    <Stack hasGutter>
+      <StackItem>
+        <OsacForm>
+          <InputField
+            name="spec.releaseImage"
+            label={t('Release image')}
+            fieldId="cluster-release-image"
+            isRequired
+            isDisabled={!isFieldEditable('release_image', values.catalogItem.fieldDefinitions)}
+          />
+          <FormSection title={t('Node Sets')} titleElement="h2">
+            {values.spec.nodeSetRows.map((ns, index) => (
+              <InputField
+                key={index}
+                name={`spec.nodeSetRows[${index}].size`}
+                label={t('{{name}} size', { name: ns.name })}
+                fieldId={`cluster-node-set-size-${ns.name}`}
+                isRequired
+                isDisabled={
+                  !isFieldEditable(
+                    `node_sets.${ns.name}.size`,
+                    values.catalogItem?.fieldDefinitions || [],
+                  )
+                }
+                type="number"
+              />
+            ))}
+          </FormSection>
+        </OsacForm>
+      </StackItem>
+    </Stack>
+  );
+};
+
+export default ClusterConfigurationStep;
diff --git a/libs/ui-components/src/components/Cluster/CreateWizard/steps/ClusterGeneralStep.tsx b/libs/ui-components/src/components/Cluster/CreateWizard/steps/ClusterGeneralStep.tsx
new file mode 100644
index 00000000..29b52c09
--- /dev/null
+++ b/libs/ui-components/src/components/Cluster/CreateWizard/steps/ClusterGeneralStep.tsx
@@ -0,0 +1,52 @@
+import { useFormikContext } from 'formik';
+
+import { type FieldDefinition } from '@osac/types';
+import NameField from '@osac/ui-components/components/catalogProvision/NameField';
+import SshKeyField from '@osac/ui-components/components/catalogProvision/SshKeyField';
+import { isFieldEditable } from '@osac/ui-components/components/catalogProvision/utils';
+import { InputField } from '@osac/ui-components/components/Form/InputField';
+
+import { useTranslation } from '../../../../hooks/useTranslation';
+import OsacForm from '../../../Form/OsacForm';
+import { type ClusterWizardValues } from '../values';
+
+interface PullSecretFieldProps {
+  fieldDefinitions: FieldDefinition[];
+}
+
+const PullSecretField = ({ fieldDefinitions }: PullSecretFieldProps) => {
+  const { t } = useTranslation();
+
+  return (
+    <InputField
+      name="spec.pullSecret"
+      label={t('Pull secret')}
+      fieldId="spec-pullSecret"
+      isRequired
+      isDisabled={!isFieldEditable('pull_secret', fieldDefinitions)}
+      multiline
+      rows={9}
+      resizeOrientation="vertical"
+      helperText={t(
+        'Pull secrets download OpenShift components and connect clusters to your Red Hat account. Copy the full JSON from OpenShift Cluster Manager (console.redhat.com/openshift/install/pull-secret).',
+      )}
+    />
+  );
+};
+
+const ClusterGeneralStep = () => {
+  const { values } = useFormikContext<ClusterWizardValues>();
+  if (!values.catalogItem) {
+    return null;
+  }
+
+  return (
+    <OsacForm>
+      <NameField />
+      <SshKeyField fieldDefinitions={values.catalogItem.fieldDefinitions} />
+      <PullSecretField fieldDefinitions={values.catalogItem.fieldDefinitions} />
+    </OsacForm>
+  );
+};
+
+export default ClusterGeneralStep;
diff --git a/libs/ui-components/src/components/Cluster/CreateWizard/steps/ClusterNetworkingStep.tsx b/libs/ui-components/src/components/Cluster/CreateWizard/steps/ClusterNetworkingStep.tsx
new file mode 100644
index 00000000..d9c4ccb1
--- /dev/null
+++ b/libs/ui-components/src/components/Cluster/CreateWizard/steps/ClusterNetworkingStep.tsx
@@ -0,0 +1,45 @@
+import { Stack, StackItem } from '@patternfly/react-core';
+import { useFormikContext } from 'formik';
+
+import { isFieldEditable } from '@osac/ui-components/components/catalogProvision/utils';
+
+import { useTranslation } from '../../../../hooks/useTranslation';
+import { InputField } from '../../../Form/InputField';
+import OsacForm from '../../../Form/OsacForm';
+import { type ClusterWizardValues } from '../values';
+
+const ClusterNetworkingStep = () => {
+  const { t } = useTranslation();
+  const { values } = useFormikContext<ClusterWizardValues>();
+
+  if (!values.catalogItem) {
+    return null;
+  }
+
+  const fds = values.catalogItem.fieldDefinitions;
+
+  return (
+    <Stack hasGutter>
+      <StackItem>
+        <OsacForm>
+          <InputField
+            name="spec.network.podCidr"
+            label={t('Pod CIDR')}
+            fieldId="cluster-pod-cidr"
+            isDisabled={!isFieldEditable('network.pod_cidr', fds)}
+            helperText={t('Use IPv4 CIDR notation (for example 10.128.0.0/14).')}
+          />
+          <InputField
+            name="spec.network.serviceCidr"
+            label={t('Service CIDR')}
+            fieldId="cluster-service-cidr"
+            isDisabled={!isFieldEditable('network.service_cidr', fds)}
+            helperText={t('Use IPv4 CIDR notation (for example 172.30.0.0/16).')}
+          />
+        </OsacForm>
+      </StackItem>
+    </Stack>
+  );
+};
+
+export default ClusterNetworkingStep;
diff --git a/libs/ui-components/src/components/Cluster/CreateWizard/steps/ClusterReview.tsx b/libs/ui-components/src/components/Cluster/CreateWizard/steps/ClusterReview.tsx
new file mode 100644
index 00000000..ff80132e
--- /dev/null
+++ b/libs/ui-components/src/components/Cluster/CreateWizard/steps/ClusterReview.tsx
@@ -0,0 +1,49 @@
+import {
+  DescriptionList,
+  DescriptionListDescription,
+  DescriptionListGroup,
+  DescriptionListTerm,
+} from '@patternfly/react-core';
+import { useFormikContext } from 'formik';
+
+import { useTranslation } from '../../../../hooks/useTranslation';
+import type { ClusterWizardValues } from '../values';
+
+const formatNodeSetsForReview = (
+  nodeSetRows: ClusterWizardValues['spec']['nodeSetRows'],
+): string => {
+  if (nodeSetRows.length === 0) {
+    return '-';
+  }
+  return nodeSetRows.map((row) => `${row.name}: ${row.size}`).join(', ');
+};
+
+export const ClusterReview = () => {
+  const { t } = useTranslation();
+  const { values } = useFormikContext<ClusterWizardValues>();
+
+  const rows = [
+    { label: t('Name'), value: values.metadata.name },
+    { label: t('SSH public key'), value: values.spec.sshPublicKey || '-' },
+    { label: t('Pull secret'), value: values.spec.pullSecret ? t('Pull secret set') : '-' },
+    { label: t('Release image'), value: values.spec.releaseImage || '-' },
+    { label: t('Node sets'), value: formatNodeSetsForReview(values.spec.nodeSetRows) },
+    { label: t('Pod CIDR'), value: values.spec.network.podCidr || '-' },
+    { label: t('Service CIDR'), value: values.spec.network.serviceCidr || '-' },
+  ];
+
+  return (
+    <DescriptionList isHorizontal isCompact aria-label={t('Review')}>
+      <DescriptionListGroup>
+        <DescriptionListTerm>{t('Catalog item')}</DescriptionListTerm>
+        <DescriptionListDescription>{values.catalogItem?.title ?? '—'}</DescriptionListDescription>
+      </DescriptionListGroup>
+      {rows.map((row) => (
+        <DescriptionListGroup key={row.label}>
+          <DescriptionListTerm>{row.label}</DescriptionListTerm>
+          <DescriptionListDescription>{row.value}</DescriptionListDescription>
+        </DescriptionListGroup>
+      ))}
+    </DescriptionList>
+  );
+};
diff --git a/libs/ui-components/src/components/Cluster/CreateWizard/validation.ts b/libs/ui-components/src/components/Cluster/CreateWizard/validation.ts
new file mode 100644
index 00000000..6277930a
--- /dev/null
+++ b/libs/ui-components/src/components/Cluster/CreateWizard/validation.ts
@@ -0,0 +1,117 @@
+import type { FormikErrors } from 'formik';
+import type { TFunction } from 'i18next';
+import * as Yup from 'yup';
+
+import { camelKeysToSnake } from '@osac/ui-components/utils/snakeCase';
+import { buildMetadataNameSchema } from '@osac/ui-components/validation/name';
+import { sshPublicKeySchema } from '@osac/ui-components/validation/ssh-public-key';
+
+import { buildClusterCreatePayload } from './payload';
+import type { ClusterNodeSetRow, ClusterWizardValues } from './values';
+import { buildCidrSchema, cidrsOverlap, isValidCidr } from '../../../validation/cidr-validation';
+import { buildFieldSchema } from '../../catalogProvision/validation';
+
+export const buildFullClusterSchema = (t: TFunction) => {
+  return Yup.lazy((values: ClusterWizardValues) => {
+    const fds = values.catalogItem?.fieldDefinitions || [];
+    const payload = buildClusterCreatePayload(values);
+    const snakeSpec = camelKeysToSnake(payload.spec ?? {}) as Record<string, unknown>;
+    const fieldSchema = buildFieldSchema(snakeSpec, fds);
+
+    return Yup.object({
+      catalogItem: Yup.object().required(t('Select a catalog item')),
+      metadata: Yup.object({
+        name: buildMetadataNameSchema(t),
+      }),
+      spec: Yup.object({
+        sshPublicKey: fieldSchema('ssh_public_key', sshPublicKeySchema(t)),
+        pullSecret: fieldSchema(
+          'pull_secret',
+          Yup.string()
+            .trim()
+            .required(t('Pull secret is required'))
+            .test(
+              'pull-secret',
+              t(
+                'Invalid pull secret format. Paste the complete JSON from your Red Hat account pull secret.',
+              ),
+              (value) => {
+                try {
+                  const pullSecret = JSON.parse(value) as { auths?: unknown };
+                  return (
+                    pullSecret !== null &&
+                    typeof pullSecret === 'object' &&
+                    pullSecret.auths !== null &&
+                    typeof pullSecret.auths === 'object'
+                  );
+                } catch {
+                  return false;
+                }
+              },
+            ),
+        ),
+        releaseImage: fieldSchema(
+          'release_image',
+          Yup.string().trim().required(t('Release image is required')),
+        ),
+        nodeSetRows: Yup.array().of(
+          Yup.lazy((row: ClusterNodeSetRow) => {
+            return Yup.object({
+              name: Yup.string().trim().required(t('Node set name is required')),
+              size: fieldSchema(
+                `node_sets.${row.name}.size`,
+                Yup.number()
+                  .min(1, t('Pool size must be greater than zero'))
+                  .required(t('Pool size is required')),
+              ),
+            });
+          }),
+        ),
+        network: Yup.object({
+          podCidr: fieldSchema(
+            'network.pod_cidr',
+            buildCidrSchema(t, 'ipv4').required(t('This field is required')),
+          ),
+          serviceCidr: fieldSchema(
+            'network.service_cidr',
+            buildCidrSchema(t, 'ipv4')
+              .required(t('This field is required'))
+              .test(
+                'service-cidr-no-overlap',
+                t('Service CIDR must not overlap the pod CIDR.'),
+                function (value) {
+                  const parent = this.parent as { podCidr?: string } | undefined;
+                  const podCidr = parent?.podCidr ?? '';
+                  if (!value?.trim() || !podCidr.trim()) {
+                    return true;
+                  }
+                  if (!isValidCidr(value, 'ipv4') || !isValidCidr(podCidr, 'ipv4')) {
+                    return true;
+                  }
+                  return !cidrsOverlap(podCidr, value, 'ipv4');
+                },
+              ),
+          ),
+        }),
+      }),
+    });
+  });
+};
+
+export const clusterStepHasErrors = (
+  stepId: string,
+  errors: FormikErrors<ClusterWizardValues>,
+): boolean => {
+  switch (stepId) {
+    case 'catalog':
+      return Boolean(errors.catalogItem);
+    case 'general':
+      return Boolean(errors.metadata?.name || errors.spec?.sshPublicKey || errors.spec?.pullSecret);
+    case 'configuration':
+      return Boolean(errors.spec?.releaseImage || errors.spec?.nodeSetRows);
+    case 'networking':
+      return Boolean(errors.spec?.network);
+    default:
+      return false;
+  }
+};
diff --git a/libs/ui-components/src/components/Cluster/CreateWizard/values.ts b/libs/ui-components/src/components/Cluster/CreateWizard/values.ts
new file mode 100644
index 00000000..13ba7233
--- /dev/null
+++ b/libs/ui-components/src/components/Cluster/CreateWizard/values.ts
@@ -0,0 +1,105 @@
+import type { ClusterCatalogItem, ClusterTemplate } from '@osac/types';
+
+import { getNumberDefaultValue, getStringDefaultValue } from '../../catalogProvision/utils';
+import { clearSchemaCache } from '../../catalogProvision/validation';
+
+export interface ClusterNodeSetRow {
+  name: string;
+  size: number;
+}
+
+export interface ClusterWizardValues {
+  catalogItem: ClusterCatalogItem | undefined;
+  metadata: {
+    name: string;
+  };
+  spec: {
+    sshPublicKey: string;
+    pullSecret: string;
+    releaseImage: string;
+    nodeSetRows: ClusterNodeSetRow[];
+    network: {
+      podCidr: string;
+      serviceCidr: string;
+    };
+  };
+}
+
+export const createEmptyClusterValues = (
+  catalogItem: ClusterCatalogItem | undefined,
+): ClusterWizardValues => ({
+  catalogItem,
+  metadata: { name: '' },
+  spec: {
+    sshPublicKey: '',
+    pullSecret: '',
+    releaseImage: '',
+    nodeSetRows: [],
+    network: {
+      podCidr: '',
+      serviceCidr: '',
+    },
+  },
+});
+
+export const buildClusterInitialValues = (
+  item: ClusterCatalogItem | undefined,
+  clusterTemplates: ClusterTemplate[] | undefined,
+): ClusterWizardValues => {
+  clearSchemaCache();
+  const base = createEmptyClusterValues(item);
+  if (!item) {
+    return base;
+  }
+
+  const sshDefault = getStringDefaultValue('ssh_public_key', item.fieldDefinitions);
+  if (sshDefault) {
+    base.spec.sshPublicKey = sshDefault;
+  }
+
+  const pullSecretDefault = getStringDefaultValue('pull_secret', item.fieldDefinitions);
+  if (pullSecretDefault) {
+    base.spec.pullSecret = pullSecretDefault;
+  }
+
+  const releaseImageDefault = getStringDefaultValue('release_image', item.fieldDefinitions);
+  if (releaseImageDefault) {
+    base.spec.releaseImage = releaseImageDefault;
+  }
+
+  const podCidrDefault = getStringDefaultValue('network.pod_cidr', item.fieldDefinitions);
+  if (podCidrDefault) {
+    base.spec.network.podCidr = podCidrDefault;
+  }
+
+  const serviceCidrDefault = getStringDefaultValue('network.service_cidr', item.fieldDefinitions);
+  if (serviceCidrDefault) {
+    base.spec.network.serviceCidr = serviceCidrDefault;
+  }
+
+  const clusterNodeSets = clusterTemplates?.find((t) => t.id === item.template)?.nodeSets || {};
+
+  const nodeSetRows: ClusterNodeSetRow[] = Object.keys(clusterNodeSets).map((nodeSet) => ({
+    name: nodeSet,
+    size: clusterNodeSets[nodeSet].size,
+  }));
+
+  for (const fd of item.fieldDefinitions) {
+    if (fd.path.startsWith('node_sets.')) {
+      const parts = fd.path.split('.');
+      const nodeSetKey = parts[1];
+      const defSize = getNumberDefaultValue(`node_sets.${nodeSetKey}.size`, item.fieldDefinitions);
+
+      if (defSize !== undefined) {
+        const nodeSet = nodeSetRows.find(({ name }) => name === nodeSetKey);
+        if (nodeSet) {
+          nodeSet.size = defSize;
+        }
+      }
+    }
+  }
+
+  base.spec.nodeSetRows = nodeSetRows;
+
+  return base;
+};
diff --git a/libs/ui-components/src/components/Form/FieldValidationContext.tsx b/libs/ui-components/src/components/Form/FieldValidationContext.tsx
index 8ff9aa81..2b51c153 100644
--- a/libs/ui-components/src/components/Form/FieldValidationContext.tsx
+++ b/libs/ui-components/src/components/Form/FieldValidationContext.tsx
@@ -1,7 +1,23 @@
-import { createContext, useContext } from 'react';
+import type { ReactNode } from 'react';
+import { createContext, useContext, useState } from 'react';
 
-const FieldValidationContext = createContext(false);
+interface FieldValidationContextValue {
+  showErrors: boolean;
+  setShowErrors: (show: boolean) => void;
+}
 
-export const FieldValidationProvider = FieldValidationContext.Provider;
+const FieldValidationContext = createContext<FieldValidationContextValue>({
+  showErrors: false,
+  setShowErrors: () => undefined,
+});
 
-export const useShowFieldValidationErrors = (): boolean => useContext(FieldValidationContext);
+export const useFieldValidation = () => useContext(FieldValidationContext);
+
+export const FieldValidationProvider = ({ children }: { children: ReactNode }) => {
+  const [showErrors, setShowErrors] = useState(false);
+  return (
+    <FieldValidationContext.Provider value={{ showErrors, setShowErrors }}>
+      {children}
+    </FieldValidationContext.Provider>
+  );
+};
diff --git a/libs/ui-components/src/components/Form/InputField.tsx b/libs/ui-components/src/components/Form/InputField.tsx
index 696eedbb..5952c004 100644
--- a/libs/ui-components/src/components/Form/InputField.tsx
+++ b/libs/ui-components/src/components/Form/InputField.tsx
@@ -2,7 +2,7 @@ import { FormGroup, TextArea, TextInput } from '@patternfly/react-core';
 import { useField } from 'formik';
 
 import { getVisibleFieldError } from './fieldError';
-import { useShowFieldValidationErrors } from './FieldValidationContext';
+import { useFieldValidation } from './FieldValidationContext';
 import { FormFieldHelper, getFormFieldHelperDescribedBy } from './FormFieldHelper';
 
 interface InputFieldProps {
@@ -32,8 +32,8 @@ export const InputField = ({
   helperText,
   onBlur,
 }: InputFieldProps) => {
-  const [field, meta] = useField<string>(name);
-  const showValidationErrors = useShowFieldValidationErrors();
+  const [field, meta, { setValue }] = useField<string | number>(name);
+  const { showErrors: showValidationErrors } = useFieldValidation();
   const error = getVisibleFieldError(meta, showValidationErrors);
   const validated = error ? 'error' : 'default';
   const helperDescribedBy = getFormFieldHelperDescribedBy(fieldId, error, helperText);
@@ -48,7 +48,7 @@ export const InputField = ({
           rows={rows}
           resizeOrientation={resizeOrientation}
           onChange={(_event, value) => {
-            void field.onChange({ target: { name, value } });
+            setValue(value);
           }}
           onBlur={(event) => {
             field.onBlur(event);
@@ -66,7 +66,11 @@ export const InputField = ({
           type={type}
           value={field.value ?? ''}
           onChange={(_event, value) => {
-            void field.onChange({ target: { name, value } });
+            if (type === 'number') {
+              setValue(Number(value));
+            } else {
+              setValue(value);
+            }
           }}
           onBlur={(event) => {
             field.onBlur(event);
diff --git a/libs/ui-components/src/components/Form/LeaveFormConfirmation.tsx b/libs/ui-components/src/components/Form/LeaveFormConfirmation.tsx
new file mode 100644
index 00000000..904bf532
--- /dev/null
+++ b/libs/ui-components/src/components/Form/LeaveFormConfirmation.tsx
@@ -0,0 +1,53 @@
+import { useBlocker } from 'react-router-dom';
+import {
+  Button,
+  Content,
+  Modal,
+  ModalBody,
+  ModalFooter,
+  ModalHeader,
+} from '@patternfly/react-core';
+import { useFormikContext } from 'formik';
+
+import { useTranslation } from '../../hooks/useTranslation';
+
+/**
+ * Placed inside a <Formik> tree, blocks React Router navigation when the form is
+ * dirty and not submitting, and shows a confirmation modal letting the user
+ * either discard changes and proceed or stay on the page.
+ */
+export const LeaveFormConfirmation = () => {
+  const { t } = useTranslation();
+  const { dirty, isSubmitting } = useFormikContext();
+
+  const blocker = useBlocker(({ currentLocation, nextLocation }) => {
+    return !isSubmitting && dirty && currentLocation.pathname !== nextLocation.pathname;
+  });
+
+  if (blocker.state !== 'blocked') {
+    return null;
+  }
+
+  return (
+    <Modal isOpen variant="small" aria-labelledby="leave-form-title">
+      <ModalHeader
+        title={t('Discard wizard progress?')}
+        titleIconVariant="warning"
+        labelId="leave-form-title"
+      />
+      <ModalBody>
+        <Content component="p">
+          {t('Are you sure you want to cancel? Your selections and entered data will be lost.')}
+        </Content>
+      </ModalBody>
+      <ModalFooter>
+        <Button variant="danger" onClick={() => blocker.proceed?.()}>
+          {t('Discard and close')}
+        </Button>
+        <Button variant="link" onClick={() => blocker.reset?.()}>
+          {t('Keep editing')}
+        </Button>
+      </ModalFooter>
+    </Modal>
+  );
+};
diff --git a/libs/ui-components/src/components/Form/MultiSelectField.tsx b/libs/ui-components/src/components/Form/MultiSelectField.tsx
index 43c2e706..50dfd799 100644
--- a/libs/ui-components/src/components/Form/MultiSelectField.tsx
+++ b/libs/ui-components/src/components/Form/MultiSelectField.tsx
@@ -1,12 +1,11 @@
-import { useEffect, useMemo } from 'react';
+import { useEffect, useMemo, useRef } from 'react';
 import { FormGroup } from '@patternfly/react-core';
 import { MultiTypeaheadSelect, type MultiTypeaheadSelectOption } from '@patternfly/react-templates';
 import { useField } from 'formik';
 
 import { getVisibleFieldError } from './fieldError';
-import { useShowFieldValidationErrors } from './FieldValidationContext';
+import { useFieldValidation } from './FieldValidationContext';
 import { FormFieldHelper } from './FormFieldHelper';
-import { type LabeledResourceRef } from './labeledResourceRef';
 import type { SelectFieldOption } from './SelectField';
 
 interface MultiSelectFieldProps {
@@ -37,46 +36,38 @@ export const MultiSelectField = ({
   noOptionsFoundMessage = (filter) => `No options found for "${filter}"`,
   autoSelectSingleOption = false,
 }: MultiSelectFieldProps) => {
-  const [field, meta, helpers] = useField<LabeledResourceRef[]>(name);
-  const showValidationErrors = useShowFieldValidationErrors();
+  const [field, meta, helpers] = useField<(string | number)[] | undefined>(name);
+  const { showErrors: showValidationErrors } = useFieldValidation();
   const error = getVisibleFieldError(meta, showValidationErrors);
   const validated = error ? 'error' : 'default';
   const effectivePlaceholder = isLoading ? loadingPlaceholder : placeholder;
   const controlDisabled = isDisabled || isLoading;
 
-  const selectedValues = useMemo(
-    () => (Array.isArray(field.value) ? field.value : []),
-    [field.value],
-  );
+  const defaultSelectedRef = useRef<boolean>(false);
 
   useEffect(() => {
     if (
+      defaultSelectedRef.current ||
       !autoSelectSingleOption ||
       isLoading ||
       isDisabled ||
       options.length !== 1 ||
-      selectedValues.length > 0
+      (field.value?.length || 0) > 0
     ) {
       return;
     }
-    void helpers.setValue([{ value: options[0].value, label: options[0].label }], false);
-  }, [autoSelectSingleOption, helpers, isDisabled, isLoading, options, selectedValues.length]);
+    defaultSelectedRef.current = true;
+    void helpers.setValue([options[0].value], false);
+  }, [autoSelectSingleOption, helpers, isDisabled, isLoading, options, field.value?.length]);
 
   const initialOptions = useMemo<MultiTypeaheadSelectOption[]>(() => {
     return options.map((option) => ({
       content: option.label,
       value: option.value,
-      selected: selectedValues.some((value) => value.value === option.value),
+      selected: field.value?.some((value) => value === option.value),
       isDisabled: option.isDisabled,
     }));
-  }, [options, selectedValues]);
-
-  const toLabeledResourceRefs = (selections: (string | number)[]) =>
-    selections.map((selection) => {
-      const value = String(selection);
-      const option = options.find((entry) => entry.value === value);
-      return option ? { value: option.value, label: option.label } : { value, label: value };
-    });
+  }, [options, field.value]);
 
   return (
     <FormGroup label={label} fieldId={fieldId} isRequired={isRequired}>
@@ -87,7 +78,7 @@ export const MultiSelectField = ({
         isDisabled={controlDisabled}
         noOptionsFoundMessage={noOptionsFoundMessage}
         onSelectionChange={(_event, selections) => {
-          void helpers.setValue(toLabeledResourceRefs(selections), true);
+          void helpers.setValue(selections, true);
           void helpers.setTouched(true);
         }}
         onToggle={(open) => {
diff --git a/libs/ui-components/src/components/Form/RadioButtonField.tsx b/libs/ui-components/src/components/Form/RadioButtonField.tsx
index 2b032462..0ec29c24 100644
--- a/libs/ui-components/src/components/Form/RadioButtonField.tsx
+++ b/libs/ui-components/src/components/Form/RadioButtonField.tsx
@@ -2,7 +2,7 @@ import { FormGroup, Radio } from '@patternfly/react-core';
 import { useField } from 'formik';
 
 import { getVisibleFieldError } from './fieldError';
-import { useShowFieldValidationErrors } from './FieldValidationContext';
+import { useFieldValidation } from './FieldValidationContext';
 import { FormFieldHelper } from './FormFieldHelper';
 
 export interface RadioButtonFieldOption {
@@ -30,7 +30,7 @@ export const RadioButtonField = ({
   isInline = false,
 }: RadioButtonFieldProps) => {
   const [field, meta] = useField<string | boolean>(name);
-  const showValidationErrors = useShowFieldValidationErrors();
+  const { showErrors: showValidationErrors } = useFieldValidation();
   const error = getVisibleFieldError(meta, showValidationErrors);
   const stringValue =
     field.value === true ? 'true' : field.value === false ? 'false' : String(field.value ?? '');
diff --git a/libs/ui-components/src/components/Form/SelectField.test.tsx b/libs/ui-components/src/components/Form/SelectField.test.tsx
index 72472499..3645e762 100644
--- a/libs/ui-components/src/components/Form/SelectField.test.tsx
+++ b/libs/ui-components/src/components/Form/SelectField.test.tsx
@@ -4,26 +4,24 @@ import { Formik, type FormikErrors } from 'formik';
 import { describe, expect, it } from 'vitest';
 import * as yup from 'yup';
 
-import { EMPTY_LABELED_RESOURCE_REF, type LabeledResourceRef } from './labeledResourceRef';
-import { labeledResourceRefSchema } from './labeledResourceRefSchema';
 import { SelectField } from './SelectField';
 
 const renderSelect = ({
   autoSelectSingleOption = false,
-  initialValue = EMPTY_LABELED_RESOURCE_REF,
+  initialValue = '',
   isLoading = false,
 }: {
   autoSelectSingleOption?: boolean;
-  initialValue?: LabeledResourceRef;
+  initialValue?: string;
   isLoading?: boolean;
 } = {}) => {
-  let latestErrors: FormikErrors<{ kind: LabeledResourceRef }> = {};
+  let latestErrors: FormikErrors<{ kind: string }> = {};
 
   render(
     <Formik
       initialValues={{ kind: initialValue }}
       validationSchema={yup.object({
-        kind: labeledResourceRefSchema('Kind is required'),
+        kind: yup.string().required('Kind is required'),
       })}
       onSubmit={() => undefined}
     >
@@ -39,7 +37,7 @@ const renderSelect = ({
             placeholder="Select a kind"
             options={[{ value: 'only-option', label: 'Only option label' }]}
           />
-          <output aria-label="formik-value">{values.kind.value || '(empty)'}</output>
+          <output aria-label="formik-value">{values.kind || '(empty)'}</output>
           <button
             type="button"
             onClick={() => {
@@ -102,7 +100,7 @@ describe('SelectField', () => {
 
   it('does not auto-select when multiple options are available', async () => {
     render(
-      <Formik initialValues={{ kind: EMPTY_LABELED_RESOURCE_REF }} onSubmit={() => undefined}>
+      <Formik initialValues={{ kind: '' }} onSubmit={() => undefined}>
         {({ values }) => (
           <>
             <SelectField
@@ -116,7 +114,7 @@ describe('SelectField', () => {
                 { value: 'large', label: 'Large' },
               ]}
             />
-            <output aria-label="formik-value">{values.kind.value || '(empty)'}</output>
+            <output aria-label="formik-value">{values.kind || '(empty)'}</output>
           </>
         )}
       </Formik>,
@@ -133,7 +131,7 @@ describe('SelectField', () => {
     const user = userEvent.setup();
 
     render(
-      <Formik initialValues={{ kind: EMPTY_LABELED_RESOURCE_REF }} onSubmit={() => undefined}>
+      <Formik initialValues={{ kind: '' }} onSubmit={() => undefined}>
         {({ values }) => (
           <>
             <SelectField
@@ -146,7 +144,7 @@ describe('SelectField', () => {
                 { value: 'large', label: 'Large' },
               ]}
             />
-            <output aria-label="formik-value">{values.kind.value || '(empty)'}</output>
+            <output aria-label="formik-value">{values.kind || '(empty)'}</output>
           </>
         )}
       </Formik>,
@@ -166,10 +164,10 @@ describe('SelectField', () => {
 
     render(
       <Formik
-        initialValues={{ kind: EMPTY_LABELED_RESOURCE_REF }}
+        initialValues={{ kind: '' }}
         validateOnBlur
         validationSchema={yup.object({
-          kind: labeledResourceRefSchema('Kind is required'),
+          kind: yup.string().required('Kind is required'),
         })}
         onSubmit={() => undefined}
       >
diff --git a/libs/ui-components/src/components/Form/SelectField.tsx b/libs/ui-components/src/components/Form/SelectField.tsx
index 8202f0a9..158d3b38 100644
--- a/libs/ui-components/src/components/Form/SelectField.tsx
+++ b/libs/ui-components/src/components/Form/SelectField.tsx
@@ -1,4 +1,4 @@
-import { type MouseEvent, type Ref, useEffect, useMemo, useState } from 'react';
+import { type MouseEvent, type Ref, useEffect, useState } from 'react';
 import {
   FormGroup,
   MenuToggle,
@@ -10,16 +10,11 @@ import {
 import { useField } from 'formik';
 
 import { getVisibleFieldError } from './fieldError';
-import { useShowFieldValidationErrors } from './FieldValidationContext';
+import { useFieldValidation } from './FieldValidationContext';
 import { FormFieldHelper } from './FormFieldHelper';
-import {
-  EMPTY_LABELED_RESOURCE_REF,
-  type LabeledResourceRef,
-  isLabeledResourceRefEmpty,
-} from './labeledResourceRef';
 
 export interface SelectFieldOption {
-  value: string;
+  value: string | number;
   label: string;
   isDisabled?: boolean;
 }
@@ -50,15 +45,13 @@ export const SelectField = ({
   loadingPlaceholder = 'Loading...',
   autoSelectSingleOption = false,
 }: SelectFieldProps) => {
-  const [field, meta, helpers] = useField<LabeledResourceRef>(name);
+  const [field, meta, helpers] = useField<string | number | undefined>(name);
   const [isOpen, setIsOpen] = useState(false);
-  const showValidationErrors = useShowFieldValidationErrors();
+  const { showErrors: showValidationErrors } = useFieldValidation();
   const error = getVisibleFieldError(meta, showValidationErrors);
   const validated = error ? 'error' : 'default';
   const effectivePlaceholder = isLoading ? loadingPlaceholder : placeholder;
   const controlDisabled = isDisabled || isLoading;
-  const fieldValue = field.value ?? EMPTY_LABELED_RESOURCE_REF;
-  const selectedValue = fieldValue.value;
 
   useEffect(() => {
     if (
@@ -66,34 +59,24 @@ export const SelectField = ({
       isLoading ||
       isDisabled ||
       options.length !== 1 ||
-      !isLabeledResourceRefEmpty(fieldValue)
+      (field.value !== undefined && field.value !== '')
     ) {
       return;
     }
-    void helpers.setValue({ value: options[0].value, label: options[0].label }, false);
-  }, [autoSelectSingleOption, fieldValue, helpers, isDisabled, isLoading, options]);
-
-  const toggleLabel = useMemo(() => {
-    if (isLabeledResourceRefEmpty(fieldValue)) {
-      return effectivePlaceholder ?? '';
-    }
-    return fieldValue.label.trim() || fieldValue.value;
-  }, [effectivePlaceholder, fieldValue]);
+    void helpers.setValue(options[0].value, false);
+  }, [autoSelectSingleOption, field.value, helpers, isDisabled, isLoading, options]);
 
   const onSelect = (
     _event: MouseEvent<Element> | undefined,
     value: string | number | undefined,
   ) => {
-    if (value == null) {
-      void helpers.setValue(EMPTY_LABELED_RESOURCE_REF, true);
-    } else {
-      const option = options.find((entry) => entry.value === String(value));
-      void helpers.setValue(
-        option
-          ? { value: option.value, label: option.label }
-          : { value: String(value), label: String(value) },
-        true,
-      );
+    if (!value) {
+      return;
+    }
+
+    const option = options.find((entry) => entry.value === value);
+    if (option) {
+      helpers.setValue(option.value, true);
     }
     void helpers.setTouched(true, false);
     setIsOpen(false);
@@ -112,7 +95,7 @@ export const SelectField = ({
       aria-describedby={error ? `${fieldId}-helper-error` : undefined}
       aria-busy={isLoading || undefined}
     >
-      {toggleLabel}
+      {options.find((o) => o.value === field.value)?.label || effectivePlaceholder}
     </MenuToggle>
   );
 
@@ -121,7 +104,7 @@ export const SelectField = ({
       <Select
         id={`${fieldId}-select`}
         isOpen={isOpen}
-        selected={selectedValue}
+        selected={field.value}
         onSelect={onSelect}
         onOpenChange={setIsOpen}
         toggle={toggle}
diff --git a/libs/ui-components/src/components/Form/labeledResourceRef.ts b/libs/ui-components/src/components/Form/labeledResourceRef.ts
deleted file mode 100644
index f6051657..00000000
--- a/libs/ui-components/src/components/Form/labeledResourceRef.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/** Form value for a picker that stores both API id and display label. */
-export interface LabeledResourceRef {
-  value: string;
-  label: string;
-}
-
-export const EMPTY_LABELED_RESOURCE_REF: LabeledResourceRef = { value: '', label: '' };
-
-export const isLabeledResourceRefEmpty = (ref?: LabeledResourceRef | null): boolean =>
-  !ref?.value?.trim();
-
-export const formatLabeledResourceRefForReview = (ref: LabeledResourceRef): string => {
-  const display = ref.label.trim() || ref.value.trim();
-  return display || '—';
-};
-
-export const formatLabeledResourceRefsForReview = (refs: LabeledResourceRef[]): string => {
-  if (refs.length === 0) {
-    return '—';
-  }
-  return refs.map((ref) => ref.label.trim() || ref.value.trim()).join(', ');
-};
diff --git a/libs/ui-components/src/components/Form/labeledResourceRefSchema.ts b/libs/ui-components/src/components/Form/labeledResourceRefSchema.ts
deleted file mode 100644
index 11a1e4f1..00000000
--- a/libs/ui-components/src/components/Form/labeledResourceRefSchema.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import * as yup from 'yup';
-
-export const labeledResourceRefSchema = (requiredMessage: string) =>
-  yup
-    .object({
-      value: yup.string(),
-      label: yup.string(),
-    })
-    .test('required', requiredMessage, (value) => Boolean(value?.value?.trim()));
-
-export const labeledResourceRefArraySchema = (requiredMessage: string) =>
-  yup
-    .array()
-    .of(
-      yup.object({
-        value: yup.string().defined(),
-        label: yup.string(),
-      }),
-    )
-    .min(1, requiredMessage);
diff --git a/libs/ui-components/src/components/Wizard/OSACWizardFooter.tsx b/libs/ui-components/src/components/Wizard/OSACWizardFooter.tsx
new file mode 100644
index 00000000..693c8d46
--- /dev/null
+++ b/libs/ui-components/src/components/Wizard/OSACWizardFooter.tsx
@@ -0,0 +1,118 @@
+import { useCallback, useEffect, useState } from 'react';
+import {
+  Alert,
+  Button,
+  Flex,
+  Stack,
+  StackItem,
+  WizardFooterWrapper,
+  useWizardContext,
+} from '@patternfly/react-core';
+import type { FormikErrors } from 'formik';
+import { useFormikContext } from 'formik';
+
+import { useTranslation } from '../../hooks/useTranslation';
+import { useFieldValidation } from '../Form/FieldValidationContext';
+
+interface OSACWizardFooterProps {
+  onCancel: () => void;
+  stepHasErrors: (stepId: string, errors: FormikErrors<unknown>) => boolean;
+}
+
+export const OSACWizardFooter = ({ onCancel, stepHasErrors }: OSACWizardFooterProps) => {
+  const { t } = useTranslation();
+  const { activeStep, goToStepByIndex, steps } = useWizardContext();
+  const formik = useFormikContext();
+  const { setShowErrors } = useFieldValidation();
+  const [validationAlert, setValidationAlert] = useState(false);
+
+  const stepIndex = activeStep?.index ?? 1;
+  const isFirst = stepIndex <= 1;
+  const isLast = stepIndex >= steps.length;
+  const provisionError = (formik.status as { provisionError?: string } | undefined)?.provisionError;
+
+  useEffect(() => {
+    setValidationAlert(false);
+    setShowErrors(false);
+  }, [activeStep.id, setShowErrors]);
+
+  const handleBack = useCallback(() => {
+    if (isFirst || formik.isSubmitting) {
+      return;
+    }
+    goToStepByIndex(stepIndex - 1);
+  }, [goToStepByIndex, isFirst, formik.isSubmitting, stepIndex]);
+
+  const handleNextOrCreate = useCallback(async () => {
+    if (formik.isSubmitting) {
+      return;
+    }
+    if (isLast) {
+      void formik.setStatus(undefined);
+      await formik.submitForm();
+      return;
+    }
+    const errors = await formik.validateForm();
+
+    if (stepHasErrors(String(activeStep.id), errors)) {
+      setValidationAlert(true);
+      setShowErrors(true);
+      return;
+    }
+    setValidationAlert(false);
+    setShowErrors(false);
+    goToStepByIndex(stepIndex + 1);
+  }, [activeStep.id, formik, goToStepByIndex, isLast, setShowErrors, stepHasErrors, stepIndex]);
+
+  return (
+    <WizardFooterWrapper>
+      <Stack hasGutter>
+        {validationAlert ? (
+          <StackItem>
+            <Alert
+              variant="danger"
+              isInline
+              title={t('Fix the highlighted errors before continuing.')}
+            />
+          </StackItem>
+        ) : null}
+        {provisionError ? (
+          <StackItem>
+            <Alert variant="danger" isInline title={t('Failed to create resource')}>
+              {provisionError}
+            </Alert>
+          </StackItem>
+        ) : null}
+        <StackItem>
+          <Flex
+            justifyContent={{ default: 'justifyContentFlexStart' }}
+            alignItems={{ default: 'alignItemsCenter' }}
+            flexWrap={{ default: 'wrap' }}
+            gap={{ default: 'gapMd' }}
+          >
+            <Button
+              variant="secondary"
+              onClick={handleBack}
+              isDisabled={isFirst || formik.isSubmitting}
+              isAriaDisabled={isFirst || formik.isSubmitting}
+            >
+              {t('Back')}
+            </Button>
+            <Button
+              type="button"
+              variant="primary"
+              onClick={() => void handleNextOrCreate()}
+              isDisabled={formik.isSubmitting}
+              isLoading={formik.isSubmitting}
+            >
+              {isLast ? t('Create') : t('Next')}
+            </Button>
+            <Button variant="link" onClick={onCancel} isDisabled={formik.isSubmitting}>
+              {t('Cancel')}
+            </Button>
+          </Flex>
+        </StackItem>
+      </Stack>
+    </WizardFooterWrapper>
+  );
+};
diff --git a/libs/ui-components/src/components/catalog/CatalogItemCard.tsx b/libs/ui-components/src/components/catalog/CatalogItemCard.tsx
index 8357146e..f29e4461 100644
--- a/libs/ui-components/src/components/catalog/CatalogItemCard.tsx
+++ b/libs/ui-components/src/components/catalog/CatalogItemCard.tsx
@@ -13,11 +13,7 @@ import {
 } from '@patternfly/react-core';
 
 import type { CatalogItem } from './catalogItemDisplay';
-import {
-  catalogItemMetadataLabelEntries,
-  catalogItemResourceParts,
-  catalogItemSubtitle,
-} from './catalogItemDisplay';
+import { catalogItemMetadataLabelEntries, catalogItemSubtitle } from './catalogItemDisplay';
 import { useTranslation } from '../../hooks/useTranslation';
 import { CatalogItemIcon } from '../../icons';
 
@@ -47,7 +43,6 @@ const CatalogItemCard = ({
   statusLabel,
 }: CatalogItemCardProps) => {
   const { t } = useTranslation();
-  const resources = catalogItemResourceParts(item);
   const metadataLabels = catalogItemMetadataLabelEntries(item);
   const subtitle = catalogItemSubtitle(item);
   const isBrowseMode = Boolean(onOpenDetails && !selection);
@@ -115,26 +110,8 @@ const CatalogItemCard = ({
               </Flex>
             </StackItem>
           ) : null}
-          {resources.length > 0 ? (
-            <StackItem>
-              <Flex flexWrap={{ default: 'wrap' }} gap={{ default: 'gapSm' }}>
-                {resources.map((resource, index) => (
-                  <FlexItem key={`${item.id}-resource-${index}`}>
-                    <Label variant="outline" color="blue" isCompact>
-                      {resource}
-                    </Label>
-                  </FlexItem>
-                ))}
-              </Flex>
-            </StackItem>
-          ) : null}
           {metadataLabels.length > 0 ? (
             <>
-              {resources.length > 0 ? (
-                <StackItem>
-                  <Divider />
-                </StackItem>
-              ) : null}
               <StackItem>
                 <Flex flexWrap={{ default: 'wrap' }} gap={{ default: 'gapSm' }}>
                   {metadataLabels.map(({ key, value }) => (
diff --git a/libs/ui-components/src/components/catalog/CatalogItemDetailContent.tsx b/libs/ui-components/src/components/catalog/CatalogItemDetailContent.tsx
index 7664ca6d..74ab9655 100644
--- a/libs/ui-components/src/components/catalog/CatalogItemDetailContent.tsx
+++ b/libs/ui-components/src/components/catalog/CatalogItemDetailContent.tsx
@@ -16,11 +16,9 @@ import { CatalogFieldEditabilityLabel } from './CatalogFieldEditabilityLabel';
 import {
   type CatalogItem,
   catalogItemMetadataLabelEntries,
-  catalogItemResourceParts,
   formatCatalogFieldDefault,
 } from './catalogItemDisplay';
 import { useTranslation } from '../../hooks/useTranslation';
-import { catalogItemFieldDefinitions } from '../catalogProvision/catalogFieldDefinition';
 import { SubtleContent } from '../SubtleContent/SubtleContent';
 
 interface CatalogItemDetailContentProps {
@@ -29,9 +27,8 @@ interface CatalogItemDetailContentProps {
 
 export const CatalogItemDetailContent = ({ item }: CatalogItemDetailContentProps) => {
   const { t } = useTranslation();
-  const resources = catalogItemResourceParts(item);
   const metadataLabels = catalogItemMetadataLabelEntries(item);
-  const fieldDefinitions = catalogItemFieldDefinitions(item);
+  const fieldDefinitions = item.fieldDefinitions;
 
   return (
     <Stack className="catalog-item-detail-content">
@@ -53,23 +50,6 @@ export const CatalogItemDetailContent = ({ item }: CatalogItemDetailContentProps
         </StackItem>
       ) : null}
 
-      {resources.length > 0 ? (
-        <StackItem>
-          <Title headingLevel="h3" size="md" className="catalog-item-detail-content__section-title">
-            Default resources
-          </Title>
-          <Flex flexWrap={{ default: 'wrap' }} gap={{ default: 'gapSm' }}>
-            {resources.map((resource, index) => (
-              <FlexItem key={`${item.id}-detail-resource-${index}`}>
-                <Label variant="outline" color="blue" isCompact>
-                  {resource}
-                </Label>
-              </FlexItem>
-            ))}
-          </Flex>
-        </StackItem>
-      ) : null}
-
       {metadataLabels.length > 0 ? (
         <StackItem>
           <Title headingLevel="h3" size="md" className="catalog-item-detail-content__section-title">
diff --git a/libs/ui-components/src/components/catalog/catalogItemDisplay.test.ts b/libs/ui-components/src/components/catalog/catalogItemDisplay.test.ts
index a9a45dfa..369a9511 100644
--- a/libs/ui-components/src/components/catalog/catalogItemDisplay.test.ts
+++ b/libs/ui-components/src/components/catalog/catalogItemDisplay.test.ts
@@ -5,192 +5,10 @@ import type { ClusterCatalogItem as PrivateClusterCatalogItem } from '@osac/type
 
 import {
   SHARED_TENANT,
-  catalogItemResourceLine,
-  catalogItemResourceParts,
   catalogItemScope,
   catalogItemSubtitle,
   filterCatalogItemsBySearch,
 } from './catalogItemDisplay';
-import {
-  catalogItemFieldDefinitions,
-  readCatalogItemFieldDefinitions,
-} from '../catalogProvision/catalogFieldDefinition';
-
-describe('readCatalogItemFieldDefinitions', () => {
-  it('reads snake_case field_definitions from wire JSON', () => {
-    const wireItem = {
-      id: 'catalog-1',
-      field_definitions: [
-        {
-          path: 'cores',
-          display_name: 'vCPUs',
-          editable: true,
-          default: { number_value: 4 },
-          validation_schema: '{"type":"integer","minimum":2}',
-        },
-      ],
-    };
-
-    expect(readCatalogItemFieldDefinitions(wireItem)).toHaveLength(1);
-    expect(catalogItemFieldDefinitions(wireItem)).toEqual([
-      {
-        path: 'cores',
-        displayName: 'vCPUs',
-        editable: true,
-        default: 4,
-        validationSchema: { type: 'integer', minimum: 2 },
-      },
-    ]);
-  });
-
-  it('parses post-decode protobuf Value defaults without mutating the catalog item', () => {
-    const decodedItem = {
-      id: 'catalog-1',
-      fieldDefinitions: [
-        {
-          path: 'cores',
-          displayName: 'vCPUs',
-          editable: true,
-          default: { kind: { case: 'numberValue', value: 4 } },
-        },
-      ],
-    };
-
-    expect(catalogItemFieldDefinitions(decodedItem)).toEqual([
-      {
-        path: 'cores',
-        displayName: 'vCPUs',
-        editable: true,
-        default: 4,
-      },
-    ]);
-    expect(decodedItem.fieldDefinitions[0]?.default).toEqual({
-      kind: { case: 'numberValue', value: 4 },
-    });
-  });
-});
-
-describe('catalog display with wire field_definitions', () => {
-  it('renders resource summary from wire catalog item JSON', () => {
-    const wireItem: ClusterCatalogItem = {
-      $typeName: 'osac.public.v1.ClusterCatalogItem',
-      id: 'catalog-1',
-      title: 'Workload VM',
-      description: '',
-      published: true,
-      template: '',
-      fieldDefinitions: [
-        {
-          $typeName: 'osac.public.v1.FieldDefinition',
-          path: 'cores',
-          displayName: 'vCPUs',
-          editable: true,
-          default: {
-            $typeName: 'google.protobuf.Value',
-            kind: {
-              case: 'numberValue',
-              value: 4,
-            },
-          },
-          validationSchema: '',
-        },
-        {
-          $typeName: 'osac.public.v1.FieldDefinition',
-          path: 'memory_gib',
-          displayName: 'RAM (GiB)',
-          editable: true,
-          default: {
-            $typeName: 'google.protobuf.Value',
-            kind: {
-              case: 'numberValue',
-              value: 8,
-            },
-          },
-          validationSchema: '',
-        },
-        {
-          $typeName: 'osac.public.v1.FieldDefinition',
-          path: 'boot_disk.size_gib',
-          displayName: 'Boot disk (GiB)',
-          editable: true,
-          default: {
-            $typeName: 'google.protobuf.Value',
-            kind: {
-              case: 'numberValue',
-              value: 40,
-            },
-          },
-          validationSchema: '',
-        },
-      ],
-    };
-
-    expect(catalogItemResourceParts(wireItem)).toEqual([
-      '4 vCPUs',
-      '8 RAM (GiB)',
-      '40 Boot disk (GiB)',
-    ]);
-    expect(catalogItemResourceLine(wireItem)).toBe('4 vCPUs · 8 RAM (GiB) · 40 Boot disk (GiB)');
-  });
-
-  it('renders node set resource summary from cluster catalog item JSON', () => {
-    const wireItem: ClusterCatalogItem = {
-      $typeName: 'osac.public.v1.ClusterCatalogItem',
-      id: '019ecb6a-6cad-7905-b086-a043c388fa60',
-      title: 'Development Cluster',
-      description: '',
-      published: true,
-      template: '',
-      fieldDefinitions: [
-        {
-          $typeName: 'osac.public.v1.FieldDefinition',
-          path: 'node_sets.fc430.host_type',
-          displayName: 'Host Type',
-          editable: true,
-          default: {
-            $typeName: 'google.protobuf.Value',
-            kind: {
-              case: 'stringValue',
-              value: 'fc430',
-            },
-          },
-          validationSchema: '',
-        },
-        {
-          $typeName: 'osac.public.v1.FieldDefinition',
-          path: 'node_sets.fc430.size',
-          displayName: 'Worker Count',
-          editable: true,
-          default: {
-            $typeName: 'google.protobuf.Value',
-            kind: {
-              case: 'numberValue',
-              value: 2,
-            },
-          },
-          validationSchema: '',
-        },
-        {
-          $typeName: 'osac.public.v1.FieldDefinition',
-          path: 'release_image',
-          displayName: 'Release Image',
-          editable: true,
-          default: {
-            $typeName: 'google.protobuf.Value',
-            kind: {
-              case: 'stringValue',
-              value: 'quay.io/openshift-release-dev/ocp-release:4.17.0-multi',
-            },
-          },
-          validationSchema: '',
-        },
-      ],
-    };
-
-    expect(catalogItemResourceParts(wireItem)).toEqual(['fc430 Host Type', '2 Worker Count']);
-    expect(catalogItemResourceLine(wireItem)).toBe('fc430 Host Type · 2 Worker Count');
-  });
-});
 
 describe('filterCatalogItemsBySearch', () => {
   const items: ClusterCatalogItem[] = [
diff --git a/libs/ui-components/src/components/catalog/catalogItemDisplay.ts b/libs/ui-components/src/components/catalog/catalogItemDisplay.ts
index cdedf9ee..11db80f2 100644
--- a/libs/ui-components/src/components/catalog/catalogItemDisplay.ts
+++ b/libs/ui-components/src/components/catalog/catalogItemDisplay.ts
@@ -2,6 +2,7 @@ import type {
   BareMetalInstanceCatalogItem,
   ClusterCatalogItem,
   ComputeInstanceCatalogItem,
+  FieldDefinition,
 } from '@osac/types';
 import type {
   BareMetalInstanceCatalogItem as PrivateBareMetalInstanceCatalogItem,
@@ -10,17 +11,6 @@ import type {
 } from '@osac/types/private';
 
 import type { DemoShellRole } from '../../shellTypes';
-import {
-  CATALOG_ITEM_RESOURCE_FIELD_PATHS,
-  type CatalogFieldDefinition,
-  type CatalogItemResourceFieldPath,
-  catalogItemFieldDefinitions,
-  fieldDefinitionDefaultToInputString,
-  isCatalogCardResourceFieldPath,
-  isCatalogItemResourceFieldPath,
-  isClusterCatalogItemResourceFieldPath,
-  resolvedFieldDefault,
-} from '../catalogProvision/catalogFieldDefinition';
 
 export type CatalogItem =
   | ClusterCatalogItem
@@ -37,11 +27,6 @@ type PrivateCatalogItem =
 
 export type CatalogItemKind = 'vm' | 'cluster' | 'bm';
 
-export const catalogFieldDefault = (item: CatalogItem, path: string): unknown => {
-  const def = catalogItemFieldDefinitions(item).find((entry) => entry.path === path);
-  return def ? resolvedFieldDefault(def) : undefined;
-};
-
 export const catalogItemSubtitle = (item: CatalogItem): string => {
   const description = item.description?.trim();
   if (description) {
@@ -63,83 +48,12 @@ export const catalogItemMetadataLabelEntries = (
     .sort((a, b) => a.key.localeCompare(b.key));
 };
 
-export const catalogFieldDefinitionForPath = (
-  item: CatalogItem,
-  path: string,
-): CatalogFieldDefinition | undefined => {
-  return catalogItemFieldDefinitions(item).find((def) => def.path === path);
-};
-
-const FALLBACK_RESOURCE_LABELS: Record<CatalogItemResourceFieldPath, string> = {
-  cores: 'vCPU',
-  memory_gib: 'Memory',
-  'boot_disk.size_gib': 'Boot disk',
-};
-
-/** Field definitions shown as resource labels on catalog cards (VM or cluster). */
-export const catalogItemResourceFieldDefinitions = (
-  item: CatalogItem,
-): CatalogFieldDefinition[] => {
-  const defs = catalogItemFieldDefinitions(item);
-  const byPath = new Map(defs.map((def) => [def.path, def]));
-
-  const vmResourceDefs = CATALOG_ITEM_RESOURCE_FIELD_PATHS.flatMap((path) => {
-    const def = byPath.get(path);
-    return def ? [def] : [];
-  });
-  if (vmResourceDefs.length > 0) {
-    return vmResourceDefs;
-  }
-
-  return defs.filter((def) => isClusterCatalogItemResourceFieldPath(def.path));
-};
-
-const formatCatalogResourcePart = (def: CatalogFieldDefinition): string | null => {
-  if (!isCatalogCardResourceFieldPath(def.path)) {
-    return null;
-  }
-  const defaultValue = resolvedFieldDefault(def);
-  if (defaultValue === undefined || defaultValue === null) {
-    return null;
-  }
-  const value = fieldDefinitionDefaultToInputString(defaultValue).trim();
-  if (!value) {
-    return null;
-  }
-  const label = isCatalogItemResourceFieldPath(def.path)
-    ? def.displayName || FALLBACK_RESOURCE_LABELS[def.path]
-    : def.displayName;
-  if (!label) {
-    return null;
-  }
-  return `${value} ${label}`;
-};
-
-export const catalogItemResourceParts = (item: CatalogItem): string[] => {
-  return catalogItemResourceFieldDefinitions(item)
-    .map((def) => formatCatalogResourcePart(def))
-    .filter((part): part is string => part != null);
-};
-
-export const catalogItemResourceLine = (item: CatalogItem): string | undefined => {
-  const parts = catalogItemResourceParts(item);
-  return parts.length ? parts.join(' · ') : undefined;
-};
-
-export const searchableCatalogItemText = (item: CatalogItem): string => {
+const searchableCatalogItemText = (item: CatalogItem): string => {
   const labels = item.metadata?.labels ?? {};
-  const fieldText = catalogItemFieldDefinitions(item)
-    .map(
-      (def) =>
-        `${def.displayName} ${fieldDefinitionDefaultToInputString(resolvedFieldDefault(def))}`,
-    )
-    .join(' ');
-
   return [
     item.title,
     item.description,
     item.metadata?.name,
-    fieldText,
     ...Object.entries(labels).map(([key, value]) => `${key} ${value}`),
   ]
     .filter(Boolean)
@@ -147,11 +61,15 @@ export const searchableCatalogItemText = (item: CatalogItem): string => {
     .toLowerCase();
 };
 
-export const filterCatalogItemsBySearch = (items: CatalogItem[], search: string): CatalogItem[] => {
+export const filterCatalogItemsBySearch = <TItem extends CatalogItem>(
+  items: TItem[],
+  search: string,
+): TItem[] => {
   const searchTerm = search.trim().toLowerCase();
   if (!searchTerm) {
     return items;
   }
+
   return items.filter((item) => searchableCatalogItemText(item).includes(searchTerm));
 };
 
@@ -167,12 +85,21 @@ export const matchesPublicationFilter = (item: CatalogItem, filter: PublicationF
   return true;
 };
 
-export const formatCatalogFieldDefault = (def: CatalogFieldDefinition): string => {
-  const defaultValue = resolvedFieldDefault(def);
-  if (defaultValue === undefined) {
-    return '—';
+export const formatCatalogFieldDefault = (
+  def: Pick<FieldDefinition, 'default'>,
+): React.ReactNode => {
+  if (!def.default) {
+    return '-';
+  }
+
+  switch (def.default.kind.case) {
+    case 'numberValue':
+      return def.default.kind.value;
+    case 'stringValue':
+      return def.default.kind.value;
+    default:
+      return '-';
   }
-  return fieldDefinitionDefaultToInputString(defaultValue) || '—';
 };
 
 /**
diff --git a/libs/ui-components/src/components/catalogProvision/CatalogProvisionWizard.test.tsx b/libs/ui-components/src/components/catalogProvision/CatalogProvisionWizard.test.tsx
deleted file mode 100644
index a83275d0..00000000
--- a/libs/ui-components/src/components/catalogProvision/CatalogProvisionWizard.test.tsx
+++ /dev/null
@@ -1,1053 +0,0 @@
-import type { Transport } from '@connectrpc/connect';
-import type { RenderOptions } from '@testing-library/react';
-import { fireEvent, screen, waitFor, within } from '@testing-library/react';
-import { UserEvent } from '@testing-library/user-event';
-import { describe, expect, it, vi } from 'vitest';
-
-import type { ClusterCatalogItem, ComputeInstanceCatalogItem } from '@osac/types';
-import {
-  InstanceTypeState,
-  SecurityGroupState,
-  SubnetState,
-  VirtualNetworkState,
-} from '@osac/types';
-
-import type { CatalogProvisionKind } from './catalogFieldDefinition';
-import type { CatalogProvisionPayload } from './catalogProvisionTypes';
-import { CatalogProvisionWizard } from './CatalogProvisionWizard';
-import type {
-  MockApiFixtures,
-  MockTransportOverrides,
-} from '../../test-utils/createMockConnectTransport';
-import { createMockConnectTransport } from '../../test-utils/createMockConnectTransport';
-import { renderWithProviders } from '../../test-utils/TestProviders';
-
-const fillClusterGeneralStep = async (
-  user: UserEvent,
-  name: string,
-  pullSecret = '{"auths":{}}',
-) => {
-  const nameInput = screen.getByLabelText(/^Name/);
-  await user.clear(nameInput);
-  await user.type(nameInput, name);
-  const pullSecretInput = screen.getByLabelText(/Pull secret/);
-  fireEvent.change(pullSecretInput, { target: { value: pullSecret } });
-};
-
-const fillGeneralStep = async (user: UserEvent, name: string) => {
-  const nameInput = screen.getByLabelText(/^Name/);
-  await user.clear(nameInput);
-  await user.type(nameInput, name);
-};
-
-const fillClusterNodeSetRow = async (user: UserEvent, hostTypeLabel = 'ACME 1TB', size = '3') => {
-  await waitFor(() => {
-    expect(screen.getByText('Node set 1')).toBeInTheDocument();
-  });
-  await user.click(screen.getByLabelText(/^Host type/));
-  await user.click(screen.getByRole('option', { name: hostTypeLabel }));
-  const sizeInput = screen.getByRole('spinbutton', { name: /^Nodes/ });
-  await user.clear(sizeInput);
-  await user.type(sizeInput, size);
-};
-
-export const clickWizardNext = async (user: UserEvent) => {
-  const [nextButton] = screen.getAllByRole('button', { name: 'Next' });
-  await user.click(nextButton);
-};
-
-const catalogItemGroup = () => screen.getByRole('radiogroup', { name: 'Catalog item' });
-
-const expectCatalogItemVisible = async (title: string) => {
-  await waitFor(() => {
-    expect(within(catalogItemGroup()).getByText(title)).toBeInTheDocument();
-  });
-};
-
-const expectCatalogItemSelected = (title: string) => {
-  const titleNode = within(catalogItemGroup()).getByText(title);
-  const card = titleNode.closest<HTMLElement>('.pf-v6-c-card');
-  if (!card) {
-    throw new Error(`Catalog card not found for ${title}`);
-  }
-  expect(within(card).getByRole('radio')).toBeChecked();
-};
-
-const selectCatalogItem = async (user: UserEvent, title: string) => {
-  await expectCatalogItemVisible(title);
-  const titleNode = within(catalogItemGroup()).getByText(title);
-  const card = titleNode.closest<HTMLElement>('.pf-v6-c-card');
-  if (!card) {
-    throw new Error(`Catalog card not found for ${title}`);
-  }
-  await user.click(within(card).getByRole('radio'));
-};
-
-const clickWizardBack = async (user: UserEvent) => {
-  const [backButton] = screen.getAllByRole('button', { name: 'Back' });
-  await user.click(backButton);
-};
-
-const clickWizardCancel = async (user: UserEvent) => {
-  const [cancelButton] = screen.getAllByRole('button', { name: 'Cancel' });
-  await user.click(cancelButton);
-};
-
-const advanceToConfigurationStep = async (
-  user: UserEvent,
-  vmName: string,
-  catalogItemTitle: string,
-) => {
-  await selectCatalogItem(user, catalogItemTitle);
-  await clickWizardNext(user);
-  await waitFor(() => {
-    expect(screen.getByLabelText(/^Name/)).toBeInTheDocument();
-  });
-  await fillGeneralStep(user, vmName);
-  await clickWizardNext(user);
-  await waitFor(() => {
-    expect(screen.getByLabelText(/VM image/)).toBeInTheDocument();
-  });
-};
-
-const waitForConfigurationReady = async (user?: UserEvent) => {
-  await waitFor(() => {
-    expect(screen.getByLabelText(/^Instance type/)).not.toBeDisabled();
-    expect(screen.getByLabelText(/^Instance type/)).toHaveTextContent('standard-4-8');
-  });
-
-  const bootDisk = screen.queryByLabelText<HTMLInputElement>(/Boot disk/);
-  if (bootDisk && !bootDisk.value) {
-    if (!user) {
-      throw new Error('Boot disk must be filled before leaving configuration');
-    }
-    await user.clear(bootDisk);
-    await user.type(bootDisk, '40');
-  }
-};
-
-const advanceToNetworkingStep = async (user: UserEvent, catalogItemTitle: string) => {
-  await advanceToConfigurationStep(user, 'web-01', catalogItemTitle);
-  await waitForConfigurationReady(user);
-  await clickWizardNext(user);
-  await waitFor(() => {
-    expect(screen.getByLabelText(/^Virtual network/)).toBeInTheDocument();
-  });
-};
-
-const selectNetworkingPickers = async (user: UserEvent) => {
-  await waitFor(() => {
-    expect(screen.getByLabelText(/^Virtual network/)).not.toBeDisabled();
-    expect(screen.getByLabelText(/^Virtual network/)).toHaveTextContent('tenant-vn');
-    expect(screen.getByLabelText(/^Subnet/)).toHaveTextContent('tenant-subnet');
-    expect(screen.getByText('default-sg')).toBeInTheDocument();
-  });
-
-  const sgToggle = screen.getByLabelText(/^Security groups/);
-  if (sgToggle.textContent === 'Select security groups') {
-    await user.click(sgToggle);
-    await user.click(screen.getByRole('menuitemcheckbox', { name: /default-sg/ }));
-  }
-
-  await waitFor(() => {
-    expect(screen.getByLabelText(/^Security groups/)).not.toHaveTextContent(
-      'Select security groups',
-    );
-  });
-};
-
-const advanceToReviewStep = async (user: UserEvent, catalogItemTitle: string) => {
-  await advanceToNetworkingStep(user, catalogItemTitle);
-  await selectNetworkingPickers(user);
-  await clickWizardNext(user);
-  await waitFor(() => {
-    expect(screen.getByRole('button', { name: 'Create' })).toBeInTheDocument();
-  });
-};
-
-const expectValidationAlert = async () => {
-  await waitFor(() => {
-    expect(screen.getByText('Fix the highlighted errors before continuing.')).toBeInTheDocument();
-  });
-};
-
-const getCancelModal = () => {
-  const dialog = screen.getByRole('dialog');
-  return within(dialog);
-};
-
-const advanceToClusterConfigurationStep = async (
-  user: UserEvent,
-  catalogItemTitle: string,
-  name = 'my-cluster',
-) => {
-  await selectCatalogItem(user, catalogItemTitle);
-  await clickWizardNext(user);
-  await fillClusterGeneralStep(user, name);
-  await clickWizardNext(user);
-  await waitFor(() => {
-    expect(screen.getByLabelText(/Release image/)).toBeInTheDocument();
-  });
-  await waitFor(() => {
-    expect(screen.getByRole('button', { name: 'Add node set' })).toBeInTheDocument();
-  });
-};
-
-const advanceToClusterReviewStep = async (user: UserEvent, catalogItemTitle: string) => {
-  await advanceToClusterConfigurationStep(user, catalogItemTitle);
-  await fillClusterNodeSetRow(user);
-  await clickWizardNext(user);
-  await waitFor(() => {
-    expect(screen.getByLabelText(/Pod CIDR/)).toBeInTheDocument();
-  });
-  await clickWizardNext(user);
-  await waitFor(() => {
-    expect(screen.getByRole('button', { name: 'Create' })).toBeInTheDocument();
-  });
-};
-
-const vmCatalogItem: ComputeInstanceCatalogItem = {
-  $typeName: 'osac.public.v1.ComputeInstanceCatalogItem',
-  id: 'catalog-rhel-9',
-  metadata: {
-    $typeName: 'osac.public.v1.Metadata',
-    name: 'catalog-rhel-9',
-    annotations: {},
-    creator: 'foo',
-    labels: {},
-    project: 'foo',
-    tenant: 'foo',
-    version: 1,
-  },
-  title: 'RHEL 9 catalog',
-  description: 'RHEL 9 base image',
-  template: 'tpl-rhel-9',
-  published: true,
-  fieldDefinitions: [
-    {
-      $typeName: 'osac.public.v1.FieldDefinition',
-      path: 'spec.image.source_ref',
-      displayName: 'VM image',
-      editable: true,
-      validationSchema: '',
-      default: {
-        $typeName: 'google.protobuf.Value',
-        kind: { case: 'stringValue', value: 'quay.io/example/rhel9' },
-      },
-    },
-  ],
-};
-
-const clusterCatalogItem: ClusterCatalogItem = {
-  $typeName: 'osac.public.v1.ClusterCatalogItem',
-  id: 'catalog-openshift-4',
-  metadata: {
-    $typeName: 'osac.public.v1.Metadata',
-    name: 'catalog-openshift-4',
-    annotations: {},
-    creator: 'foo',
-    labels: {},
-    project: 'foo',
-    tenant: 'foo',
-    version: 1,
-  },
-  title: 'OpenShift 4 cluster',
-  description: 'Standard OpenShift cluster offering',
-  template: 'tpl-openshift-4',
-  published: true,
-  fieldDefinitions: [
-    {
-      $typeName: 'osac.public.v1.FieldDefinition',
-      path: 'release_image',
-      displayName: 'Release image',
-      editable: true,
-      validationSchema: '',
-      default: {
-        $typeName: 'google.protobuf.Value',
-        kind: { case: 'stringValue', value: '4.17.0' },
-      },
-    },
-  ],
-};
-
-const catalogItemWithDistinctDefaults: ComputeInstanceCatalogItem = {
-  ...vmCatalogItem,
-  fieldDefinitions: [
-    {
-      $typeName: 'osac.public.v1.FieldDefinition',
-      path: 'spec.image.source_ref',
-      displayName: 'VM image',
-      editable: true,
-      validationSchema: '',
-      default: {
-        $typeName: 'google.protobuf.Value',
-        kind: { case: 'stringValue', value: 'quay.io/example/rhel9' },
-      },
-    },
-  ],
-};
-
-const multiFieldCatalogItem: ComputeInstanceCatalogItem = {
-  $typeName: 'osac.public.v1.ComputeInstanceCatalogItem',
-  id: 'catalog-rhel-9',
-  metadata: {
-    $typeName: 'osac.public.v1.Metadata',
-    name: 'catalog-rhel-9',
-    annotations: {},
-    creator: 'foo',
-    labels: {},
-    project: 'foo',
-    tenant: 'foo',
-    version: 1,
-  },
-  title: 'RHEL 9 catalog',
-  description: 'RHEL 9 base image',
-  template: 'tpl-rhel-9',
-  published: true,
-  fieldDefinitions: [
-    {
-      $typeName: 'osac.public.v1.FieldDefinition',
-      path: 'spec.image.source_ref',
-      displayName: 'VM image',
-      editable: true,
-      validationSchema: '',
-      default: {
-        $typeName: 'google.protobuf.Value',
-        kind: { case: 'stringValue', value: 'quay.io/example/rhel9' },
-      },
-    },
-    {
-      $typeName: 'osac.public.v1.FieldDefinition',
-      path: 'spec.boot_disk.size_gib',
-      displayName: 'Boot disk',
-      editable: true,
-      validationSchema: '',
-      default: { $typeName: 'google.protobuf.Value', kind: { case: 'numberValue', value: 40 } },
-    },
-  ],
-};
-
-const apiFixtures: MockApiFixtures = {
-  catalogItems: [vmCatalogItem],
-  clusterCatalogItems: [clusterCatalogItem],
-  clusterTemplates: [
-    {
-      $typeName: 'osac.public.v1.ClusterTemplate',
-      id: 'tpl-openshift-4',
-      metadata: {
-        $typeName: 'osac.public.v1.Metadata',
-        name: 'tpl-openshift-4',
-        annotations: {},
-        creator: 'foo',
-        labels: {},
-        project: 'foo',
-        tenant: 'foo',
-        version: 1,
-      },
-      nodeSets: {
-        compute: {
-          $typeName: 'osac.public.v1.ClusterTemplateNodeSet',
-          hostType: 'acme_1tb',
-          size: 3,
-        },
-      },
-      description: '',
-      parameters: [],
-      title: '',
-    },
-  ],
-  hostTypes: [
-    {
-      $typeName: 'osac.public.v1.HostType',
-      id: 'acme_1tb',
-      metadata: {
-        $typeName: 'osac.public.v1.Metadata',
-        name: 'acme_1tb',
-        annotations: {},
-        creator: 'foo',
-        labels: {},
-        project: 'foo',
-        tenant: 'foo',
-        version: 1,
-      },
-      title: 'ACME 1TB',
-      description: '',
-      interfaces: [],
-    },
-    {
-      $typeName: 'osac.public.v1.HostType',
-      id: 'acme_1tb_h100',
-      metadata: {
-        $typeName: 'osac.public.v1.Metadata',
-        name: 'acme_1tb_h100',
-        annotations: {},
-        creator: 'foo',
-        labels: {},
-        project: 'foo',
-        tenant: 'foo',
-        version: 1,
-      },
-      title: 'ACME 1TB H100',
-      description: '',
-      interfaces: [],
-    },
-  ],
-  virtualNetworks: [
-    {
-      $typeName: 'osac.public.v1.VirtualNetwork',
-      id: 'vn-1',
-      metadata: {
-        $typeName: 'osac.public.v1.Metadata',
-        name: 'tenant-vn',
-        annotations: {},
-        creator: 'foo',
-        labels: {},
-        project: 'foo',
-        tenant: 'foo',
-        version: 1,
-      },
-      status: {
-        $typeName: 'osac.public.v1.VirtualNetworkStatus',
-        state: VirtualNetworkState.READY,
-      },
-    },
-  ],
-  subnets: [
-    {
-      $typeName: 'osac.public.v1.Subnet',
-      id: 'subnet-1',
-      metadata: {
-        $typeName: 'osac.public.v1.Metadata',
-        name: 'tenant-subnet',
-        annotations: {},
-        creator: 'foo',
-        labels: {},
-        project: 'foo',
-        tenant: 'foo',
-        version: 1,
-      },
-      spec: {
-        $typeName: 'osac.public.v1.SubnetSpec',
-        virtualNetwork: 'vn-1',
-      },
-      status: {
-        $typeName: 'osac.public.v1.SubnetStatus',
-        state: SubnetState.READY,
-      },
-    },
-  ],
-  securityGroups: [
-    {
-      $typeName: 'osac.public.v1.SecurityGroup',
-      id: 'sg-1',
-      metadata: {
-        $typeName: 'osac.public.v1.Metadata',
-        name: 'default-sg',
-        annotations: {},
-        creator: 'foo',
-        labels: {},
-        project: 'foo',
-        tenant: 'foo',
-        version: 1,
-      },
-      spec: {
-        $typeName: 'osac.public.v1.SecurityGroupSpec',
-        virtualNetwork: 'vn-1',
-        egress: [],
-        ingress: [],
-      },
-      status: {
-        $typeName: 'osac.public.v1.SecurityGroupStatus',
-        state: SecurityGroupState.READY,
-      },
-    },
-  ],
-  instanceTypes: [
-    {
-      $typeName: 'osac.public.v1.InstanceType',
-      id: 'standard-4-8',
-      metadata: {
-        $typeName: 'osac.public.v1.Metadata',
-        name: 'standard-4-8',
-        annotations: {},
-        creator: 'foo',
-        labels: {},
-        project: 'foo',
-        tenant: 'foo',
-        version: 1,
-      },
-      spec: {
-        $typeName: 'osac.public.v1.InstanceTypeSpec',
-        cores: 4,
-        memoryGib: 8,
-        state: InstanceTypeState.ACTIVE,
-        description: '',
-      },
-    },
-  ],
-};
-
-type RenderWizardOptions = {
-  kind?: CatalogProvisionKind;
-  initialCatalogItemId?: string;
-  apiFixtures?: MockApiFixtures;
-  transport?: Transport;
-  transportOverrides?: MockTransportOverrides;
-  onProvision?: (payload: CatalogProvisionPayload) => void | Promise<void>;
-  onClosed?: () => void;
-} & Omit<RenderOptions, 'wrapper'>;
-
-const renderWizard = (options: RenderWizardOptions = {}) => {
-  const onProvision = options.onProvision ?? vi.fn();
-  const onClosed = options.onClosed ?? vi.fn();
-
-  const result = renderWithProviders(
-    <CatalogProvisionWizard
-      kind={options.kind || 'compute_instance'}
-      initialCatalogItemId={options.initialCatalogItemId}
-      onProvision={onProvision}
-      onClosed={onClosed}
-    />,
-    {
-      apiFixtures: options.apiFixtures ?? apiFixtures,
-      transport: options.transport,
-      transportOverrides: options.transportOverrides,
-    },
-  );
-
-  return { ...result, onProvision, onClosed };
-};
-
-const expectConfigurationDefaults = async () => {
-  await waitFor(() => {
-    expect(screen.getByLabelText(/VM image/)).toHaveValue('quay.io/example/rhel9');
-  });
-};
-
-const expectMultiFieldConfigurationDefaults = async () => {
-  await expectConfigurationDefaults();
-  await waitFor(() => {
-    const bootDisk = screen.getByLabelText<HTMLInputElement>(/Boot disk/);
-    expect(bootDisk.value).toBe('40');
-  });
-};
-
-describe('CatalogProvisionWizard', () => {
-  it('blocks Next on catalog step when no catalog item is selected', async () => {
-    const { user } = renderWizard();
-
-    await expectCatalogItemVisible('RHEL 9 catalog');
-
-    await clickWizardNext(user);
-    await expectValidationAlert();
-    expect(screen.getByText('Select a catalog item')).toBeInTheDocument();
-    await expectCatalogItemVisible('RHEL 9 catalog');
-  });
-
-  it('blocks Next on general step when name is empty', async () => {
-    const { user } = renderWizard();
-
-    await selectCatalogItem(user, vmCatalogItem.title);
-    await clickWizardNext(user);
-    await waitFor(() => {
-      expect(screen.getByLabelText(/^Name/)).toBeInTheDocument();
-    });
-
-    await clickWizardNext(user);
-    await expectValidationAlert();
-    expect(screen.getByText('Name is required')).toBeInTheDocument();
-  });
-
-  it('prefills configuration fields from catalog item defaults after selection', async () => {
-    const { user } = renderWizard({
-      apiFixtures: { ...apiFixtures, catalogItems: [catalogItemWithDistinctDefaults] },
-    });
-
-    await selectCatalogItem(user, vmCatalogItem.title);
-    await clickWizardNext(user);
-    await fillGeneralStep(user, 'web-01');
-    await clickWizardNext(user);
-
-    await expectConfigurationDefaults();
-  });
-
-  it('applies multi-field catalog defaults through configuration and create', async () => {
-    const onProvision = vi.fn().mockResolvedValue(undefined);
-    const { user } = renderWizard({
-      apiFixtures: {
-        ...apiFixtures,
-        catalogItems: [multiFieldCatalogItem],
-      },
-      onProvision,
-    });
-
-    await selectCatalogItem(user, vmCatalogItem.title);
-    await clickWizardNext(user);
-    await fillGeneralStep(user, 'web-01');
-    await clickWizardNext(user);
-
-    await expectMultiFieldConfigurationDefaults();
-    await waitForConfigurationReady(user);
-
-    await clickWizardNext(user);
-    await selectNetworkingPickers(user);
-    await clickWizardNext(user);
-
-    await user.click(screen.getByRole('button', { name: 'Create' }));
-
-    await waitFor(() => {
-      expect(onProvision).toHaveBeenCalledTimes(1);
-    });
-
-    expect(onProvision.mock.calls[0][0]).toMatchObject({
-      spec: {
-        image: { sourceRef: 'quay.io/example/rhel9' },
-        runStrategy: 'Always',
-        instanceType: 'standard-4-8',
-        bootDisk: { sizeGib: 40 },
-      },
-    });
-  });
-
-  it('prefills configuration fields when deep-linked before catalog items finish loading', async () => {
-    let releaseCatalogFetch!: () => void;
-    const catalogFetchGate = new Promise<void>((resolve) => {
-      releaseCatalogFetch = resolve;
-    });
-
-    const catalogApiFixtures = {
-      ...apiFixtures,
-      catalogItems: [catalogItemWithDistinctDefaults],
-    };
-    const baseTransport = createMockConnectTransport(catalogApiFixtures);
-
-    const originalUnary = baseTransport.unary.bind(baseTransport);
-    const unary: Transport['unary'] = async (...args) => {
-      const method = args[0];
-      if (method.parent.typeName.endsWith('ComputeInstanceCatalogItems')) {
-        await catalogFetchGate;
-      }
-      return originalUnary(...args);
-    };
-    const gatedTransport: Transport = { ...baseTransport, unary };
-
-    const { user } = renderWizard({
-      initialCatalogItemId: vmCatalogItem.id,
-      transport: gatedTransport,
-    });
-
-    await clickWizardNext(user);
-    await fillGeneralStep(user, 'web-01');
-    await clickWizardNext(user);
-
-    releaseCatalogFetch();
-    await waitFor(() => {
-      expect(screen.getByLabelText(/VM image/)).toBeInTheDocument();
-    });
-
-    await expectConfigurationDefaults();
-  });
-
-  it('highlights the Name field with a required error when Next is clicked without entering a name', async () => {
-    const { user } = renderWizard();
-
-    await selectCatalogItem(user, vmCatalogItem.title);
-    await clickWizardNext(user);
-
-    const nameInput = await screen.findByLabelText(/^Name/);
-    expect(nameInput).not.toHaveAttribute('aria-invalid', 'true');
-
-    await clickWizardNext(user);
-
-    await expectValidationAlert();
-
-    expect(nameInput).toHaveAttribute('aria-invalid', 'true');
-    expect(nameInput).toHaveAccessibleDescription(/Name is required/);
-
-    const nameError = document.getElementById('metadata-name-helper-error');
-    expect(nameError).toHaveTextContent('Name is required');
-    expect(nameInput).toHaveAttribute('aria-describedby', 'metadata-name-helper-error');
-
-    expect(screen.getByLabelText(/^Name/)).toBeInTheDocument();
-    expect(screen.queryByLabelText(/VM image/)).not.toBeInTheDocument();
-  });
-
-  it('closes immediately on Cancel when the wizard is pristine', async () => {
-    const onClosed = vi.fn();
-    const { user } = renderWizard({ onClosed });
-
-    await waitFor(() => {
-      expect(screen.getAllByRole('button', { name: 'Cancel' }).length).toBeGreaterThan(0);
-    });
-
-    await clickWizardCancel(user);
-    expect(onClosed).toHaveBeenCalledTimes(1);
-    expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-  });
-
-  it('shows discard confirmation on Cancel after selecting a catalog item', async () => {
-    const onClosed = vi.fn();
-    const { user } = renderWizard({ onClosed });
-
-    await selectCatalogItem(user, vmCatalogItem.title);
-    await clickWizardCancel(user);
-
-    const modal = getCancelModal();
-    expect(modal.getByText('Discard wizard progress?')).toBeInTheDocument();
-    expect(onClosed).not.toHaveBeenCalled();
-  });
-
-  it('keeps wizard open when Stay editing is chosen on the discard modal', async () => {
-    const onClosed = vi.fn();
-    const { user } = renderWizard({ onClosed });
-
-    await selectCatalogItem(user, vmCatalogItem.title);
-    await clickWizardCancel(user);
-
-    const modal = getCancelModal();
-    await user.click(modal.getByRole('button', { name: 'Keep editing' }));
-
-    await waitFor(() => {
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-    });
-    expect(onClosed).not.toHaveBeenCalled();
-    expectCatalogItemSelected('RHEL 9 catalog');
-  });
-
-  it('discards and closes when Discard is confirmed', async () => {
-    const onClosed = vi.fn();
-    const { user } = renderWizard({ onClosed });
-
-    await selectCatalogItem(user, vmCatalogItem.title);
-    await clickWizardCancel(user);
-
-    const modal = getCancelModal();
-    await user.click(modal.getByRole('button', { name: 'Discard and close' }));
-
-    expect(onClosed).toHaveBeenCalledTimes(1);
-  });
-
-  it('preserves general step values after navigating back from configuration', async () => {
-    const { user } = renderWizard();
-
-    await advanceToConfigurationStep(user, 'persisted-vm', vmCatalogItem.title);
-    await clickWizardBack(user);
-
-    await waitFor(() => {
-      expect(screen.getByLabelText(/^Name/)).toHaveValue('persisted-vm');
-    });
-  });
-
-  it('preserves configuration values after navigating back from networking', async () => {
-    const { user } = renderWizard();
-
-    await advanceToNetworkingStep(user, vmCatalogItem.title);
-    await clickWizardBack(user);
-
-    await waitFor(() => {
-      expect(screen.getByLabelText(/VM image/)).toHaveValue('quay.io/example/rhel9');
-    });
-  });
-
-  it('shows only active instance types when deprecated and active share a name', async () => {
-    const { user } = renderWizard({
-      apiFixtures: {
-        ...apiFixtures,
-        instanceTypes: [
-          {
-            $typeName: 'osac.public.v1.InstanceType',
-            id: 'standard-deprecated',
-            metadata: {
-              $typeName: 'osac.public.v1.Metadata',
-              name: 'standard-4-8',
-              annotations: {},
-              creator: 'foo',
-              labels: {},
-              project: 'foo',
-              tenant: 'foo',
-              version: 1,
-            },
-            spec: {
-              $typeName: 'osac.public.v1.InstanceTypeSpec',
-              cores: 4,
-              memoryGib: 8,
-              state: InstanceTypeState.DEPRECATED,
-              description: '',
-            },
-          },
-          {
-            $typeName: 'osac.public.v1.InstanceType',
-            id: 'standard-active',
-            metadata: {
-              $typeName: 'osac.public.v1.Metadata',
-              name: 'standard-4-8',
-              annotations: {},
-              creator: 'foo',
-              labels: {},
-              project: 'foo',
-              tenant: 'foo',
-              version: 1,
-            },
-            spec: {
-              $typeName: 'osac.public.v1.InstanceTypeSpec',
-              cores: 4,
-              memoryGib: 8,
-              state: InstanceTypeState.ACTIVE,
-              description: '',
-            },
-          },
-        ],
-      },
-    });
-    await advanceToConfigurationStep(user, 'web-01', vmCatalogItem.title);
-
-    await waitFor(() => {
-      expect(screen.getByLabelText(/^Instance type/)).not.toBeDisabled();
-    });
-
-    await user.click(screen.getByLabelText(/^Instance type/));
-
-    await waitFor(() => {
-      const instanceTypeOptions = screen.getAllByRole('option');
-      expect(instanceTypeOptions).toHaveLength(1);
-      expect(instanceTypeOptions[0]).toHaveTextContent('standard-4-8');
-    });
-  });
-
-  it('shows only ready virtual networks when pending and ready share a name', async () => {
-    const { user } = renderWizard({
-      apiFixtures: {
-        ...apiFixtures,
-        virtualNetworks: [
-          {
-            $typeName: 'osac.public.v1.VirtualNetwork',
-            id: 'vn-pending',
-            metadata: {
-              $typeName: 'osac.public.v1.Metadata',
-              name: 'tenant-vn',
-              annotations: {},
-              creator: 'foo',
-              labels: {},
-              project: 'foo',
-              tenant: 'foo',
-              version: 1,
-            },
-            status: {
-              $typeName: 'osac.public.v1.VirtualNetworkStatus',
-              state: VirtualNetworkState.PENDING,
-            },
-          },
-          {
-            $typeName: 'osac.public.v1.VirtualNetwork',
-            id: 'vn-ready',
-            metadata: {
-              $typeName: 'osac.public.v1.Metadata',
-              name: 'tenant-vn',
-              annotations: {},
-              creator: 'foo',
-              labels: {},
-              project: 'foo',
-              tenant: 'foo',
-              version: 1,
-            },
-            status: {
-              $typeName: 'osac.public.v1.VirtualNetworkStatus',
-              state: VirtualNetworkState.READY,
-            },
-          },
-        ],
-        subnets: [
-          {
-            $typeName: 'osac.public.v1.Subnet',
-            id: 'subnet-1',
-            metadata: {
-              $typeName: 'osac.public.v1.Metadata',
-              name: 'tenant-subnet',
-              annotations: {},
-              creator: 'foo',
-              labels: {},
-              project: 'foo',
-              tenant: 'foo',
-              version: 1,
-            },
-            spec: {
-              $typeName: 'osac.public.v1.SubnetSpec',
-              virtualNetwork: 'vn-ready',
-            },
-            status: {
-              $typeName: 'osac.public.v1.SubnetStatus',
-              state: SubnetState.READY,
-            },
-          },
-        ],
-        securityGroups: [
-          {
-            $typeName: 'osac.public.v1.SecurityGroup',
-            id: 'sg-1',
-            metadata: {
-              $typeName: 'osac.public.v1.Metadata',
-              name: 'default-sg',
-              annotations: {},
-              creator: 'foo',
-              labels: {},
-              project: 'foo',
-              tenant: 'foo',
-              version: 1,
-            },
-            spec: {
-              $typeName: 'osac.public.v1.SecurityGroupSpec',
-              virtualNetwork: 'vn-ready',
-              egress: [],
-              ingress: [],
-            },
-            status: {
-              $typeName: 'osac.public.v1.SecurityGroupStatus',
-              state: SecurityGroupState.READY,
-            },
-          },
-        ],
-      },
-    });
-    await advanceToNetworkingStep(user, vmCatalogItem.title);
-
-    await waitFor(() => {
-      expect(screen.getByLabelText(/^Virtual network/)).toHaveTextContent('tenant-vn');
-    });
-
-    await user.click(screen.getByLabelText(/^Virtual network/));
-
-    await waitFor(() => {
-      const networkOptions = screen.getAllByRole('option');
-      expect(networkOptions).toHaveLength(1);
-      expect(networkOptions[0]).toHaveTextContent('tenant-vn');
-    });
-  });
-
-  it('shows virtual network and subnet names on the review step', async () => {
-    const { user } = renderWizard();
-
-    await advanceToReviewStep(user, vmCatalogItem.title);
-
-    await waitFor(() => {
-      expect(screen.getByText('tenant-vn')).toBeInTheDocument();
-      expect(screen.getByText('tenant-subnet')).toBeInTheDocument();
-    });
-  });
-
-  it('shows security group names on the review step', async () => {
-    const { user } = renderWizard();
-
-    await advanceToReviewStep(user, vmCatalogItem.title);
-
-    await waitFor(() => {
-      expect(screen.getByText('default-sg')).toBeInTheDocument();
-    });
-  });
-
-  it('shows instance type on the review step', async () => {
-    const { user } = renderWizard();
-
-    await advanceToReviewStep(user, vmCatalogItem.title);
-
-    await waitFor(() => {
-      expect(screen.getByText('standard-4-8 — 4 vCPU, 8 GiB')).toBeInTheDocument();
-    });
-  });
-
-  it('submits create payload from review and calls onProvision', async () => {
-    const onProvision = vi.fn().mockResolvedValue(undefined);
-    const { user } = renderWizard({ onProvision });
-
-    await advanceToReviewStep(user, vmCatalogItem.title);
-
-    await user.click(screen.getByRole('button', { name: 'Create' }));
-
-    await waitFor(() => {
-      expect(onProvision).toHaveBeenCalledTimes(1);
-    });
-
-    expect(onProvision.mock.calls[0][0]).toMatchObject({
-      metadata: { name: 'web-01' },
-      spec: {
-        image: { sourceRef: 'quay.io/example/rhel9' },
-        instanceType: 'standard-4-8',
-      },
-    });
-    expect(onProvision.mock.calls[0][0]).not.toHaveProperty('spec.cores');
-    expect(onProvision.mock.calls[0][0]).not.toHaveProperty('spec.memoryGib');
-    expect(onProvision.mock.calls[0][0]).toHaveProperty('spec.networkAttachments', [
-      { subnet: 'subnet-1', securityGroups: ['sg-1'] },
-    ]);
-  });
-
-  it('surfaces provision errors on review without clearing form values', async () => {
-    const onProvision = vi.fn().mockRejectedValue(new Error('provision failed'));
-    const { user } = renderWizard({ onProvision });
-
-    await advanceToReviewStep(user, vmCatalogItem.title);
-
-    await user.click(screen.getByRole('button', { name: 'Create' }));
-
-    await waitFor(() => {
-      expect(screen.getByText('provision failed')).toBeInTheDocument();
-    });
-    expect(screen.getByRole('button', { name: 'Create' })).toBeInTheDocument();
-  });
-
-  it('blocks Next on cluster general step when name is invalid', async () => {
-    const { user } = renderWizard({ kind: 'cluster' });
-
-    await selectCatalogItem(user, clusterCatalogItem.title);
-    await clickWizardNext(user);
-    await fillClusterGeneralStep(user, 'MyCluster');
-    await clickWizardNext(user);
-
-    await expectValidationAlert();
-    expect(
-      screen.getByText(
-        'Name must only contain lowercase letters (a-z), digits (0-9), and hyphens (-)',
-      ),
-    ).toBeInTheDocument();
-  });
-
-  it('shows host type display name on the cluster review step', async () => {
-    const { user } = renderWizard({ kind: 'cluster' });
-
-    await advanceToClusterReviewStep(user, clusterCatalogItem.title);
-
-    await waitFor(() => {
-      expect(screen.getByText('ACME 1TB: 3')).toBeInTheDocument();
-    });
-  });
-
-  it('starts with one node set and submits cluster create payload after filling it', async () => {
-    const onProvision = vi.fn().mockResolvedValue(undefined);
-    const { user } = renderWizard({
-      kind: 'cluster',
-      onProvision,
-    });
-
-    await advanceToClusterConfigurationStep(user, clusterCatalogItem.title);
-    expect(screen.getByText('Node set 1')).toBeInTheDocument();
-
-    await fillClusterNodeSetRow(user);
-    await clickWizardNext(user);
-    await clickWizardNext(user);
-    await user.click(screen.getByRole('button', { name: 'Create' }));
-
-    await waitFor(() => {
-      expect(onProvision).toHaveBeenCalledTimes(1);
-    });
-
-    expect(onProvision.mock.calls[0][0]).toMatchObject({
-      metadata: { name: 'my-cluster' },
-      spec: {
-        catalogItem: clusterCatalogItem.id,
-        releaseImage: '4.17.0',
-      },
-    });
-    expect(onProvision.mock.calls[0][0]).toHaveProperty('spec.nodeSets', {
-      acme_1tb: { hostType: 'acme_1tb', size: 3 },
-    });
-  });
-});
diff --git a/libs/ui-components/src/components/catalogProvision/CatalogProvisionWizard.tsx b/libs/ui-components/src/components/catalogProvision/CatalogProvisionWizard.tsx
deleted file mode 100644
index 5beb24e8..00000000
--- a/libs/ui-components/src/components/catalogProvision/CatalogProvisionWizard.tsx
+++ /dev/null
@@ -1,551 +0,0 @@
-import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
-import {
-  Alert,
-  Button,
-  Flex,
-  Modal,
-  ModalBody,
-  ModalFooter,
-  ModalHeader,
-  PageSection,
-  PageSectionTypes,
-  Stack,
-  StackItem,
-  Wizard,
-  WizardFooterWrapper,
-  WizardStep,
-  useWizardContext,
-} from '@patternfly/react-core';
-import { type FormikProps, FormikProvider, useFormik } from 'formik';
-
-import type { CatalogProvisionKind } from './catalogFieldDefinition';
-import type {
-  CatalogProvisionPayload,
-  CatalogProvisionWizardValues,
-} from './catalogProvisionTypes';
-import { useTranslation } from '../../hooks/useTranslation';
-import { CatalogItem } from '../catalog/catalogItemDisplay';
-import { FieldValidationProvider } from '../Form/FieldValidationContext';
-import { useBareMetalInstanceAdapter } from './wizard/adapters/bareMetalInstanceAdapter';
-import { useClusterAdapter } from './wizard/adapters/clusterAdapter';
-import { useComputeInstanceAdapter } from './wizard/adapters/computeInstanceAdapter';
-import type { CatalogProvisionAdapter } from './wizard/adapters/types';
-import { STEP_LABEL_KEYS, type WizardStepId, getWizardOrderedSteps } from './wizard/stepIds';
-import { CatalogStep, ReviewStep } from './wizard/steps/WizardSteps';
-
-export type {
-  CatalogProvisionPayload,
-  CatalogProvisionWizardValues,
-} from './catalogProvisionTypes';
-
-const hasWizardUnsavedProgress = (values: { catalogItemId?: string }): boolean =>
-  Boolean(values.catalogItemId?.trim());
-
-export type CatalogProvisionWizardCloseHandler = {
-  requestClose: () => void;
-  pending: boolean;
-};
-
-interface Props {
-  kind: CatalogProvisionKind;
-  initialCatalogItemId?: string;
-  onProvision: (payload: CatalogProvisionPayload) => void | Promise<void>;
-  onClosed?: () => void;
-  onCloseHandlerChange?: (handler: CatalogProvisionWizardCloseHandler) => void;
-}
-
-type ErasedCatalogAdapter = CatalogProvisionAdapter<
-  CatalogItem,
-  CatalogProvisionWizardValues,
-  CatalogProvisionPayload
->;
-
-interface WizardFooterProps {
-  formik: FormikProps<CatalogProvisionWizardValues>;
-  catalogItem: CatalogItem | null;
-  setActiveStepId: (stepId: WizardStepId) => void;
-  setProvisionError: (message: string | undefined) => void;
-  setValidationAlert: (visible: boolean) => void;
-  pending: boolean;
-  setPending: (pending: boolean) => void;
-  onProvision: Props['onProvision'];
-  buildCreatePayload: ErasedCatalogAdapter['buildCreatePayload'];
-  close: (options?: { notifyClosed?: boolean }) => void;
-  requestClose: () => void;
-}
-
-const isWizardStepId = (stepId: string | number | undefined): stepId is WizardStepId =>
-  typeof stepId === 'string' && Object.hasOwn(STEP_LABEL_KEYS, stepId);
-
-const CatalogProvisionWizardFooter = ({
-  formik,
-  catalogItem,
-  setActiveStepId,
-  setProvisionError,
-  setValidationAlert,
-  pending,
-  setPending,
-  onProvision,
-  buildCreatePayload,
-  close,
-  requestClose,
-}: WizardFooterProps) => {
-  const { t } = useTranslation();
-  const { activeStep, goToStepByIndex } = useWizardContext();
-  const activeStepId = isWizardStepId(activeStep?.id) ? activeStep.id : 'catalog';
-
-  // Keep Formik's validationSchema in sync with the visible step before blur/Next run.
-  useLayoutEffect(() => {
-    setActiveStepId(activeStepId);
-  }, [activeStepId, setActiveStepId]);
-  const stepIndex = activeStep?.index ?? 1;
-  const isFirst = stepIndex <= 1;
-  const isReview = activeStepId === 'review';
-
-  const handleBack = useCallback(() => {
-    if (isFirst || pending) {
-      return;
-    }
-    setProvisionError(undefined);
-    setValidationAlert(false);
-    goToStepByIndex(stepIndex - 1);
-  }, [goToStepByIndex, isFirst, pending, setProvisionError, setValidationAlert, stepIndex]);
-
-  const { values } = formik;
-
-  // validateForm() uses the step-scoped validationSchema wired in CatalogProvisionWizardInner.
-  const validateCurrentStep = useCallback(async () => {
-    const errors = await formik.validateForm();
-    if (Object.keys(errors).length > 0) {
-      setValidationAlert(true);
-      return false;
-    }
-    setValidationAlert(false);
-    return true;
-  }, [formik, setValidationAlert]);
-
-  const handleNextOrCreate = useCallback(() => {
-    if (pending) {
-      return;
-    }
-
-    if (isReview) {
-      if (!catalogItem) {
-        setProvisionError(t('catalogProvision.validation.catalogItemRequired'));
-        return;
-      }
-
-      setPending(true);
-      setProvisionError(undefined);
-      const payload = buildCreatePayload(values, catalogItem);
-      void Promise.resolve(onProvision(payload))
-        .then(() => {
-          close({ notifyClosed: false });
-        })
-        .catch((error) => {
-          setProvisionError(
-            error instanceof Error ? error.message : t('catalogProvision.errors.provisionFailed'),
-          );
-        })
-        .finally(() => {
-          setPending(false);
-        });
-      return;
-    }
-
-    void validateCurrentStep().then((isValid) => {
-      if (!isValid) {
-        return;
-      }
-      setProvisionError(undefined);
-      goToStepByIndex(stepIndex + 1);
-    });
-  }, [
-    buildCreatePayload,
-    catalogItem,
-    close,
-    goToStepByIndex,
-    isReview,
-    onProvision,
-    pending,
-    setPending,
-    setProvisionError,
-    stepIndex,
-    t,
-    validateCurrentStep,
-    values,
-  ]);
-
-  return (
-    <Flex
-      justifyContent={{ default: 'justifyContentFlexStart' }}
-      alignItems={{ default: 'alignItemsCenter' }}
-      flexWrap={{ default: 'wrap' }}
-      gap={{ default: 'gapMd' }}
-    >
-      <Button
-        variant="secondary"
-        onClick={handleBack}
-        isDisabled={isFirst || pending}
-        isAriaDisabled={isFirst || pending}
-      >
-        {t('catalogProvision.actions.back')}
-      </Button>
-      <Button
-        type="button"
-        variant="primary"
-        onClick={handleNextOrCreate}
-        isDisabled={pending}
-        isLoading={pending}
-      >
-        {isReview ? t('catalogProvision.actions.create') : t('catalogProvision.actions.next')}
-      </Button>
-      <Button variant="link" onClick={requestClose} isDisabled={pending}>
-        {t('catalogProvision.actions.cancel')}
-      </Button>
-    </Flex>
-  );
-};
-
-interface WizardBodyProps {
-  adapter: ErasedCatalogAdapter;
-  stepId: WizardStepId;
-  catalogItem: CatalogItem | null;
-  values: CatalogProvisionWizardValues;
-  provisionError?: string;
-  validationAlert: boolean;
-}
-
-const WizardStepBody = ({
-  adapter,
-  stepId,
-  catalogItem,
-  values,
-  provisionError,
-  validationAlert,
-}: WizardBodyProps) => {
-  const { t } = useTranslation();
-  const ConfigurationStep = adapter.ConfigurationStep;
-  const NetworkingStep = adapter.NetworkingStep;
-  const GeneralStepComponent = adapter.GeneralStep;
-
-  return (
-    <FieldValidationProvider value={validationAlert}>
-      <Stack hasGutter>
-        {validationAlert ? (
-          <StackItem>
-            <Alert variant="danger" isInline title={t('catalogProvision.validation.stepInvalid')} />
-          </StackItem>
-        ) : null}
-        {provisionError ? (
-          <StackItem>
-            <Alert variant="danger" isInline title={t('catalogProvision.errors.provisionTitle')}>
-              {provisionError}
-            </Alert>
-          </StackItem>
-        ) : null}
-        {stepId === 'catalog' ? <CatalogStep adapter={adapter} /> : null}
-        {stepId === 'general' ? <GeneralStepComponent catalogItem={catalogItem} /> : null}
-        {stepId === 'configuration' ? <ConfigurationStep catalogItem={catalogItem} /> : null}
-        {stepId === 'networking' ? <NetworkingStep catalogItem={catalogItem} /> : null}
-        {stepId === 'review' ? (
-          <ReviewStep adapter={adapter} catalogItem={catalogItem} values={values} />
-        ) : null}
-      </Stack>
-    </FieldValidationProvider>
-  );
-};
-
-interface InnerProps extends Props {
-  adapter: ErasedCatalogAdapter;
-  initialValues: CatalogProvisionWizardValues;
-}
-
-const CatalogProvisionWizardInner = ({
-  adapter,
-  initialCatalogItemId,
-  initialValues,
-  onProvision,
-  onClosed,
-  onCloseHandlerChange,
-}: InnerProps) => {
-  const { t } = useTranslation();
-  const orderedSteps = useMemo(() => getWizardOrderedSteps(adapter.kind), [adapter.kind]);
-  const [wizardResetKey, setWizardResetKey] = useState(0);
-  const [activeStepId, setActiveStepId] = useState<WizardStepId>('catalog');
-  const [schemaCatalogItemId, setSchemaCatalogItemId] = useState(initialValues.catalogItemId);
-  const [provisionError, setProvisionError] = useState<string | undefined>();
-  const [validationAlert, setValidationAlert] = useState(false);
-  const [pending, setPending] = useState(false);
-  const [showCancelConfirm, setShowCancelConfirm] = useState(false);
-  const { data: catalogItems = [] } = adapter.useCatalogItems();
-
-  useEffect(() => {
-    setActiveStepId('catalog');
-  }, [wizardResetKey]);
-
-  const selectedCatalogItem: CatalogItem | null = schemaCatalogItemId
-    ? (catalogItems.find((item) => item.id === schemaCatalogItemId) ?? null)
-    : null;
-
-  // Swapped when the wizard step changes (see footer useLayoutEffect). Step-scoped
-  // so validateOnBlur and Next's validateForm() never validate fields from other steps.
-  const validationSchema = useMemo(
-    () => adapter.getStepValidationSchema(selectedCatalogItem, activeStepId),
-    [adapter, activeStepId, selectedCatalogItem],
-  );
-
-  const formik = useFormik<CatalogProvisionWizardValues>({
-    initialValues,
-    validationSchema,
-    validateOnBlur: true,
-    validateOnChange: false,
-    onSubmit: () => undefined,
-  });
-
-  useEffect(() => {
-    setSchemaCatalogItemId(formik.values.catalogItemId);
-  }, [formik.values.catalogItemId]);
-
-  const resetLocal = useCallback(() => {
-    setProvisionError(undefined);
-    setValidationAlert(false);
-    setShowCancelConfirm(false);
-    setWizardResetKey((key) => key + 1);
-  }, []);
-
-  const close = useCallback(
-    (options?: { notifyClosed?: boolean }) => {
-      resetLocal();
-      if (options?.notifyClosed !== false) {
-        onClosed?.();
-      }
-    },
-    [onClosed, resetLocal],
-  );
-
-  return (
-    <FormikProvider value={formik}>
-      <CatalogProvisionWizardForm
-        adapter={adapter}
-        formik={formik}
-        initialCatalogItemId={initialCatalogItemId}
-        orderedSteps={orderedSteps}
-        wizardResetKey={wizardResetKey}
-        setActiveStepId={setActiveStepId}
-        provisionError={provisionError}
-        setProvisionError={setProvisionError}
-        validationAlert={validationAlert}
-        setValidationAlert={setValidationAlert}
-        pending={pending}
-        setPending={setPending}
-        showCancelConfirm={showCancelConfirm}
-        setShowCancelConfirm={setShowCancelConfirm}
-        onProvision={onProvision}
-        close={close}
-        onCloseHandlerChange={onCloseHandlerChange}
-        t={t}
-      />
-    </FormikProvider>
-  );
-};
-
-interface FormProps {
-  adapter: ErasedCatalogAdapter;
-  formik: FormikProps<CatalogProvisionWizardValues>;
-  initialCatalogItemId?: string;
-  orderedSteps: readonly WizardStepId[];
-  wizardResetKey: number;
-  setActiveStepId: (stepId: WizardStepId) => void;
-  provisionError?: string;
-  setProvisionError: (message: string | undefined) => void;
-  validationAlert: boolean;
-  setValidationAlert: (visible: boolean) => void;
-  pending: boolean;
-  setPending: (pending: boolean) => void;
-  showCancelConfirm: boolean;
-  setShowCancelConfirm: (visible: boolean) => void;
-  onProvision: Props['onProvision'];
-  close: (options?: { notifyClosed?: boolean }) => void;
-  onCloseHandlerChange?: Props['onCloseHandlerChange'];
-  t: ReturnType<typeof useTranslation>['t'];
-}
-
-const CatalogProvisionWizardForm = ({
-  adapter,
-  formik,
-  initialCatalogItemId,
-  orderedSteps,
-  wizardResetKey,
-  setActiveStepId,
-  provisionError,
-  setProvisionError,
-  validationAlert,
-  setValidationAlert,
-  pending,
-  setPending,
-  showCancelConfirm,
-  setShowCancelConfirm,
-  onProvision,
-  close,
-  onCloseHandlerChange,
-  t,
-}: FormProps) => {
-  const { data: catalogItems = [] } = adapter.useCatalogItems();
-  const selectedCatalogItem: CatalogItem | null = formik.values.catalogItemId
-    ? (catalogItems.find((item) => item.id === formik.values.catalogItemId) ?? null)
-    : null;
-
-  const requestClose = useCallback(() => {
-    if (pending) {
-      return;
-    }
-    if (hasWizardUnsavedProgress(formik.values)) {
-      setShowCancelConfirm(true);
-      return;
-    }
-    close();
-  }, [close, formik.values, pending, setShowCancelConfirm]);
-
-  useEffect(() => {
-    onCloseHandlerChange?.({ requestClose, pending });
-  }, [onCloseHandlerChange, pending, requestClose]);
-
-  const handleStepChange = useCallback(() => {
-    setProvisionError(undefined);
-    setValidationAlert(false);
-  }, [setProvisionError, setValidationAlert]);
-
-  useEffect(() => {
-    const onKeyDown = (event: KeyboardEvent) => {
-      if (event.key === 'Escape' && !pending && !showCancelConfirm) {
-        requestClose();
-      }
-    };
-    document.addEventListener('keydown', onKeyDown);
-    return () => {
-      document.removeEventListener('keydown', onKeyDown);
-    };
-  }, [pending, requestClose, showCancelConfirm]);
-
-  const deepLinkInitializedRef = useRef(false);
-
-  // Deep-link create (/vms/create/:catalogItemId): apply catalog defaults once the item loads.
-  useEffect(() => {
-    if (deepLinkInitializedRef.current || !initialCatalogItemId) {
-      return;
-    }
-    const item = catalogItems.find((entry) => entry.id === initialCatalogItemId);
-    if (!item) {
-      return;
-    }
-    deepLinkInitializedRef.current = true;
-    void adapter.onCatalogItemSelected?.(item, formik);
-  }, [adapter, catalogItems, formik, initialCatalogItemId]);
-
-  return (
-    <>
-      {showCancelConfirm ? (
-        <Modal
-          variant="small"
-          isOpen
-          onClose={() => setShowCancelConfirm(false)}
-          aria-labelledby="catalog-provision-wizard-cancel-title"
-        >
-          <ModalHeader
-            title={t('catalogProvision.cancel.title')}
-            titleIconVariant="warning"
-            labelId="catalog-provision-wizard-cancel-title"
-          />
-          <ModalBody>{t('catalogProvision.cancel.body')}</ModalBody>
-          <ModalFooter>
-            <Button variant="link" onClick={() => setShowCancelConfirm(false)}>
-              {t('catalogProvision.cancel.keepEditing')}
-            </Button>
-            <Button variant="primary" onClick={() => close()}>
-              {t('catalogProvision.cancel.discard')}
-            </Button>
-          </ModalFooter>
-        </Modal>
-      ) : null}
-      <PageSection
-        hasBodyWrapper={false}
-        type={PageSectionTypes.wizard}
-        aria-label={t(adapter.ariaLabelKey)}
-      >
-        <Wizard
-          key={wizardResetKey}
-          navAriaLabel={t('catalogProvision.wizard.navAria', {
-            title: t(adapter.wizardTitleKey),
-          })}
-          isVisitRequired
-          onStepChange={handleStepChange}
-          footer={
-            <WizardFooterWrapper>
-              <CatalogProvisionWizardFooter
-                formik={formik}
-                catalogItem={selectedCatalogItem}
-                setActiveStepId={setActiveStepId}
-                setProvisionError={setProvisionError}
-                setValidationAlert={setValidationAlert}
-                pending={pending}
-                setPending={setPending}
-                onProvision={onProvision}
-                buildCreatePayload={adapter.buildCreatePayload}
-                close={close}
-                requestClose={requestClose}
-              />
-            </WizardFooterWrapper>
-          }
-        >
-          {orderedSteps.map((stepId) => (
-            <WizardStep key={stepId} id={stepId} name={t(STEP_LABEL_KEYS[stepId])}>
-              <WizardStepBody
-                adapter={adapter}
-                stepId={stepId}
-                catalogItem={selectedCatalogItem}
-                values={formik.values}
-                provisionError={provisionError}
-                validationAlert={validationAlert}
-              />
-            </WizardStep>
-          ))}
-        </Wizard>
-      </PageSection>
-    </>
-  );
-};
-
-export const CatalogProvisionWizard = ({
-  kind,
-  initialCatalogItemId,
-  onProvision,
-  onClosed,
-  onCloseHandlerChange,
-}: Props) => {
-  const vmAdapter = useComputeInstanceAdapter();
-  const clusterAdapter = useClusterAdapter();
-  const bmAdapter = useBareMetalInstanceAdapter();
-  const adapter = (
-    kind === 'cluster' ? clusterAdapter : kind === 'bare_metal_instance' ? bmAdapter : vmAdapter
-  ) as ErasedCatalogAdapter;
-  const initialValues = useMemo(() => {
-    const values = adapter.getInitialValues(null);
-    if (initialCatalogItemId) {
-      values.catalogItemId = initialCatalogItemId;
-    }
-    return values;
-  }, [adapter, initialCatalogItemId]);
-
-  return (
-    <CatalogProvisionWizardInner
-      kind={kind}
-      adapter={adapter}
-      initialCatalogItemId={initialCatalogItemId}
-      initialValues={initialValues}
-      onProvision={onProvision}
-      onClosed={onClosed}
-      onCloseHandlerChange={onCloseHandlerChange}
-    />
-  );
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/fields/NameField.tsx b/libs/ui-components/src/components/catalogProvision/NameField.tsx
similarity index 70%
rename from libs/ui-components/src/components/catalogProvision/wizard/fields/NameField.tsx
rename to libs/ui-components/src/components/catalogProvision/NameField.tsx
index e3da603c..ce44acdb 100644
--- a/libs/ui-components/src/components/catalogProvision/wizard/fields/NameField.tsx
+++ b/libs/ui-components/src/components/catalogProvision/NameField.tsx
@@ -1,5 +1,5 @@
-import { useTranslation } from '../../../../hooks/useTranslation';
-import { InputField } from '../../../Form/InputField';
+import { useTranslation } from '../../hooks/useTranslation';
+import { InputField } from '../Form/InputField';
 
 const NameField = () => {
   const { t } = useTranslation();
diff --git a/libs/ui-components/src/components/catalogProvision/SshKeyField.tsx b/libs/ui-components/src/components/catalogProvision/SshKeyField.tsx
new file mode 100644
index 00000000..4d80bf04
--- /dev/null
+++ b/libs/ui-components/src/components/catalogProvision/SshKeyField.tsx
@@ -0,0 +1,44 @@
+import { useField, useFormikContext } from 'formik';
+
+import { type FieldDefinition } from '@osac/types';
+
+import { isFieldEditable } from './utils';
+import { useTranslation } from '../../hooks/useTranslation';
+import { InputField } from '../Form/InputField';
+
+interface SshKeyFieldProps {
+  fieldDefinitions: FieldDefinition[];
+}
+
+const fieldName = 'spec.sshPublicKey';
+
+const SshKeyField = ({ fieldDefinitions }: SshKeyFieldProps) => {
+  const { t } = useTranslation();
+  const { setFieldValue } = useFormikContext();
+  const [field] = useField<string>(fieldName);
+
+  const handleBlur = () => {
+    const trimmed = (field.value ?? '').trim();
+    if (trimmed !== field.value) {
+      void setFieldValue(fieldName, trimmed);
+    }
+  };
+
+  return (
+    <InputField
+      name={fieldName}
+      label={t('SSH public key')}
+      fieldId={fieldName.replace(/\./g, '-')}
+      isDisabled={!isFieldEditable('ssh_public_key', fieldDefinitions)}
+      multiline
+      rows={9}
+      resizeOrientation="vertical"
+      helperText={t(
+        'Paste a public SSH key for remote access. Supported types: ssh-rsa, ssh-ed25519, and ecdsa-sha2-nistp256/384/521.',
+      )}
+      onBlur={handleBlur}
+    />
+  );
+};
+
+export default SshKeyField;
diff --git a/libs/ui-components/src/components/catalogProvision/UserDataField.tsx b/libs/ui-components/src/components/catalogProvision/UserDataField.tsx
new file mode 100644
index 00000000..bd219945
--- /dev/null
+++ b/libs/ui-components/src/components/catalogProvision/UserDataField.tsx
@@ -0,0 +1,28 @@
+import { type FieldDefinition } from '@osac/types';
+import { InputField } from '@osac/ui-components/components/Form/InputField';
+import { useTranslation } from '@osac/ui-components/hooks/useTranslation';
+
+import { isFieldEditable } from './utils';
+
+type UserDataFieldProps = {
+  fieldDefinitions: FieldDefinition[];
+};
+
+const UserDataField = ({ fieldDefinitions }: UserDataFieldProps) => {
+  const { t } = useTranslation();
+
+  return (
+    <InputField
+      name={'spec.userData'}
+      label={t('User data')}
+      fieldId="bm-user-data"
+      multiline
+      rows={9}
+      resizeOrientation="vertical"
+      helperText={t('Optional cloud-init user data (max 64 KB).')}
+      isDisabled={!isFieldEditable('user_data', fieldDefinitions)}
+    />
+  );
+};
+
+export default UserDataField;
diff --git a/libs/ui-components/src/components/catalogProvision/catalogFieldDefinition.ts b/libs/ui-components/src/components/catalogProvision/catalogFieldDefinition.ts
deleted file mode 100644
index 1dbb7524..00000000
--- a/libs/ui-components/src/components/catalogProvision/catalogFieldDefinition.ts
+++ /dev/null
@@ -1,320 +0,0 @@
-/**
- * Catalog item field_definitions — parse defaults, validate against JSON Schema subset, apply to spec paths.
- */
-
-import { protobufValueToPlain } from './protobuf-value';
-
-export type CatalogProvisionKind = 'compute_instance' | 'cluster' | 'bare_metal_instance';
-
-export interface CatalogFieldDefinition {
-  path: string;
-  displayName: string;
-  editable: boolean;
-  default?: unknown;
-  validationSchema?: Record<string, unknown>;
-}
-
-const asRecord = (v: unknown): Record<string, unknown> | undefined => {
-  return v && typeof v === 'object' && !Array.isArray(v)
-    ? (v as Record<string, unknown>)
-    : undefined;
-};
-
-const unknownToString = (value: unknown): string => {
-  if (value == null) {
-    return '';
-  }
-  if (typeof value === 'string') {
-    return value;
-  }
-  if (typeof value === 'number' || typeof value === 'boolean') {
-    return String(value);
-  }
-  return '';
-};
-
-/** Parse google.protobuf.Value default (wire JSON or post-decode protobuf message). */
-export const parseFieldDefinitionDefault = (raw: unknown): unknown => {
-  if (raw == null) {
-    return undefined;
-  }
-  if (typeof raw === 'string' || typeof raw === 'number' || typeof raw === 'boolean') {
-    return raw;
-  }
-  if (Array.isArray(raw)) {
-    return raw;
-  }
-  const r = asRecord(raw);
-  if (!r) {
-    return undefined;
-  }
-  const decodedKind = asRecord(r.kind);
-  const hasDecodedDiscriminator =
-    typeof decodedKind?.case === 'string' && decodedKind.case.length > 0;
-  const hasWireDiscriminator =
-    'null_value' in r ||
-    'number_value' in r ||
-    'string_value' in r ||
-    'bool_value' in r ||
-    'list_value' in r ||
-    'struct_value' in r;
-  if (!hasDecodedDiscriminator && !hasWireDiscriminator) {
-    return raw;
-  }
-  const plain = protobufValueToPlain(raw);
-  return plain === undefined ? undefined : plain;
-};
-
-const parseValidationSchema = (raw: unknown): Record<string, unknown> | undefined => {
-  if (typeof raw === 'string' && raw.trim()) {
-    try {
-      const parsed = JSON.parse(raw) as unknown;
-      return asRecord(parsed);
-    } catch {
-      return undefined;
-    }
-  }
-  return asRecord(raw);
-};
-
-export const normalizeCatalogFieldDefinition = (raw: unknown): CatalogFieldDefinition | null => {
-  const r = asRecord(raw);
-  if (!r) {
-    return null;
-  }
-  const path = unknownToString(r.path ?? r.Path).trim();
-  if (!path) {
-    return null;
-  }
-  const displayName = unknownToString(
-    r.display_name ?? r.displayName ?? r.DisplayName ?? path,
-  ).trim();
-  const editable = typeof r.editable === 'boolean' ? r.editable : true;
-  const defaultRaw = r.default ?? r.Default;
-  const defaultValue =
-    defaultRaw !== undefined && defaultRaw !== null
-      ? parseFieldDefinitionDefault(defaultRaw)
-      : undefined;
-  const validationSchema = parseValidationSchema(r.validation_schema ?? r.validationSchema);
-
-  return {
-    path,
-    displayName: displayName || path,
-    editable,
-    ...(defaultValue !== undefined ? { default: defaultValue } : {}),
-    ...(validationSchema ? { validationSchema } : {}),
-  };
-};
-
-export const normalizeCatalogFieldDefinitions = (raw: unknown): CatalogFieldDefinition[] => {
-  if (!Array.isArray(raw)) {
-    return [];
-  }
-  return raw
-    .map(normalizeCatalogFieldDefinition)
-    .filter((x): x is CatalogFieldDefinition => Boolean(x));
-};
-
-export const readCatalogItemFieldDefinitions = (item: unknown): readonly unknown[] | undefined => {
-  if (!item || typeof item !== 'object') {
-    return undefined;
-  }
-  const raw =
-    (item as Record<string, unknown>).field_definitions ??
-    (item as Record<string, unknown>).fieldDefinitions;
-  return Array.isArray(raw) ? raw : undefined;
-};
-
-export const coerceCatalogFieldDefinitions = (
-  definitions: readonly unknown[] | undefined,
-): CatalogFieldDefinition[] => {
-  if (!definitions?.length) {
-    return [];
-  }
-  return definitions
-    .map((raw) => normalizeCatalogFieldDefinition(raw))
-    .filter((x): x is CatalogFieldDefinition => Boolean(x));
-};
-
-/** Normalized field_definitions from wire or test catalog item JSON. */
-export const catalogItemFieldDefinitions = (item: unknown): CatalogFieldDefinition[] => {
-  return coerceCatalogFieldDefinitions(readCatalogItemFieldDefinitions(item));
-};
-
-/** Spec paths shown on catalog cards as compute resources (CPU, memory, boot disk). */
-export const CATALOG_ITEM_RESOURCE_FIELD_PATHS = [
-  'cores',
-  'memory_gib',
-  'boot_disk.size_gib',
-] as const;
-
-export type CatalogItemResourceFieldPath = (typeof CATALOG_ITEM_RESOURCE_FIELD_PATHS)[number];
-
-const catalogItemResourceFieldPathSet = new Set<string>(CATALOG_ITEM_RESOURCE_FIELD_PATHS);
-
-export const isCatalogItemResourceFieldPath = (
-  path: string,
-): path is CatalogItemResourceFieldPath => {
-  return catalogItemResourceFieldPathSet.has(path);
-};
-
-/** Node-set host type and worker count paths on cluster catalog cards (node set id varies). */
-export const CLUSTER_CATALOG_ITEM_RESOURCE_FIELD_PATH_PATTERN =
-  /^node_sets\.[^.]+\.(host_type|size)$/;
-
-export const isClusterCatalogItemResourceFieldPath = (path: string): boolean => {
-  return CLUSTER_CATALOG_ITEM_RESOURCE_FIELD_PATH_PATTERN.test(path);
-};
-
-export const isCatalogCardResourceFieldPath = (path: string): boolean => {
-  return isCatalogItemResourceFieldPath(path) || isClusterCatalogItemResourceFieldPath(path);
-};
-
-export const fieldDefinitionDefaultToInputString = (value: unknown): string => {
-  if (value == null) {
-    return '';
-  }
-  if (typeof value === 'string') {
-    return value;
-  }
-  if (typeof value === 'number' || typeof value === 'boolean') {
-    return String(value);
-  }
-  if (Array.isArray(value)) {
-    return value.map((v) => String(v)).join(', ');
-  }
-  return '';
-};
-
-export interface FieldValidationContext {
-  displayName?: string;
-}
-
-const fieldLabel = (context?: FieldValidationContext): string => {
-  const label = context?.displayName?.trim();
-  return label || 'This field';
-};
-
-/** Compile JSON Schema `pattern` (ECMAScript regex) for client-side validation. */
-export const compileJsonSchemaPattern = (pattern: unknown): RegExp | undefined => {
-  if (typeof pattern !== 'string' || !pattern.trim()) {
-    return undefined;
-  }
-  try {
-    return new RegExp(pattern);
-  } catch {
-    return undefined;
-  }
-};
-
-export const jsonSchemaPatternErrorMessage = (label: string, pattern: string): string =>
-  `${label} must match pattern: ${pattern}`;
-
-export const matchesJsonSchemaPattern = (
-  value: string,
-  schema: Record<string, unknown>,
-): boolean => {
-  const regex = compileJsonSchemaPattern(schema.pattern);
-  if (!regex) {
-    return true;
-  }
-  return regex.test(value);
-};
-
-export const validateValueAgainstJsonSchema = (
-  value: unknown,
-  schema: Record<string, unknown> | undefined,
-  context?: FieldValidationContext,
-): string | null => {
-  if (!schema || !Object.keys(schema).length) {
-    return null;
-  }
-
-  const label = fieldLabel(context);
-  const type = schema.type;
-  if (type === 'integer' || type === 'number') {
-    const n = typeof value === 'number' ? value : Number(String(value).trim());
-    const min = typeof schema.minimum === 'number' ? schema.minimum : undefined;
-    const max = typeof schema.maximum === 'number' ? schema.maximum : undefined;
-    const hasMin = min !== undefined;
-    const hasMax = max !== undefined;
-
-    if (!Number.isFinite(n)) {
-      return `${label} must be a valid number.`;
-    }
-    if (type === 'integer' && !Number.isInteger(n)) {
-      return `${label} must be a whole number.`;
-    }
-    if (hasMin && hasMax) {
-      if (n < min) {
-        return `${label} must be between ${min} and ${max}. The value you entered is too low.`;
-      }
-      if (n > max) {
-        return `${label} must be between ${min} and ${max}. The value you entered is too high.`;
-      }
-      return null;
-    }
-    if (hasMin && n < min) {
-      return `${label} must be ${min} or greater.`;
-    }
-    if (hasMax && n > max) {
-      return `${label} must be ${max} or less.`;
-    }
-    return null;
-  }
-
-  if (type === 'string') {
-    const s = typeof value === 'string' ? value : unknownToString(value);
-    const minLen = typeof schema.minLength === 'number' ? schema.minLength : undefined;
-    const maxLen = typeof schema.maxLength === 'number' ? schema.maxLength : undefined;
-    const hasMin = minLen !== undefined;
-    const hasMax = maxLen !== undefined;
-
-    if (hasMin && hasMax) {
-      if (s.length < minLen) {
-        return `${label} must be between ${minLen} and ${maxLen} characters. The value you entered is too short.`;
-      }
-      if (s.length > maxLen) {
-        return `${label} must be between ${minLen} and ${maxLen} characters. The value you entered is too long.`;
-      }
-      return null;
-    }
-    if (hasMin && s.length < minLen) {
-      return `${label} must be at least ${minLen} characters long.`;
-    }
-    if (hasMax && s.length > maxLen) {
-      return `${label} must be no more than ${maxLen} characters long.`;
-    }
-    if (!matchesJsonSchemaPattern(s, schema)) {
-      const pattern = typeof schema.pattern === 'string' ? schema.pattern : '';
-      return jsonSchemaPatternErrorMessage(label, pattern);
-    }
-    return null;
-  }
-
-  if (type === 'boolean') {
-    if (typeof value !== 'boolean' && value !== 'true' && value !== 'false') {
-      return `${label} must be true or false.`;
-    }
-    return null;
-  }
-
-  const enumValues = schema.enum;
-  if (Array.isArray(enumValues) && enumValues.length > 0) {
-    const s = typeof value === 'string' ? value : unknownToString(value);
-    if (!enumValues.some((entry) => String(entry) === s)) {
-      return `${label} must be one of: ${enumValues.map(String).join(', ')}.`;
-    }
-    return null;
-  }
-
-  return null;
-};
-
-export const resolvedFieldDefault = (def: CatalogFieldDefinition): unknown => {
-  if (def.default === undefined) {
-    return undefined;
-  }
-  const parsed = parseFieldDefinitionDefault(def.default);
-  return parsed !== undefined ? parsed : def.default;
-};
diff --git a/libs/ui-components/src/components/catalogProvision/catalogProvisionTypes.ts b/libs/ui-components/src/components/catalogProvision/catalogProvisionTypes.ts
deleted file mode 100644
index 74648725..00000000
--- a/libs/ui-components/src/components/catalogProvision/catalogProvisionTypes.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { type MessageInitShape } from '@bufbuild/protobuf';
-
-import { BareMetalInstanceSchema, ClusterSchema, ComputeInstanceSchema } from '@osac/types';
-
-import { BareMetalInstanceWizardValues } from './wizard/adapters/bareMetalInstance/fields';
-import type { ClusterWizardValues } from './wizard/adapters/cluster/fields';
-import type { ComputeInstanceWizardValues } from './wizard/adapters/computeInstance/fields';
-
-export type CatalogProvisionPayload =
-  | MessageInitShape<typeof ComputeInstanceSchema>
-  | MessageInitShape<typeof ClusterSchema>
-  | MessageInitShape<typeof BareMetalInstanceSchema>;
-
-export type CatalogProvisionWizardValues =
-  | ComputeInstanceWizardValues
-  | ClusterWizardValues
-  | BareMetalInstanceWizardValues;
diff --git a/libs/ui-components/src/components/catalogProvision/protobuf-value.ts b/libs/ui-components/src/components/catalogProvision/protobuf-value.ts
deleted file mode 100644
index 760246dd..00000000
--- a/libs/ui-components/src/components/catalogProvision/protobuf-value.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-const asRecord = (value: unknown): Record<string, unknown> | undefined => {
-  return value && typeof value === 'object' && !Array.isArray(value)
-    ? (value as Record<string, unknown>)
-    : undefined;
-};
-
-const isDecodedProtobufValue = (value: unknown): boolean => {
-  const kind = asRecord(value)?.kind;
-  if (!kind || typeof kind !== 'object') {
-    return false;
-  }
-  const caseName = (kind as { case?: unknown }).case;
-  return typeof caseName === 'string' && caseName.length > 0;
-};
-
-const parseKindProtobufValue = (value: unknown): unknown => {
-  const kind = asRecord(value)?.kind;
-  if (!kind || typeof kind !== 'object') {
-    return undefined;
-  }
-  const caseName = (kind as { case?: unknown }).case;
-  const caseValue = (kind as { value?: unknown }).value;
-
-  switch (caseName) {
-    case 'nullValue':
-      return null;
-    case 'numberValue':
-      return caseValue;
-    case 'stringValue':
-      return caseValue;
-    case 'boolValue':
-      return caseValue;
-    case 'listValue': {
-      const values = asRecord(caseValue)?.values;
-      if (!Array.isArray(values)) {
-        return undefined;
-      }
-      return values.map(parseProtobufValueToPlain).filter((entry) => entry !== undefined);
-    }
-    case 'structValue': {
-      const fields = asRecord(caseValue)?.fields;
-      if (!fields || typeof fields !== 'object') {
-        return undefined;
-      }
-      const out: Record<string, unknown> = {};
-      for (const [key, fieldValue] of Object.entries(fields)) {
-        const parsed = parseProtobufValueToPlain(fieldValue);
-        if (parsed !== undefined) {
-          out[key] = parsed;
-        }
-      }
-      return Object.keys(out).length ? out : undefined;
-    }
-    default:
-      return undefined;
-  }
-};
-
-const parseWireProtobufValue = (raw: unknown): unknown => {
-  if (raw === undefined) {
-    return undefined;
-  }
-  if (raw === null) {
-    return null;
-  }
-  if (typeof raw === 'string' || typeof raw === 'number' || typeof raw === 'boolean') {
-    return raw;
-  }
-  const record = asRecord(raw);
-  if (!record) {
-    return undefined;
-  }
-  if ('null_value' in record) {
-    return null;
-  }
-  if ('number_value' in record && typeof record.number_value === 'number') {
-    return record.number_value;
-  }
-  if ('string_value' in record && typeof record.string_value === 'string') {
-    return record.string_value;
-  }
-  if ('bool_value' in record && typeof record.bool_value === 'boolean') {
-    return record.bool_value;
-  }
-  if ('list_value' in record) {
-    const list = asRecord(record.list_value);
-    const values = list?.values;
-    if (Array.isArray(values)) {
-      return values.map(parseProtobufValueToPlain).filter((entry) => entry !== undefined);
-    }
-  }
-  if ('struct_value' in record) {
-    const struct = asRecord(record.struct_value);
-    const fields = struct?.fields;
-    if (fields && typeof fields === 'object') {
-      const out: Record<string, unknown> = {};
-      for (const [key, fieldValue] of Object.entries(fields)) {
-        const parsed = parseProtobufValueToPlain(fieldValue);
-        if (parsed !== undefined) {
-          out[key] = parsed;
-        }
-      }
-      return Object.keys(out).length ? out : undefined;
-    }
-  }
-  return undefined;
-};
-
-/**
- * Converts a decoded `google.protobuf.Value` (or wire JSON Value) to plain JSON
- * for catalog field defaults at read time — does not mutate API responses.
- */
-const parseProtobufValueToPlain = (value: unknown): unknown => {
-  if (value === undefined) {
-    return undefined;
-  }
-  if (value === null) {
-    return null;
-  }
-  if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
-    return value;
-  }
-  if (isDecodedProtobufValue(value)) {
-    return parseKindProtobufValue(value);
-  }
-  return parseWireProtobufValue(value);
-};
-
-export const protobufValueToPlain = (value: unknown): unknown => parseProtobufValueToPlain(value);
diff --git a/libs/ui-components/src/components/catalogProvision/shared/CatalogStepContent.tsx b/libs/ui-components/src/components/catalogProvision/shared/CatalogStepContent.tsx
new file mode 100644
index 00000000..66d637e3
--- /dev/null
+++ b/libs/ui-components/src/components/catalogProvision/shared/CatalogStepContent.tsx
@@ -0,0 +1,116 @@
+import { useMemo, useState } from 'react';
+import {
+  Alert,
+  Button,
+  Content,
+  Flex,
+  FlexItem,
+  Gallery,
+  GalleryItem,
+  SearchInput,
+  Stack,
+  StackItem,
+} from '@patternfly/react-core';
+import { useField } from 'formik';
+
+import { useTranslation } from '../../../hooks/useTranslation';
+import CatalogItemCard from '../../catalog/CatalogItemCard';
+import type { CatalogItem } from '../../catalog/catalogItemDisplay';
+import { filterCatalogItemsBySearch } from '../../catalog/catalogItemDisplay';
+
+interface CatalogStepContentProps<TItem extends CatalogItem> {
+  catalogItems: TItem[];
+  error: unknown;
+  onRefetch: () => void;
+  onSelect: (item: TItem) => void;
+}
+
+export const CatalogStepContent = <TItem extends CatalogItem>({
+  catalogItems,
+  error,
+  onRefetch,
+  onSelect,
+}: CatalogStepContentProps<TItem>) => {
+  const [{ value }] = useField<TItem>('catalogItem');
+  const { t } = useTranslation();
+  const [search, setSearch] = useState('');
+
+  const filtered = useMemo(
+    () => filterCatalogItemsBySearch(catalogItems, search),
+    [catalogItems, search],
+  );
+
+  const count = filtered.length;
+
+  return (
+    <Stack hasGutter>
+      <StackItem>
+        <Flex
+          direction={{ default: 'column', md: 'row' }}
+          flexWrap={{ default: 'wrap' }}
+          alignItems={{ default: 'alignItemsFlexEnd' }}
+          gap={{ default: 'gapMd' }}
+        >
+          <FlexItem flex={{ default: 'flex_1' }}>
+            <SearchInput
+              placeholder={t('Search catalog items…')}
+              value={search}
+              onChange={(_event, value) => setSearch(value)}
+              onClear={() => setSearch('')}
+              aria-label={t('Search catalog items')}
+            />
+          </FlexItem>
+        </Flex>
+      </StackItem>
+      {!!error && (
+        <StackItem>
+          <Stack hasGutter>
+            <StackItem>
+              <Alert variant="danger" title={t('Could not load catalog items')}>
+                {t('Unable to load catalog items right now. Please try again.')}
+              </Alert>
+            </StackItem>
+            <StackItem>
+              <Button variant="primary" onClick={onRefetch}>
+                {t('Retry')}
+              </Button>
+            </StackItem>
+          </Stack>
+        </StackItem>
+      )}
+      <StackItem>
+        <Gallery
+          hasGutter
+          minWidths={{ default: '200px' }}
+          role="radiogroup"
+          aria-label={t('Catalog item')}
+        >
+          {!error && count === 0 ? (
+            <GalleryItem>
+              <Content component="p">
+                {t('No catalog items match your search. Try changing keywords.')}
+              </Content>
+            </GalleryItem>
+          ) : null}
+          {!error &&
+            filtered.map((item) => {
+              const selected = value?.id === item.id;
+              return (
+                <GalleryItem key={item.id}>
+                  <CatalogItemCard
+                    item={item}
+                    ouiaId={`catalog-item-option-${item.id}`}
+                    selection={{
+                      selected,
+                      radioName: 'selectedCatalogItem',
+                      onSelect: () => onSelect(item),
+                    }}
+                  />
+                </GalleryItem>
+              );
+            })}
+        </Gallery>
+      </StackItem>
+    </Stack>
+  );
+};
diff --git a/libs/ui-components/src/components/catalogProvision/utils.ts b/libs/ui-components/src/components/catalogProvision/utils.ts
new file mode 100644
index 00000000..972cd0f5
--- /dev/null
+++ b/libs/ui-components/src/components/catalogProvision/utils.ts
@@ -0,0 +1,41 @@
+import type { FieldDefinition } from '@osac/types';
+
+export const getFieldDefinition = (path: string, fieldDefinitions: FieldDefinition[]) => {
+  return fieldDefinitions.find((fd) => fd.path === path);
+};
+
+export const getStringDefaultValue = (path: string, fieldDefinitions: FieldDefinition[]) => {
+  const defaultValue = getFieldDefinition(path, fieldDefinitions)?.default;
+  if (defaultValue?.kind.case !== 'stringValue') {
+    return undefined;
+  }
+
+  return defaultValue.kind.value;
+};
+
+export const getNumberDefaultValue = (path: string, fieldDefinitions: FieldDefinition[]) => {
+  const defaultValue = getFieldDefinition(path, fieldDefinitions)?.default;
+  if (defaultValue?.kind.case !== 'numberValue') {
+    return undefined;
+  }
+
+  return defaultValue.kind.value;
+};
+
+export const isFieldEditable = (path: string, fieldDefinitions: FieldDefinition[]): boolean => {
+  if (!path) {
+    return false;
+  }
+  const parts = path.split('.');
+  let editable = false;
+  for (let i = 1; i <= parts.length; i++) {
+    const fd = getFieldDefinition(parts.slice(0, i).join('.'), fieldDefinitions);
+    if (fd) {
+      if (fd.editable === false) {
+        return false;
+      }
+      editable = fd.editable === true;
+    }
+  }
+  return editable;
+};
diff --git a/libs/ui-components/src/components/catalogProvision/validation.ts b/libs/ui-components/src/components/catalogProvision/validation.ts
new file mode 100644
index 00000000..4ffa8fd8
--- /dev/null
+++ b/libs/ui-components/src/components/catalogProvision/validation.ts
@@ -0,0 +1,80 @@
+import Ajv, { type ValidateFunction } from 'ajv';
+import * as Yup from 'yup';
+
+import { type FieldDefinition } from '@osac/types';
+
+import { getFieldDefinition, isFieldEditable } from './utils';
+
+const ajv = new Ajv();
+const schemaCache = new Map<string, ValidateFunction>();
+
+const compileSchema = (schemaStr: string): ValidateFunction | undefined => {
+  let compiled = schemaCache.get(schemaStr);
+  if (compiled) {
+    return compiled;
+  }
+  try {
+    compiled = ajv.compile(JSON.parse(schemaStr) as Record<string, unknown>);
+    schemaCache.set(schemaStr, compiled);
+    return compiled;
+  } catch {
+    return undefined;
+  }
+};
+
+export const clearSchemaCache = () => {
+  schemaCache.clear();
+  ajv.removeSchema();
+};
+
+const getNestedValue = (obj: unknown, path: string): unknown => {
+  const parts = path.split('.');
+  let current: unknown = obj;
+  for (const part of parts) {
+    if (current === null || current === undefined || typeof current !== 'object') {
+      return undefined;
+    }
+    current = (current as Record<string, unknown>)[part];
+  }
+  return current;
+};
+
+const validateFieldDefinition = (
+  path: string,
+  snakeSpec: Record<string, unknown>,
+  fieldDefinitions: FieldDefinition[],
+  yupContext: Yup.TestContext,
+): true | Yup.ValidationError => {
+  const fd = getFieldDefinition(path, fieldDefinitions);
+  if (!fd?.editable || !fd.validationSchema) {
+    return true;
+  }
+
+  const validate = compileSchema(fd.validationSchema);
+  if (!validate) {
+    return true;
+  }
+  const value = getNestedValue(snakeSpec, path);
+
+  if (validate(value)) {
+    return true;
+  }
+
+  const firstError = validate.errors?.[0];
+  const message = firstError
+    ? `${firstError.instancePath || path} ${firstError.message}`
+    : 'Validation failed';
+
+  return yupContext.createError({ message });
+};
+
+export const buildFieldSchema = (snakeSpec: Record<string, unknown>, fds: FieldDefinition[]) => {
+  return (path: string, baseSchema: Yup.Schema = Yup.mixed()) => {
+    if (!isFieldEditable(path, fds)) {
+      return Yup.mixed();
+    }
+    return baseSchema.test(`fd-${path}`, '', function () {
+      return validateFieldDefinition(path, snakeSpec, fds, this);
+    });
+  };
+};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/bareMetalInstance/BareMetalConfigurationStep.tsx b/libs/ui-components/src/components/catalogProvision/wizard/adapters/bareMetalInstance/BareMetalConfigurationStep.tsx
deleted file mode 100644
index 2a9eb483..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/bareMetalInstance/BareMetalConfigurationStep.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import type { BareMetalInstanceCatalogItem } from '@osac/types';
-
-import OsacForm from '../../../../Form/OsacForm';
-import UserDataField from '../../fields/UserDataField';
-
-interface Props {
-  catalogItem: BareMetalInstanceCatalogItem | null;
-}
-
-const BareMetalConfigurationStep = ({ catalogItem }: Props) => {
-  return (
-    <OsacForm>
-      <UserDataField catalogItem={catalogItem} name="spec.userData" wirePath="spec.user_data" />
-    </OsacForm>
-  );
-};
-
-export default BareMetalConfigurationStep;
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/bareMetalInstance/BareMetalGeneralStep.tsx b/libs/ui-components/src/components/catalogProvision/wizard/adapters/bareMetalInstance/BareMetalGeneralStep.tsx
deleted file mode 100644
index 01822ec1..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/bareMetalInstance/BareMetalGeneralStep.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { BareMetalInstanceCatalogItem } from '@osac/types';
-
-import { BM_SSH_KEY_FORM_PATH, BM_SSH_KEY_WIRE_PATH } from './fields';
-import OsacForm from '../../../../Form/OsacForm';
-import NameField from '../../fields/NameField';
-import SshKeyField from '../../fields/SshKeyField';
-
-interface BareMetalGeneralStepProps {
-  catalogItem: BareMetalInstanceCatalogItem | null;
-}
-
-const BareMetalGeneralStep = ({ catalogItem }: BareMetalGeneralStepProps) => (
-  <OsacForm>
-    <NameField />
-    <SshKeyField
-      catalogItem={catalogItem}
-      wirePath={BM_SSH_KEY_WIRE_PATH}
-      name={BM_SSH_KEY_FORM_PATH}
-    />
-  </OsacForm>
-);
-
-export default BareMetalGeneralStep;
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/bareMetalInstance/fields.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/bareMetalInstance/fields.ts
deleted file mode 100644
index 8bc3afc5..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/bareMetalInstance/fields.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { FormikHelpers } from 'formik';
-import { TFunction } from 'i18next';
-
-import { BareMetalInstanceCatalogItem } from '@osac/types';
-
-import {
-  getCatalogFieldOverlay,
-  overlayDefaultToFormValue,
-  readCatalogFieldDefinitions,
-} from '../../catalogOverlay';
-
-export const BM_SSH_KEY_WIRE_PATH = 'spec.ssh_public_key';
-export const BM_SSH_KEY_FORM_PATH = 'spec.sshKey';
-
-export const BM_USER_DATA_WIRE_PATH = 'spec.user_data';
-export const BM_USER_DATA_FORM_PATH = 'spec.userData';
-
-export interface BareMetalInstanceWizardValues {
-  catalogItemId: string;
-  metadata: {
-    name: string;
-  };
-  spec: {
-    sshKey: string;
-    userData: string;
-  };
-}
-
-export const createEmptyBareMetalInstanceValues = (): BareMetalInstanceWizardValues => ({
-  catalogItemId: '',
-  metadata: { name: '' },
-  spec: {
-    sshKey: '',
-    userData: '',
-  },
-});
-
-export const applyBmCatalogDefaults = (
-  catalogItem: BareMetalInstanceCatalogItem,
-  helpers: FormikHelpers<BareMetalInstanceWizardValues>,
-  t: TFunction,
-): void => {
-  const definitions = readCatalogFieldDefinitions(catalogItem);
-
-  const sshKeyOverlay = getCatalogFieldOverlay(
-    BM_SSH_KEY_WIRE_PATH,
-    definitions,
-    t('SSH public key'),
-  );
-  const userDataOverlay = getCatalogFieldOverlay(
-    BM_USER_DATA_WIRE_PATH,
-    definitions,
-    t('User data'),
-  );
-
-  const sshDefault = overlayDefaultToFormValue(sshKeyOverlay);
-  if (sshDefault !== undefined) {
-    void helpers.setFieldValue(BM_SSH_KEY_FORM_PATH, sshDefault);
-  }
-
-  const userDataDefault = overlayDefaultToFormValue(userDataOverlay);
-  if (userDataDefault !== undefined) {
-    void helpers.setFieldValue(BM_USER_DATA_FORM_PATH, userDataDefault);
-  }
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/bareMetalInstance/payload.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/bareMetalInstance/payload.ts
deleted file mode 100644
index f3466a31..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/bareMetalInstance/payload.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { MessageInitShape } from '@bufbuild/protobuf';
-
-import { BareMetalInstanceRunStrategy, BareMetalInstanceSchema } from '@osac/types';
-
-import type { BareMetalInstanceWizardValues } from './fields';
-
-export const buildBareMetalInstanceCreatePayload = (
-  values: BareMetalInstanceWizardValues,
-): MessageInitShape<typeof BareMetalInstanceSchema> => {
-  const sshKey = values.spec.sshKey.trim();
-  const userData = values.spec.userData.trim();
-
-  const bmi = {
-    metadata: { name: values.metadata.name.trim() },
-    spec: {
-      catalogItem: values.catalogItemId,
-      runStrategy: BareMetalInstanceRunStrategy.ALWAYS,
-      ...(sshKey && { sshPublicKey: sshKey }),
-      ...(userData && { userData }),
-    },
-  };
-
-  return bmi;
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/bareMetalInstance/schemas.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/bareMetalInstance/schemas.ts
deleted file mode 100644
index e1b029e3..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/bareMetalInstance/schemas.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import type { TFunction } from 'i18next';
-import * as yup from 'yup';
-
-import { BareMetalInstanceCatalogItem } from '@osac/types';
-import { userDataSchema } from '@osac/ui-components/validation/user-data';
-
-import { BM_SSH_KEY_WIRE_PATH, BM_USER_DATA_WIRE_PATH } from './fields';
-import {
-  getCatalogFieldOverlay,
-  hasCatalogFieldDefinition,
-  mergeCatalogValidation,
-  readCatalogFieldDefinitions,
-} from '../../catalogOverlay';
-import { isValidSshPublicKey } from '../../fields/credentialValidation';
-import { buildMetadataNameSchema } from '../../metadataNameSchema';
-import type { WizardStepId } from '../../stepIds';
-
-const buildBareMetalInstanceFieldDefinitions = (
-  catalogItem: BareMetalInstanceCatalogItem | null,
-  t: TFunction,
-) => {
-  const definitions = readCatalogFieldDefinitions(catalogItem);
-
-  const sshKeyOverlay = getCatalogFieldOverlay(
-    BM_SSH_KEY_WIRE_PATH,
-    definitions,
-    t('SSH public key'),
-  );
-  const userDataOverlay = getCatalogFieldOverlay(
-    BM_USER_DATA_WIRE_PATH,
-    definitions,
-    t('User data'),
-  );
-
-  const sshKeyRequired = hasCatalogFieldDefinition(BM_SSH_KEY_WIRE_PATH, definitions);
-  const userDataRequired = hasCatalogFieldDefinition(BM_USER_DATA_WIRE_PATH, definitions);
-
-  return {
-    catalogItemId: yup.string().required(t('catalogProvision.validation.catalogItemRequired')),
-    metadataName: buildMetadataNameSchema(t),
-    specSshKey: mergeCatalogValidation(
-      yup
-        .string()
-        .test(
-          'ssh-public-key',
-          t(
-            'SSH public key must be in the form "[TYPE] key [[EMAIL]]". Supported types are ssh-rsa, ssh-ed25519, and ecdsa-sha2-nistp256/384/521.',
-          ),
-          (value) => isValidSshPublicKey(value),
-        ),
-      sshKeyOverlay,
-      sshKeyRequired,
-      t('Public SSH key is required'),
-    ),
-    specUserData: mergeCatalogValidation(
-      userDataSchema(t),
-      userDataOverlay,
-      userDataRequired,
-      t('User Data is required'),
-    ),
-  };
-};
-
-/**
- * Builds a Yup schema for one wizard step only.
- *
- * Formik always validates the full form values against `validationSchema`. If this
- * included every step's fields, blur and Next would fail on steps the user has not
- * reached yet. Returning only the active step's fields keeps validation scoped to
- * the current step.
- */
-export const buildBareMetalInstanceStepSchema = (
-  catalogItem: BareMetalInstanceCatalogItem | null,
-  stepId: WizardStepId,
-  t: TFunction,
-): yup.AnyObjectSchema | undefined => {
-  if (stepId === 'review') {
-    return undefined;
-  }
-
-  const fields = buildBareMetalInstanceFieldDefinitions(catalogItem, t);
-
-  switch (stepId) {
-    case 'catalog':
-      return yup.object({
-        catalogItemId: fields.catalogItemId,
-      });
-    case 'general':
-      return yup.object({
-        metadata: yup.object({
-          name: fields.metadataName,
-        }),
-        spec: yup.object({
-          sshKey: fields.specSshKey,
-        }),
-      });
-    case 'configuration':
-      return yup.object({
-        spec: yup.object({
-          userData: fields.specUserData,
-        }),
-      });
-    default:
-      return undefined;
-  }
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/bareMetalInstanceAdapter.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/bareMetalInstanceAdapter.ts
deleted file mode 100644
index b88fa6cf..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/bareMetalInstanceAdapter.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { useMemo } from 'react';
-import type { MessageInitShape } from '@bufbuild/protobuf';
-import type { TFunction } from 'i18next';
-
-import type { BareMetalInstanceCatalogItem } from '@osac/types';
-import { BareMetalInstanceSchema } from '@osac/types';
-
-import { useBareMetalInstanceCatalogItems } from '../../../../api/v1/baremetal-instance';
-import { useTranslation } from '../../../../hooks/useTranslation';
-import { type ReviewSection, formatReviewScalar, reviewRow } from '../catalogOverlay';
-import BareMetalConfigurationStep from './bareMetalInstance/BareMetalConfigurationStep';
-import BareMetalGeneralStep from './bareMetalInstance/BareMetalGeneralStep';
-import {
-  type BareMetalInstanceWizardValues,
-  applyBmCatalogDefaults,
-  createEmptyBareMetalInstanceValues,
-} from './bareMetalInstance/fields';
-import { buildBareMetalInstanceCreatePayload } from './bareMetalInstance/payload';
-import { buildBareMetalInstanceStepSchema } from './bareMetalInstance/schemas';
-import type { CatalogProvisionAdapter } from './types';
-
-const buildBmReviewSections = (
-  values: BareMetalInstanceWizardValues,
-  _catalogItem: BareMetalInstanceCatalogItem,
-  t: TFunction,
-): ReviewSection[] => [
-  {
-    title: t('General'),
-    rows: [
-      reviewRow(t('Name'), formatReviewScalar(values.metadata.name)),
-      reviewRow(t('SSH public key'), formatReviewScalar(values.spec.sshKey, true)),
-    ],
-  },
-  {
-    title: t('Configuration'),
-    rows: [reviewRow(t('User data'), formatReviewScalar(values.spec.userData, true))],
-  },
-];
-
-export const useBareMetalInstanceAdapter = (): CatalogProvisionAdapter<
-  BareMetalInstanceCatalogItem,
-  BareMetalInstanceWizardValues,
-  MessageInitShape<typeof BareMetalInstanceSchema>
-> => {
-  const { t } = useTranslation();
-
-  return useMemo(
-    () => ({
-      kind: 'bare_metal_instance',
-      useCatalogItems: () => {
-        const query = useBareMetalInstanceCatalogItems();
-        return {
-          data: query.data ?? [],
-          isPending: query.isPending,
-          isError: query.isError,
-          refetch: () => {
-            void query.refetch();
-          },
-        };
-      },
-      getInitialValues: (_catalogItem) => createEmptyBareMetalInstanceValues(),
-      buildCreatePayload: (values, _catalogItem) => buildBareMetalInstanceCreatePayload(values),
-      ConfigurationStep: BareMetalConfigurationStep,
-      GeneralStep: BareMetalGeneralStep,
-      NetworkingStep: () => null,
-      getStepValidationSchema: (catalogItem, stepId) =>
-        buildBareMetalInstanceStepSchema(catalogItem, stepId, t),
-      getReviewSections: (values, catalogItem) => buildBmReviewSections(values, catalogItem, t),
-      onCatalogItemSelected: (item, helpers) => {
-        helpers.resetForm({
-          values: {
-            ...createEmptyBareMetalInstanceValues(),
-            catalogItemId: item.id,
-          },
-        });
-        applyBmCatalogDefaults(item, helpers, t);
-      },
-      wizardTitleKey: t('Provision bare metal'),
-      wizardDescriptionKey: t('Provision a bare metal instance from a catalog item.'),
-      breadcrumbCreateLabelKey: t('Provision bare metal'),
-      ariaLabelKey: t('Bare metal provisioning wizard'),
-    }),
-    [t],
-  );
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/ClusterConfigurationStep.test.tsx b/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/ClusterConfigurationStep.test.tsx
deleted file mode 100644
index 0646d090..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/ClusterConfigurationStep.test.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import { fireEvent, screen, waitFor } from '@testing-library/react';
-import { Formik } from 'formik';
-import { describe, expect, it } from 'vitest';
-
-import type { ClusterCatalogItem } from '@osac/types';
-import { tIdentity } from '@osac/ui-components/test-utils/i18n';
-
-import ClusterConfigurationStep from './ClusterConfigurationStep';
-import { createEmptyNodeSetRow } from './fields';
-import { createEmptyClusterValues } from './payload';
-import { buildClusterStepSchema } from './schemas';
-import { renderWithProviders } from '../../../../../test-utils/TestProviders';
-import { FieldValidationProvider } from '../../../../Form/FieldValidationContext';
-
-const clusterCatalogItem: ClusterCatalogItem = {
-  $typeName: 'osac.public.v1.ClusterCatalogItem',
-  id: 'catalog-openshift-4',
-  metadata: {
-    $typeName: 'osac.public.v1.Metadata',
-    name: 'catalog-openshift-4',
-    annotations: {},
-    creator: 'foo',
-    labels: {},
-    project: 'foo',
-    tenant: 'foo',
-    version: 1,
-  },
-  title: 'OpenShift 4 cluster',
-  description: 'Standard OpenShift cluster offering',
-  template: 'tpl-openshift-4',
-  published: true,
-  fieldDefinitions: [
-    {
-      $typeName: 'osac.public.v1.FieldDefinition',
-      path: 'release_image',
-      displayName: 'Release image',
-      editable: true,
-      validationSchema: '',
-      default: {
-        $typeName: 'google.protobuf.Value',
-        kind: { case: 'stringValue', value: '4.17.0' },
-      },
-    },
-  ],
-};
-
-describe('ClusterConfigurationStep', () => {
-  it('starts with one node set and add action', async () => {
-    renderWithProviders(
-      <Formik initialValues={createEmptyClusterValues()} onSubmit={() => undefined}>
-        <ClusterConfigurationStep catalogItem={clusterCatalogItem} />
-      </Formik>,
-    );
-
-    await waitFor(() => {
-      expect(screen.getByText('Node set 1')).toBeInTheDocument();
-      expect(screen.getByText('Select host type')).toBeInTheDocument();
-      expect(screen.getByRole('spinbutton', { name: /^Nodes/ })).toBeInTheDocument();
-    });
-    expect(screen.queryByRole('button', { name: 'Remove node set' })).not.toBeInTheDocument();
-    expect(screen.getByRole('button', { name: 'Add node set' })).toBeInTheDocument();
-  });
-
-  it('adds another node set row when Add node set is clicked', async () => {
-    const { user } = renderWithProviders(
-      <Formik initialValues={createEmptyClusterValues()} onSubmit={() => undefined}>
-        <ClusterConfigurationStep catalogItem={clusterCatalogItem} />
-      </Formik>,
-    );
-
-    await user.click(screen.getByRole('button', { name: 'Add node set' }));
-
-    await waitFor(() => {
-      expect(screen.getByText('Node set 2')).toBeInTheDocument();
-      expect(screen.getByRole('button', { name: 'Remove node set' })).toBeInTheDocument();
-    });
-  });
-
-  it('shows pool size validation error when size is zero', async () => {
-    const row = createEmptyNodeSetRow();
-    renderWithProviders(
-      <FieldValidationProvider value>
-        <Formik
-          initialValues={{
-            ...createEmptyClusterValues(),
-            catalogItemId: clusterCatalogItem.id,
-            spec: {
-              ...createEmptyClusterValues().spec,
-              releaseImage: '4.17.0',
-              nodeSetRows: [
-                {
-                  ...row,
-                  hostType: { value: 'acme_1tb', label: 'ACME 1TB' },
-                  size: '3',
-                },
-              ],
-            },
-          }}
-          validationSchema={buildClusterStepSchema(clusterCatalogItem, 'configuration', tIdentity)}
-          validateOnBlur
-          onSubmit={() => undefined}
-        >
-          <ClusterConfigurationStep catalogItem={clusterCatalogItem} />
-        </Formik>
-      </FieldValidationProvider>,
-    );
-
-    await waitFor(() => {
-      expect(screen.getByRole('spinbutton')).toBeInTheDocument();
-    });
-
-    const sizeInput = screen.getByRole('spinbutton');
-    fireEvent.change(sizeInput, { target: { value: '0' } });
-    fireEvent.blur(sizeInput);
-
-    await waitFor(() => {
-      expect(screen.getByText('Pool size must be greater than zero')).toBeInTheDocument();
-    });
-  });
-});
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/ClusterConfigurationStep.tsx b/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/ClusterConfigurationStep.tsx
deleted file mode 100644
index 2de67b33..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/ClusterConfigurationStep.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { useMemo } from 'react';
-import { FormSection, Stack, StackItem } from '@patternfly/react-core';
-
-import type { ClusterCatalogItem } from '@osac/types';
-
-import ClusterNodeSetsArrayField from './ClusterNodeSetsArrayField';
-import { CLUSTER_RELEASE_IMAGE_WIRE_PATH } from './fields';
-import { useTranslation } from '../../../../../hooks/useTranslation';
-import { InputField } from '../../../../Form/InputField';
-import OsacForm from '../../../../Form/OsacForm';
-import { getCatalogFieldOverlay, readCatalogFieldDefinitions } from '../../catalogOverlay';
-
-interface Props {
-  catalogItem: ClusterCatalogItem | null;
-}
-
-const ClusterConfigurationStep = ({ catalogItem }: Props) => {
-  const { t } = useTranslation();
-
-  const definitions = useMemo(() => readCatalogFieldDefinitions(catalogItem), [catalogItem]);
-  const releaseImageOverlay = useMemo(
-    () => getCatalogFieldOverlay(CLUSTER_RELEASE_IMAGE_WIRE_PATH, definitions, t('Release image')),
-    [definitions, t],
-  );
-
-  if (!catalogItem) {
-    return null;
-  }
-
-  return (
-    <Stack hasGutter>
-      <StackItem>
-        <OsacForm>
-          <InputField
-            name="spec.releaseImage"
-            label={releaseImageOverlay.label}
-            fieldId="cluster-release-image"
-            isRequired
-            isDisabled={!releaseImageOverlay.editable}
-          />
-          <FormSection title={t('Node Sets')} titleElement="h2">
-            <ClusterNodeSetsArrayField />
-          </FormSection>
-        </OsacForm>
-      </StackItem>
-    </Stack>
-  );
-};
-
-export default ClusterConfigurationStep;
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/ClusterGeneralStep.tsx b/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/ClusterGeneralStep.tsx
deleted file mode 100644
index a8cd0a6d..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/ClusterGeneralStep.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import type { ClusterCatalogItem } from '@osac/types';
-
-import { CLUSTER_SSH_KEY_FORM_PATH, CLUSTER_SSH_KEY_WIRE_PATH } from './fields';
-import OsacForm from '../../../../Form/OsacForm';
-import NameField from '../../fields/NameField';
-import PullSecretField from '../../fields/PullSecretField';
-import SshKeyField from '../../fields/SshKeyField';
-
-interface ClusterGeneralStepProps {
-  catalogItem: ClusterCatalogItem | null;
-}
-
-const ClusterGeneralStep = ({ catalogItem }: ClusterGeneralStepProps) => (
-  <OsacForm>
-    <NameField />
-    <SshKeyField
-      catalogItem={catalogItem}
-      wirePath={CLUSTER_SSH_KEY_WIRE_PATH}
-      name={CLUSTER_SSH_KEY_FORM_PATH}
-    />
-    <PullSecretField catalogItem={catalogItem} />
-  </OsacForm>
-);
-
-export default ClusterGeneralStep;
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/ClusterNetworkingStep.test.tsx b/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/ClusterNetworkingStep.test.tsx
deleted file mode 100644
index 8ed91a7f..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/ClusterNetworkingStep.test.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { Formik } from 'formik';
-import { describe, expect, it } from 'vitest';
-
-import type { ClusterCatalogItem } from '@osac/types';
-
-import { ClusterNetworkingStep } from './ClusterNetworkingStep';
-import { createEmptyClusterValues } from './payload';
-import { renderWithProviders } from '../../../../../test-utils/TestProviders';
-
-const clusterCatalogItem: ClusterCatalogItem = {
-  $typeName: 'osac.public.v1.ClusterCatalogItem',
-  id: 'catalog-openshift-4',
-  metadata: {
-    $typeName: 'osac.public.v1.Metadata',
-    name: 'catalog-openshift-4',
-    annotations: {},
-    creator: 'foo',
-    labels: {},
-    project: 'foo',
-    tenant: 'foo',
-    version: 1,
-  },
-  title: 'OpenShift 4 cluster',
-  description: 'Standard OpenShift cluster offering',
-  template: 'tpl-openshift-4',
-  published: true,
-  fieldDefinitions: [
-    {
-      $typeName: 'osac.public.v1.FieldDefinition',
-      path: 'release_image',
-      displayName: 'Release image',
-      editable: true,
-      validationSchema: '',
-      default: {
-        $typeName: 'google.protobuf.Value',
-        kind: { case: 'stringValue', value: '4.17.0' },
-      },
-    },
-  ],
-};
-
-describe('ClusterNetworkingStep', () => {
-  it('renders optional pod and service CIDR fields', () => {
-    renderWithProviders(
-      <Formik initialValues={createEmptyClusterValues()} onSubmit={() => undefined}>
-        <ClusterNetworkingStep catalogItem={clusterCatalogItem} />
-      </Formik>,
-    );
-
-    expect(screen.getByLabelText(/Pod CIDR/)).toBeInTheDocument();
-    expect(screen.getByLabelText(/Service CIDR/)).toBeInTheDocument();
-  });
-
-  it('accepts CIDR input values', async () => {
-    const user = userEvent.setup();
-    renderWithProviders(
-      <Formik initialValues={createEmptyClusterValues()} onSubmit={() => undefined}>
-        <ClusterNetworkingStep catalogItem={clusterCatalogItem} />
-      </Formik>,
-    );
-
-    const podCidr = screen.getByLabelText(/Pod CIDR/);
-    await user.type(podCidr, '10.128.0.0/14');
-    expect(podCidr).toHaveValue('10.128.0.0/14');
-  });
-});
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/ClusterNetworkingStep.tsx b/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/ClusterNetworkingStep.tsx
deleted file mode 100644
index 26ad8db8..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/ClusterNetworkingStep.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { useMemo } from 'react';
-import { Stack, StackItem } from '@patternfly/react-core';
-
-import type { ClusterCatalogItem } from '@osac/types';
-
-import { useTranslation } from '../../../../../hooks/useTranslation';
-import { InputField } from '../../../../Form/InputField';
-import OsacForm from '../../../../Form/OsacForm';
-import { getCatalogFieldOverlay, readCatalogFieldDefinitions } from '../../catalogOverlay';
-
-interface Props {
-  catalogItem: ClusterCatalogItem | null;
-}
-
-export const ClusterNetworkingStep = ({ catalogItem }: Props) => {
-  const { t } = useTranslation();
-
-  const definitions = useMemo(() => readCatalogFieldDefinitions(catalogItem), [catalogItem]);
-  const podCidrOverlay = useMemo(
-    () => getCatalogFieldOverlay('network.pod_cidr', definitions, t('Pod CIDR')),
-    [definitions, t],
-  );
-  const serviceCidrOverlay = useMemo(
-    () => getCatalogFieldOverlay('network.service_cidr', definitions, t('Service CIDR')),
-    [definitions, t],
-  );
-
-  if (!catalogItem) {
-    return null;
-  }
-
-  return (
-    <Stack hasGutter>
-      <StackItem>
-        <OsacForm>
-          <InputField
-            name="spec.network.podCidr"
-            label={podCidrOverlay.label}
-            fieldId="cluster-pod-cidr"
-            isDisabled={!podCidrOverlay.editable}
-            helperText={t('Use IPv4 CIDR notation (for example 10.128.0.0/14).')}
-          />
-          <InputField
-            name="spec.network.serviceCidr"
-            label={serviceCidrOverlay.label}
-            fieldId="cluster-service-cidr"
-            isDisabled={!serviceCidrOverlay.editable}
-            helperText={t('Use IPv4 CIDR notation (for example 172.30.0.0/16).')}
-          />
-        </OsacForm>
-      </StackItem>
-    </Stack>
-  );
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/ClusterNodeSetsArrayField.tsx b/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/ClusterNodeSetsArrayField.tsx
deleted file mode 100644
index f7289013..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/ClusterNodeSetsArrayField.tsx
+++ /dev/null
@@ -1,129 +0,0 @@
-import { useMemo } from 'react';
-import {
-  ActionGroup,
-  Alert,
-  Button,
-  FormFieldGroup,
-  FormFieldGroupHeader,
-  Stack,
-  StackItem,
-} from '@patternfly/react-core';
-import MinusCircleIcon from '@patternfly/react-icons/dist/esm/icons/minus-circle-icon';
-import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
-import { useFormikContext } from 'formik';
-
-import type { ClusterWizardValues } from './fields';
-import { createEmptyNodeSetRow } from './fields';
-import { hostTypeDisplayName, useHostTypes } from '../../../../../api/v1/host-types';
-import { useTranslation } from '../../../../../hooks/useTranslation';
-import { getErrorMessage } from '../../../../../utils/error';
-import { SelectField } from '../../../../Form/SelectField';
-import ClusterPoolSizeField from '../../fields/ClusterPoolSizeField';
-
-const ClusterNodeSetsArrayField = () => {
-  const { t } = useTranslation();
-  const { values, setFieldValue } = useFormikContext<ClusterWizardValues>();
-  const {
-    data: hostTypes = [],
-    isLoading: hostTypesLoading,
-    error: hostTypesError,
-    refetch: refetchHostTypes,
-  } = useHostTypes();
-
-  const selectedHostTypeIds = useMemo(
-    () =>
-      new Set(
-        values.spec.nodeSetRows
-          .map((row) => row.hostType.value.trim())
-          .filter((hostTypeId) => hostTypeId.length > 0),
-      ),
-    [values.spec.nodeSetRows],
-  );
-
-  const hostTypeOptionsForRow = (rowIndex: number) => {
-    const currentHostTypeId = values.spec.nodeSetRows[rowIndex]?.hostType.value.trim() ?? '';
-    return hostTypes.map((hostType) => ({
-      value: hostType.id,
-      label: hostTypeDisplayName(hostType),
-      isDisabled: selectedHostTypeIds.has(hostType.id) && hostType.id !== currentHostTypeId,
-    }));
-  };
-
-  const addRow = () => {
-    void setFieldValue('spec.nodeSetRows', [...values.spec.nodeSetRows, createEmptyNodeSetRow()]);
-  };
-
-  const removeRow = (rowIndex: number) => {
-    void setFieldValue(
-      'spec.nodeSetRows',
-      values.spec.nodeSetRows.filter((_, index) => index !== rowIndex),
-    );
-  };
-
-  return (
-    <Stack hasGutter>
-      {hostTypesError ? (
-        <StackItem>
-          <Alert variant="danger" isInline title={t('Could not load host types')}>
-            {getErrorMessage(hostTypesError)}
-            <Button variant="link" isInline onClick={() => void refetchHostTypes()}>
-              {t('catalogProvision.actions.retry')}
-            </Button>
-          </Alert>
-        </StackItem>
-      ) : null}
-      {values.spec.nodeSetRows.length === 0 ? (
-        <StackItem>{t('No node sets added yet.')}</StackItem>
-      ) : null}
-      {values.spec.nodeSetRows.map((row, rowIndex) => (
-        <StackItem key={row.rowId}>
-          <FormFieldGroup
-            header={
-              <FormFieldGroupHeader
-                titleText={{
-                  text: t('Node set {{number}}', { number: rowIndex + 1 }),
-                  id: `cluster-node-set-group-${row.rowId}`,
-                }}
-                actions={
-                  rowIndex > 0 ? (
-                    <Button
-                      variant="plain"
-                      aria-label={t('Remove node set')}
-                      onClick={() => removeRow(rowIndex)}
-                      icon={<MinusCircleIcon />}
-                    />
-                  ) : undefined
-                }
-              />
-            }
-          >
-            <SelectField
-              name={`spec.nodeSetRows.${rowIndex}.hostType`}
-              label={t('Host type')}
-              fieldId={`cluster-host-type-${row.rowId}`}
-              options={hostTypeOptionsForRow(rowIndex)}
-              isRequired
-              isLoading={hostTypesLoading}
-              placeholder={t('Select host type')}
-            />
-            <ClusterPoolSizeField rowIndex={rowIndex} isRequired />
-          </FormFieldGroup>
-        </StackItem>
-      ))}
-      <StackItem>
-        <ActionGroup>
-          <Button
-            variant="link"
-            icon={<PlusCircleIcon />}
-            onClick={addRow}
-            isDisabled={hostTypesLoading}
-          >
-            {t('Add node set')}
-          </Button>
-        </ActionGroup>
-      </StackItem>
-    </Stack>
-  );
-};
-
-export default ClusterNodeSetsArrayField;
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/applyCatalogDefaults.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/applyCatalogDefaults.ts
deleted file mode 100644
index 752e457b..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/applyCatalogDefaults.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import type { FormikHelpers } from 'formik';
-import type { TFunction } from 'i18next';
-
-import type { ClusterCatalogItem } from '@osac/types';
-
-import type { ClusterWizardValues } from './fields';
-import { CLUSTER_RELEASE_IMAGE_WIRE_PATH } from './fields';
-import {
-  getCatalogFieldOverlay,
-  overlayDefaultToFormValue,
-  readCatalogFieldDefinitions,
-} from '../../catalogOverlay';
-
-export const applyClusterCatalogConfigurationDefaults = (
-  catalogItem: ClusterCatalogItem,
-  helpers: FormikHelpers<ClusterWizardValues>,
-  t: TFunction,
-): void => {
-  const definitions = readCatalogFieldDefinitions(catalogItem);
-  const releaseImageOverlay = getCatalogFieldOverlay(
-    CLUSTER_RELEASE_IMAGE_WIRE_PATH,
-    definitions,
-    t('Release image'),
-  );
-  const value = overlayDefaultToFormValue(releaseImageOverlay);
-  if (value !== undefined) {
-    void helpers.setFieldValue('spec.releaseImage', value);
-  }
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/applyCatalogGeneralDefaults.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/applyCatalogGeneralDefaults.ts
deleted file mode 100644
index bd7fac01..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/applyCatalogGeneralDefaults.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import type { FormikHelpers } from 'formik';
-import type { TFunction } from 'i18next';
-
-import type { ClusterCatalogItem } from '@osac/types';
-
-import type { ClusterWizardValues } from './fields';
-import { CLUSTER_PULL_SECRET_WIRE_PATH, clusterSshKeyWirePath } from './fields';
-import {
-  getCatalogFieldOverlay,
-  overlayDefaultToFormValue,
-  readCatalogFieldDefinitions,
-} from '../../catalogOverlay';
-
-export const applyClusterCatalogGeneralDefaults = (
-  catalogItem: ClusterCatalogItem,
-  helpers: FormikHelpers<ClusterWizardValues>,
-  t: TFunction,
-): void => {
-  const definitions = readCatalogFieldDefinitions(catalogItem);
-  const sshKeyOverlay = getCatalogFieldOverlay(
-    clusterSshKeyWirePath,
-    definitions,
-    t('SSH public key'),
-  );
-  const pullSecretOverlay = getCatalogFieldOverlay(
-    CLUSTER_PULL_SECRET_WIRE_PATH,
-    definitions,
-    t('Pull secret'),
-  );
-
-  if (sshKeyOverlay.defaultValue !== undefined) {
-    const value = overlayDefaultToFormValue(sshKeyOverlay);
-    if (value !== undefined) {
-      void helpers.setFieldValue('spec.sshPublicKey', value);
-    }
-  }
-
-  if (pullSecretOverlay.defaultValue !== undefined) {
-    const value = overlayDefaultToFormValue(pullSecretOverlay);
-    if (value !== undefined) {
-      void helpers.setFieldValue('spec.pullSecret', value);
-    }
-  }
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/applyCatalogNetworkingDefaults.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/applyCatalogNetworkingDefaults.ts
deleted file mode 100644
index 4006600d..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/applyCatalogNetworkingDefaults.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import type { FormikHelpers } from 'formik';
-import type { TFunction } from 'i18next';
-
-import type { ClusterCatalogItem } from '@osac/types';
-
-import type { ClusterWizardValues } from './fields';
-import { CLUSTER_POD_CIDR_WIRE_PATH, CLUSTER_SERVICE_CIDR_WIRE_PATH } from './fields';
-import {
-  getCatalogFieldOverlay,
-  overlayDefaultToFormValue,
-  readCatalogFieldDefinitions,
-} from '../../catalogOverlay';
-
-export const applyClusterCatalogNetworkingDefaults = (
-  catalogItem: ClusterCatalogItem,
-  helpers: FormikHelpers<ClusterWizardValues>,
-  t: TFunction,
-): void => {
-  const definitions = readCatalogFieldDefinitions(catalogItem);
-  const podCidrOverlay = getCatalogFieldOverlay(
-    CLUSTER_POD_CIDR_WIRE_PATH,
-    definitions,
-    t('Pod CIDR'),
-  );
-  const serviceCidrOverlay = getCatalogFieldOverlay(
-    CLUSTER_SERVICE_CIDR_WIRE_PATH,
-    definitions,
-    t('Service CIDR'),
-  );
-
-  const podCidr = overlayDefaultToFormValue(podCidrOverlay);
-  if (podCidr !== undefined) {
-    void helpers.setFieldValue('spec.network.podCidr', podCidr);
-  }
-
-  const serviceCidr = overlayDefaultToFormValue(serviceCidrOverlay);
-  if (serviceCidr !== undefined) {
-    void helpers.setFieldValue('spec.network.serviceCidr', serviceCidr);
-  }
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/fields.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/fields.ts
deleted file mode 100644
index f62ef992..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/fields.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import type { LabeledResourceRef } from '../../../../Form/labeledResourceRef';
-
-export interface ClusterNodeSetRow {
-  rowId: string;
-  hostType: LabeledResourceRef;
-  size: string;
-}
-
-export interface ClusterWizardValues {
-  catalogItemId: string;
-  metadata: {
-    name: string;
-  };
-  spec: {
-    sshPublicKey: string;
-    pullSecret: string;
-    releaseImage: string;
-    nodeSetRows: ClusterNodeSetRow[];
-    network: {
-      podCidr: string;
-      serviceCidr: string;
-    };
-  };
-}
-
-export const CLUSTER_SSH_KEY_WIRE_PATH = 'ssh_public_key';
-export const CLUSTER_SSH_KEY_FORM_PATH = 'spec.sshPublicKey';
-export const CLUSTER_PULL_SECRET_WIRE_PATH = 'pull_secret';
-export const CLUSTER_PULL_SECRET_FORM_PATH = 'spec.pullSecret';
-export const CLUSTER_RELEASE_IMAGE_WIRE_PATH = 'release_image';
-export const CLUSTER_POD_CIDR_WIRE_PATH = 'network.pod_cidr';
-export const CLUSTER_SERVICE_CIDR_WIRE_PATH = 'network.service_cidr';
-
-export const clusterSshKeyWirePath = CLUSTER_SSH_KEY_WIRE_PATH;
-
-export const CLUSTER_CONFIGURATION_CATALOG_PATHS = [
-  CLUSTER_RELEASE_IMAGE_WIRE_PATH,
-  'spec.release_image',
-] as const;
-
-export const CLUSTER_NETWORKING_CATALOG_PATHS = [
-  CLUSTER_POD_CIDR_WIRE_PATH,
-  'spec.network.pod_cidr',
-  CLUSTER_SERVICE_CIDR_WIRE_PATH,
-  'spec.network.service_cidr',
-] as const;
-
-export const createNodeSetRowId = (): string => crypto.randomUUID();
-
-export const createEmptyNodeSetRow = (): ClusterNodeSetRow => ({
-  rowId: createNodeSetRowId(),
-  hostType: { value: '', label: '' },
-  size: '',
-});
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/payload.test.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/payload.test.ts
deleted file mode 100644
index 0cfc7739..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/payload.test.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import { describe, expect, it } from 'vitest';
-
-import type { ClusterCatalogItem } from '@osac/types';
-
-import { createEmptyNodeSetRow } from './fields';
-import { buildClusterCreatePayload, createEmptyClusterValues } from './payload';
-
-const clusterCatalogItem: ClusterCatalogItem = {
-  $typeName: 'osac.public.v1.ClusterCatalogItem',
-  id: 'catalog-openshift-4',
-  metadata: {
-    $typeName: 'osac.public.v1.Metadata',
-    name: 'catalog-openshift-4',
-    annotations: {},
-    creator: 'foo',
-    labels: {},
-    project: 'foo',
-    tenant: 'foo',
-    version: 1,
-  },
-  title: 'OpenShift 4 cluster',
-  description: 'Standard OpenShift cluster offering',
-  template: 'tpl-openshift-4',
-  published: true,
-  fieldDefinitions: [
-    {
-      $typeName: 'osac.public.v1.FieldDefinition',
-      path: 'release_image',
-      displayName: 'Release image',
-      editable: true,
-      validationSchema: '',
-      default: {
-        $typeName: 'google.protobuf.Value',
-        kind: { case: 'stringValue', value: '4.17.0' },
-      },
-    },
-  ],
-};
-
-describe('buildClusterCreatePayload', () => {
-  it('builds catalog-item create payload with node sets keyed by host type id', () => {
-    const row = createEmptyNodeSetRow();
-    const values = {
-      ...createEmptyClusterValues(),
-      catalogItemId: clusterCatalogItem.id,
-      metadata: { name: 'my-cluster' },
-      spec: {
-        ...createEmptyClusterValues().spec,
-        sshPublicKey: 'ssh-rsa AAAA',
-        pullSecret: '{"auths":{}}',
-        releaseImage: '4.17.0',
-        nodeSetRows: [
-          {
-            ...row,
-            hostType: { value: 'acme_1tb', label: 'ACME 1TB' },
-            size: '3',
-          },
-        ],
-        network: {
-          podCidr: '10.128.0.0/14',
-          serviceCidr: '',
-        },
-      },
-    };
-
-    expect(buildClusterCreatePayload(values, clusterCatalogItem)).toEqual({
-      metadata: { name: 'my-cluster' },
-      spec: {
-        catalogItem: clusterCatalogItem.id,
-        sshPublicKey: 'ssh-rsa AAAA',
-        pullSecret: '{"auths":{}}',
-        releaseImage: '4.17.0',
-        nodeSets: {
-          acme_1tb: { hostType: 'acme_1tb', size: 3 },
-        },
-        network: {
-          podCidr: '10.128.0.0/14',
-        },
-      },
-    });
-  });
-
-  it('omits blank optional fields and node sets when no valid rows exist', () => {
-    const values = {
-      ...createEmptyClusterValues(),
-      catalogItemId: clusterCatalogItem.id,
-      metadata: { name: 'empty-pools' },
-      spec: {
-        ...createEmptyClusterValues().spec,
-        pullSecret: 'secret',
-        releaseImage: '4.17.0',
-        nodeSetRows: [],
-        network: { podCidr: '', serviceCidr: '' },
-      },
-    };
-
-    const payload = buildClusterCreatePayload(values, clusterCatalogItem);
-    expect(payload.spec).toEqual({
-      catalogItem: clusterCatalogItem.id,
-      pullSecret: 'secret',
-      releaseImage: '4.17.0',
-    });
-    expect(payload.spec).not.toHaveProperty('nodeSets');
-    expect(payload.spec).not.toHaveProperty('network');
-  });
-
-  it('filters out invalid node set rows from the payload', () => {
-    const row = createEmptyNodeSetRow();
-    const values = {
-      ...createEmptyClusterValues(),
-      catalogItemId: clusterCatalogItem.id,
-      metadata: { name: 'filtered-pools' },
-      spec: {
-        ...createEmptyClusterValues().spec,
-        pullSecret: 'secret',
-        releaseImage: '4.17.0',
-        nodeSetRows: [
-          { ...row, hostType: { value: '', label: '' }, size: '3' },
-          { ...row, hostType: { value: 'acme_1tb', label: 'ACME 1TB' }, size: '0' },
-          { ...row, hostType: { value: 'acme_2tb', label: 'ACME 2TB' }, size: 'not-a-number' },
-          { ...row, hostType: { value: 'acme_1tb', label: 'ACME 1TB' }, size: '3' },
-        ],
-        network: { podCidr: '', serviceCidr: '' },
-      },
-    };
-
-    const payload = buildClusterCreatePayload(values, clusterCatalogItem);
-    expect(payload.spec?.nodeSets).toEqual({
-      acme_1tb: { hostType: 'acme_1tb', size: 3 },
-    });
-  });
-});
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/payload.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/payload.ts
deleted file mode 100644
index d770148b..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/payload.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { type MessageInitShape } from '@bufbuild/protobuf';
-
-import { type ClusterCatalogItem, ClusterSchema } from '@osac/types';
-
-import type { ClusterWizardValues } from './fields';
-import { createEmptyNodeSetRow } from './fields';
-
-export const createEmptyClusterValues = (): ClusterWizardValues => ({
-  catalogItemId: '',
-  metadata: { name: '' },
-  spec: {
-    sshPublicKey: '',
-    pullSecret: '',
-    releaseImage: '',
-    nodeSetRows: [createEmptyNodeSetRow()],
-    network: {
-      podCidr: '',
-      serviceCidr: '',
-    },
-  },
-});
-
-export const buildClusterCreatePayload = (
-  values: ClusterWizardValues,
-  catalogItem: ClusterCatalogItem,
-): MessageInitShape<typeof ClusterSchema> => {
-  const spec: MessageInitShape<typeof ClusterSchema>['spec'] = {
-    catalogItem: catalogItem.id,
-    releaseImage: values.spec.releaseImage.trim(),
-    pullSecret: values.spec.pullSecret.trim(),
-  };
-
-  const sshPublicKey = values.spec.sshPublicKey.trim();
-  if (sshPublicKey) {
-    spec.sshPublicKey = sshPublicKey;
-  }
-
-  const nodeSets: Record<string, { hostType: string; size: number }> = {};
-  for (const row of values.spec.nodeSetRows) {
-    const hostTypeId = row.hostType.value.trim();
-    const size = Number(row.size);
-    if (!hostTypeId || !Number.isFinite(size) || size <= 0) {
-      continue;
-    }
-    nodeSets[hostTypeId] = { hostType: hostTypeId, size };
-  }
-  if (Object.keys(nodeSets).length > 0) {
-    spec.nodeSets = nodeSets;
-  }
-
-  const podCidr = values.spec.network.podCidr.trim();
-  const serviceCidr = values.spec.network.serviceCidr.trim();
-  if (podCidr || serviceCidr) {
-    spec.network = {
-      ...(podCidr ? { podCidr } : {}),
-      ...(serviceCidr ? { serviceCidr } : {}),
-    };
-  }
-
-  return {
-    metadata: { name: values.metadata.name.trim() },
-    spec,
-  };
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/schemas.test.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/schemas.test.ts
deleted file mode 100644
index 8f5ab29f..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/schemas.test.ts
+++ /dev/null
@@ -1,330 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { ValidationError } from 'yup';
-
-import type { ClusterCatalogItem } from '@osac/types';
-
-import type { ClusterWizardValues } from './fields';
-import { createEmptyNodeSetRow } from './fields';
-import { buildClusterStepSchema } from './schemas';
-import { tIdentity as t } from '../../../../../test-utils/i18n';
-
-const clusterCatalogItem: ClusterCatalogItem = {
-  $typeName: 'osac.public.v1.ClusterCatalogItem',
-  id: 'catalog-openshift-4',
-  metadata: {
-    $typeName: 'osac.public.v1.Metadata',
-    name: 'catalog-openshift-4',
-    annotations: {},
-    creator: 'foo',
-    labels: {},
-    project: 'foo',
-    tenant: 'foo',
-    version: 1,
-  },
-  title: 'OpenShift 4 cluster',
-  description: 'Standard OpenShift cluster offering',
-  template: 'tpl-openshift-4',
-  published: true,
-  fieldDefinitions: [
-    {
-      $typeName: 'osac.public.v1.FieldDefinition',
-      path: 'release_image',
-      displayName: 'Release image',
-      editable: true,
-      validationSchema: '',
-      default: {
-        $typeName: 'google.protobuf.Value',
-        kind: { case: 'stringValue', value: '4.17.0' },
-      },
-    },
-  ],
-};
-
-const emptyValues: ClusterWizardValues = {
-  catalogItemId: '',
-  metadata: { name: '' },
-  spec: {
-    sshPublicKey: '',
-    pullSecret: '',
-    releaseImage: '',
-    nodeSetRows: [],
-    network: {
-      podCidr: '',
-      serviceCidr: '',
-    },
-  },
-};
-
-const validateStep = async (
-  stepId: Parameters<typeof buildClusterStepSchema>[1],
-  values: ClusterWizardValues,
-  catalogItem: ClusterCatalogItem | null = null,
-) => {
-  const schema = buildClusterStepSchema(catalogItem, stepId, t);
-  if (!schema) {
-    return {};
-  }
-  try {
-    await schema.validate(values, { abortEarly: false });
-    return {};
-  } catch (error) {
-    if (!(error instanceof ValidationError)) {
-      throw error;
-    }
-    const errors: Record<string, unknown> = {};
-    for (const inner of error.inner.length > 0 ? error.inner : [error]) {
-      if (!inner.path) {
-        continue;
-      }
-      const parts = inner.path.split('.');
-      let current: Record<string, unknown> = errors;
-      for (let index = 0; index < parts.length - 1; index += 1) {
-        const key = parts[index];
-        if (!current[key] || typeof current[key] !== 'object') {
-          current[key] = {};
-        }
-        current = current[key] as Record<string, unknown>;
-      }
-      current[parts[parts.length - 1]] = inner.message;
-    }
-    return errors;
-  }
-};
-
-describe('buildClusterStepSchema', () => {
-  it('requires catalog item on catalog step', async () => {
-    const errors = await validateStep('catalog', emptyValues);
-    expect(errors).toEqual({ catalogItemId: 'Select a catalog item' });
-  });
-
-  it('rejects invalid DNS label names on general step', async () => {
-    const errors = await validateStep('general', {
-      ...emptyValues,
-      catalogItemId: clusterCatalogItem.id,
-      metadata: { name: 'MyCluster' },
-      spec: {
-        ...emptyValues.spec,
-        pullSecret: '{"auths": {}}',
-      },
-    });
-    expect(errors).toEqual({
-      metadata: {
-        name: 'Name must only contain lowercase letters (a-z), digits (0-9), and hyphens (-)',
-      },
-    });
-  });
-
-  it('rejects malformed pull secret on general step', async () => {
-    const errors = await validateStep('general', {
-      ...emptyValues,
-      catalogItemId: clusterCatalogItem.id,
-      metadata: { name: 'my-cluster' },
-      spec: {
-        ...emptyValues.spec,
-        pullSecret: '{"foo":"bar"}',
-      },
-    });
-    expect(errors).toEqual({
-      spec: {
-        pullSecret:
-          'Invalid pull secret format. Paste the complete JSON from your Red Hat account pull secret.',
-      },
-    });
-  });
-
-  it('rejects malformed ssh public key on general step', async () => {
-    const errors = await validateStep('general', {
-      ...emptyValues,
-      catalogItemId: clusterCatalogItem.id,
-      metadata: { name: 'my-cluster' },
-      spec: {
-        ...emptyValues.spec,
-        pullSecret: '{"auths": {}}',
-        sshPublicKey: 'not-a-key',
-      },
-    });
-    expect(errors).toEqual({
-      spec: {
-        sshPublicKey:
-          'SSH public key must be in the form "[TYPE] key [[EMAIL]]". Supported types are ssh-rsa, ssh-ed25519, and ecdsa-sha2-nistp256/384/521.',
-      },
-    });
-  });
-
-  it('requires pull secret on general step', async () => {
-    const errors = await validateStep('general', {
-      ...emptyValues,
-      catalogItemId: clusterCatalogItem.id,
-      metadata: { name: 'my-cluster' },
-    });
-    expect(errors).toEqual({
-      spec: { pullSecret: 'Pull secret is required' },
-    });
-  });
-
-  it('requires at least one node set on configuration step', async () => {
-    const errors = await validateStep(
-      'configuration',
-      {
-        ...emptyValues,
-        catalogItemId: clusterCatalogItem.id,
-        metadata: { name: 'my-cluster' },
-        spec: {
-          ...emptyValues.spec,
-          pullSecret: '{"auths": {}}',
-          releaseImage: '4.17.0',
-          nodeSetRows: [],
-        },
-      },
-      clusterCatalogItem,
-    );
-    expect(errors).toEqual({
-      spec: { nodeSetRows: 'At least one node set is required' },
-    });
-  });
-
-  it('requires positive pool sizes on configuration step', async () => {
-    const row = createEmptyNodeSetRow();
-    const errors = await validateStep(
-      'configuration',
-      {
-        ...emptyValues,
-        catalogItemId: clusterCatalogItem.id,
-        metadata: { name: 'my-cluster' },
-        spec: {
-          ...emptyValues.spec,
-          pullSecret: '{"auths": {}}',
-          releaseImage: '4.17.0',
-          nodeSetRows: [
-            {
-              ...row,
-              hostType: { value: 'acme_1tb', label: 'ACME 1TB' },
-              size: '0',
-            },
-          ],
-        },
-      },
-      clusterCatalogItem,
-    );
-    expect(errors).toEqual({
-      spec: {
-        'nodeSetRows[0]': { size: 'Pool size must be greater than zero' },
-      },
-    });
-  });
-
-  it('rejects duplicate host types on configuration step', async () => {
-    const row = createEmptyNodeSetRow();
-    const errors = await validateStep(
-      'configuration',
-      {
-        ...emptyValues,
-        catalogItemId: clusterCatalogItem.id,
-        metadata: { name: 'my-cluster' },
-        spec: {
-          ...emptyValues.spec,
-          pullSecret: '{"auths": {}}',
-          releaseImage: '4.17.0',
-          nodeSetRows: [
-            {
-              ...row,
-              rowId: 'row-1',
-              hostType: { value: 'acme_1tb', label: 'ACME 1TB' },
-              size: '3',
-            },
-            {
-              ...row,
-              rowId: 'row-2',
-              hostType: { value: 'acme_1tb', label: 'ACME 1TB' },
-              size: '2',
-            },
-          ],
-        },
-      },
-      clusterCatalogItem,
-    );
-    expect(errors).toEqual({
-      spec: { nodeSetRows: 'Each host type can only be selected once' },
-    });
-  });
-
-  it('validates CIDR format on networking step when values are present', async () => {
-    const errors = await validateStep(
-      'networking',
-      {
-        ...emptyValues,
-        catalogItemId: clusterCatalogItem.id,
-        spec: {
-          ...emptyValues.spec,
-          network: {
-            podCidr: 'invalid',
-            serviceCidr: '',
-          },
-        },
-      },
-      clusterCatalogItem,
-    );
-    expect(errors).toEqual({
-      spec: {
-        network: {
-          podCidr: 'Invalid IPv4 CIDR notation',
-        },
-      },
-    });
-  });
-
-  it('rejects IPv6 pod and service CIDRs on networking step', async () => {
-    const errors = await validateStep(
-      'networking',
-      {
-        ...emptyValues,
-        catalogItemId: clusterCatalogItem.id,
-        spec: {
-          ...emptyValues.spec,
-          network: {
-            podCidr: 'fd01::/48',
-            serviceCidr: 'fd02::/112',
-          },
-        },
-      },
-      clusterCatalogItem,
-    );
-    expect(errors).toEqual({
-      spec: {
-        network: {
-          podCidr: 'Invalid IPv4 CIDR notation',
-          serviceCidr: 'Invalid IPv4 CIDR notation',
-        },
-      },
-    });
-  });
-
-  it('rejects overlapping pod and service CIDRs on networking step', async () => {
-    const errors = await validateStep(
-      'networking',
-      {
-        ...emptyValues,
-        catalogItemId: clusterCatalogItem.id,
-        spec: {
-          ...emptyValues.spec,
-          network: {
-            podCidr: '10.128.0.0/14',
-            serviceCidr: '10.128.0.0/14',
-          },
-        },
-      },
-      clusterCatalogItem,
-    );
-    expect(errors).toEqual({
-      spec: {
-        network: {
-          serviceCidr: 'Service CIDR must not overlap the pod CIDR.',
-        },
-      },
-    });
-  });
-
-  it('returns undefined for review step', () => {
-    expect(buildClusterStepSchema(clusterCatalogItem, 'review', t)).toBeUndefined();
-  });
-});
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/schemas.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/schemas.ts
deleted file mode 100644
index 4d79478a..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/cluster/schemas.ts
+++ /dev/null
@@ -1,198 +0,0 @@
-import type { TFunction } from 'i18next';
-import * as yup from 'yup';
-
-import type { ClusterCatalogItem } from '@osac/types';
-
-import type { ClusterNodeSetRow } from './fields';
-import {
-  CLUSTER_POD_CIDR_WIRE_PATH,
-  CLUSTER_PULL_SECRET_WIRE_PATH,
-  CLUSTER_RELEASE_IMAGE_WIRE_PATH,
-  CLUSTER_SERVICE_CIDR_WIRE_PATH,
-  CLUSTER_SSH_KEY_WIRE_PATH,
-} from './fields';
-import {
-  buildCidrSchema,
-  cidrsOverlap,
-  isValidCidr,
-} from '../../../../../validation/cidr-validation';
-import { labeledResourceRefSchema } from '../../../../Form/labeledResourceRefSchema';
-import {
-  getCatalogFieldOverlay,
-  hasCatalogFieldDefinition,
-  mergeCatalogValidation,
-  readCatalogFieldDefinitions,
-} from '../../catalogOverlay';
-import { isValidPullSecret, isValidSshPublicKey } from '../../fields/credentialValidation';
-import { buildMetadataNameSchema } from '../../metadataNameSchema';
-import type { WizardStepId } from '../../stepIds';
-
-const nodeSetRowSchema = (t: TFunction) =>
-  yup.object({
-    rowId: yup.string().required(),
-    hostType: labeledResourceRefSchema(t('Host type is required')),
-    size: yup
-      .string()
-      .required(t('Pool size is required'))
-      .test('pool-size-positive', t('Pool size must be greater than zero'), (value) => {
-        const parsed = Number(value?.trim());
-        return Number.isFinite(parsed) && parsed > 0;
-      }),
-  });
-
-const buildClusterFieldDefinitions = (catalogItem: unknown, t: TFunction) => {
-  const definitions = readCatalogFieldDefinitions(catalogItem);
-
-  const sshKeyOverlay = getCatalogFieldOverlay(
-    CLUSTER_SSH_KEY_WIRE_PATH,
-    definitions,
-    t('SSH public key'),
-  );
-  const pullSecretOverlay = getCatalogFieldOverlay(
-    CLUSTER_PULL_SECRET_WIRE_PATH,
-    definitions,
-    t('Pull secret'),
-  );
-  const releaseImageOverlay = getCatalogFieldOverlay(
-    CLUSTER_RELEASE_IMAGE_WIRE_PATH,
-    definitions,
-    t('Release image'),
-  );
-  const podCidrOverlay = getCatalogFieldOverlay(
-    CLUSTER_POD_CIDR_WIRE_PATH,
-    definitions,
-    t('Pod CIDR'),
-  );
-  const serviceCidrOverlay = getCatalogFieldOverlay(
-    CLUSTER_SERVICE_CIDR_WIRE_PATH,
-    definitions,
-    t('Service CIDR'),
-  );
-
-  const sshKeyRequired = hasCatalogFieldDefinition(CLUSTER_SSH_KEY_WIRE_PATH, definitions);
-  const rowSchema = nodeSetRowSchema(t);
-
-  return {
-    catalogItemId: yup.string().required(t('Select a catalog item')),
-    metadataName: buildMetadataNameSchema(t),
-    specSshPublicKey: mergeCatalogValidation(
-      yup
-        .string()
-        .test(
-          'ssh-public-key',
-          t(
-            'SSH public key must be in the form "[TYPE] key [[EMAIL]]". Supported types are ssh-rsa, ssh-ed25519, and ecdsa-sha2-nistp256/384/521.',
-          ),
-          (value) => isValidSshPublicKey(value),
-        ),
-      sshKeyOverlay,
-      sshKeyRequired,
-      t('This field is required'),
-    ),
-    specPullSecret: mergeCatalogValidation(
-      yup
-        .string()
-        .trim()
-        .test(
-          'pull-secret',
-          t(
-            'Invalid pull secret format. Paste the complete JSON from your Red Hat account pull secret.',
-          ),
-          (value) => isValidPullSecret(value),
-        ),
-      pullSecretOverlay,
-      true,
-      t('Pull secret is required'),
-    ),
-    specReleaseImage: mergeCatalogValidation(
-      yup.string().trim(),
-      releaseImageOverlay,
-      true,
-      t('Release image is required'),
-    ),
-    specNodeSetRows: yup
-      .array()
-      .of(rowSchema)
-      .min(1, t('At least one node set is required'))
-      .test('unique-host-types', t('Each host type can only be selected once'), (rows) => {
-        const hostTypeIds = (rows ?? [])
-          .map((row) => row?.hostType?.value?.trim() ?? '')
-          .filter(Boolean);
-        return new Set(hostTypeIds).size === hostTypeIds.length;
-      }),
-    specNetwork: yup.object({
-      podCidr: mergeCatalogValidation(
-        buildCidrSchema(t, 'ipv4'),
-        podCidrOverlay,
-        false,
-        t('This field is required'),
-      ),
-      serviceCidr: mergeCatalogValidation(
-        buildCidrSchema(t, 'ipv4').test(
-          'service-cidr-no-overlap',
-          t('Service CIDR must not overlap the pod CIDR.'),
-          function (value) {
-            const parent = this.parent as { podCidr?: string } | undefined;
-            const podCidr = parent?.podCidr ?? '';
-            if (!value?.trim() || !podCidr.trim()) {
-              return true;
-            }
-            if (!isValidCidr(value, 'ipv4') || !isValidCidr(podCidr, 'ipv4')) {
-              return true;
-            }
-            return !cidrsOverlap(podCidr, value, 'ipv4');
-          },
-        ),
-        serviceCidrOverlay,
-        false,
-        t('This field is required'),
-      ),
-    }),
-  };
-};
-
-export const buildClusterStepSchema = (
-  catalogItem: ClusterCatalogItem | null,
-  stepId: WizardStepId,
-  t: TFunction,
-): yup.AnyObjectSchema | undefined => {
-  if (stepId === 'review') {
-    return undefined;
-  }
-
-  const fields = buildClusterFieldDefinitions(catalogItem, t);
-
-  switch (stepId) {
-    case 'catalog':
-      return yup.object({
-        catalogItemId: fields.catalogItemId,
-      });
-    case 'general':
-      return yup.object({
-        metadata: yup.object({
-          name: fields.metadataName,
-        }),
-        spec: yup.object({
-          sshPublicKey: fields.specSshPublicKey,
-          pullSecret: fields.specPullSecret,
-        }),
-      });
-    case 'configuration':
-      return yup.object({
-        spec: yup.object({
-          releaseImage: fields.specReleaseImage,
-          nodeSetRows: fields.specNodeSetRows,
-        }),
-      });
-    case 'networking':
-      return yup.object({
-        spec: yup.object({
-          network: fields.specNetwork,
-        }),
-      });
-    default:
-      return undefined;
-  }
-};
-
-export type { ClusterNodeSetRow };
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/clusterAdapter.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/clusterAdapter.ts
deleted file mode 100644
index cae549df..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/clusterAdapter.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-import { useMemo } from 'react';
-import { type MessageInitShape } from '@bufbuild/protobuf';
-import type { TFunction } from 'i18next';
-
-import { type ClusterCatalogItem, ClusterSchema } from '@osac/types';
-
-import {
-  type ReviewSection,
-  formatReviewScalar,
-  getCatalogFieldOverlay,
-  readCatalogFieldDefinitions,
-  reviewRow,
-} from '../catalogOverlay';
-import { applyClusterCatalogConfigurationDefaults } from './cluster/applyCatalogDefaults';
-import { applyClusterCatalogGeneralDefaults } from './cluster/applyCatalogGeneralDefaults';
-import { applyClusterCatalogNetworkingDefaults } from './cluster/applyCatalogNetworkingDefaults';
-import ClusterConfigurationStep from './cluster/ClusterConfigurationStep';
-import ClusterGeneralStep from './cluster/ClusterGeneralStep';
-import { ClusterNetworkingStep } from './cluster/ClusterNetworkingStep';
-import type { ClusterWizardValues } from './cluster/fields';
-import {
-  CLUSTER_POD_CIDR_WIRE_PATH,
-  CLUSTER_PULL_SECRET_WIRE_PATH,
-  CLUSTER_RELEASE_IMAGE_WIRE_PATH,
-  CLUSTER_SERVICE_CIDR_WIRE_PATH,
-  CLUSTER_SSH_KEY_WIRE_PATH,
-} from './cluster/fields';
-import { buildClusterCreatePayload, createEmptyClusterValues } from './cluster/payload';
-import { buildClusterStepSchema } from './cluster/schemas';
-import type { CatalogProvisionAdapter } from './types';
-import { useClusterCatalogItems } from '../../../../api/v1/cluster-catalog-item';
-import { useTranslation } from '../../../../hooks/useTranslation';
-import { formatLabeledResourceRefForReview } from '../../../Form/labeledResourceRef';
-
-export { buildClusterCreatePayload, createEmptyClusterValues } from './cluster/payload';
-
-const formatNodeSetsForReview = (
-  nodeSetRows: ClusterWizardValues['spec']['nodeSetRows'],
-): string => {
-  if (nodeSetRows.length === 0) {
-    return '—';
-  }
-  return nodeSetRows
-    .map((row) => `${formatLabeledResourceRefForReview(row.hostType)}: ${row.size}`)
-    .join(', ');
-};
-
-const buildReviewSections = (
-  values: ClusterWizardValues,
-  catalogItem: ClusterCatalogItem,
-  t: TFunction,
-): ReviewSection[] => {
-  const definitions = readCatalogFieldDefinitions(catalogItem);
-  const sshKeyOverlay = getCatalogFieldOverlay(
-    CLUSTER_SSH_KEY_WIRE_PATH,
-    definitions,
-    t('SSH public key'),
-  );
-  const pullSecretOverlay = getCatalogFieldOverlay(
-    CLUSTER_PULL_SECRET_WIRE_PATH,
-    definitions,
-    t('Pull secret'),
-  );
-  const releaseImageOverlay = getCatalogFieldOverlay(
-    CLUSTER_RELEASE_IMAGE_WIRE_PATH,
-    definitions,
-    t('Release image'),
-  );
-  const podCidrOverlay = getCatalogFieldOverlay(
-    CLUSTER_POD_CIDR_WIRE_PATH,
-    definitions,
-    t('Pod CIDR'),
-  );
-  const serviceCidrOverlay = getCatalogFieldOverlay(
-    CLUSTER_SERVICE_CIDR_WIRE_PATH,
-    definitions,
-    t('Service CIDR'),
-  );
-
-  return [
-    {
-      title: t('catalogProvision.steps.general.title'),
-      rows: [
-        reviewRow(t('Name'), formatReviewScalar(values.metadata.name)),
-        reviewRow(sshKeyOverlay.label, formatReviewScalar(values.spec.sshPublicKey, true)),
-        reviewRow(pullSecretOverlay.label, formatReviewScalar(values.spec.pullSecret, true)),
-      ],
-    },
-    {
-      title: t('catalogProvision.steps.configuration.title'),
-      rows: [
-        reviewRow(releaseImageOverlay.label, formatReviewScalar(values.spec.releaseImage)),
-        reviewRow(t('Node sets'), formatNodeSetsForReview(values.spec.nodeSetRows)),
-      ],
-    },
-    {
-      title: t('catalogProvision.steps.networking.title'),
-      rows: [
-        reviewRow(podCidrOverlay.label, formatReviewScalar(values.spec.network.podCidr)),
-        reviewRow(serviceCidrOverlay.label, formatReviewScalar(values.spec.network.serviceCidr)),
-      ],
-    },
-  ];
-};
-
-export const useClusterAdapter = (): CatalogProvisionAdapter<
-  ClusterCatalogItem,
-  ClusterWizardValues,
-  MessageInitShape<typeof ClusterSchema>
-> => {
-  const { t } = useTranslation();
-
-  return useMemo(
-    () => ({
-      kind: 'cluster' as const,
-      useCatalogItems: () => {
-        const query = useClusterCatalogItems();
-        return {
-          data: query.data ?? [],
-          isPending: query.isPending,
-          isError: query.isError,
-          refetch: () => {
-            void query.refetch();
-          },
-        };
-      },
-      getInitialValues: () => createEmptyClusterValues(),
-      buildCreatePayload: buildClusterCreatePayload,
-      ConfigurationStep: ClusterConfigurationStep,
-      NetworkingStep: ClusterNetworkingStep,
-      GeneralStep: ClusterGeneralStep,
-      getStepValidationSchema: (catalogItem, stepId) =>
-        buildClusterStepSchema(catalogItem, stepId, t),
-      getReviewSections: (values, catalogItem) => buildReviewSections(values, catalogItem, t),
-      onCatalogItemSelected: (item, helpers) => {
-        helpers.resetForm({
-          values: {
-            ...createEmptyClusterValues(),
-            catalogItemId: item.id,
-          },
-        });
-        applyClusterCatalogConfigurationDefaults(item, helpers, t);
-        applyClusterCatalogGeneralDefaults(item, helpers, t);
-        applyClusterCatalogNetworkingDefaults(item, helpers, t);
-      },
-      wizardTitleKey: t('Create cluster'),
-      wizardDescriptionKey: t(
-        'Select a catalog item, configure, and provision an OpenShift cluster.',
-      ),
-      breadcrumbCreateLabelKey: t('Create'),
-      ariaLabelKey: t('Create cluster wizard'),
-    }),
-    [t],
-  );
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/VmConfigurationStep.tsx b/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/VmConfigurationStep.tsx
deleted file mode 100644
index 05dbcc93..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/VmConfigurationStep.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import { useMemo } from 'react';
-import { Alert, Button, Stack, StackItem } from '@patternfly/react-core';
-
-import type { ComputeInstanceCatalogItem } from '@osac/types';
-import { formatInstanceTypeOptionLabel } from '@osac/ui-components/components/vm/utils';
-
-import {
-  INSTANCE_TYPE_ACTIVE_LIST_FILTER,
-  useInstanceTypes,
-} from '../../../../../api/v1/instance-types';
-import { useTranslation } from '../../../../../hooks/useTranslation';
-import { InputField } from '../../../../Form/InputField';
-import OsacForm from '../../../../Form/OsacForm';
-import { SelectField } from '../../../../Form/SelectField';
-import {
-  getCatalogFieldOverlay,
-  hasCatalogFieldDefinition,
-  readCatalogFieldDefinitions,
-} from '../../catalogOverlay';
-import UserDataField from '../../fields/UserDataField';
-
-interface Props {
-  catalogItem: ComputeInstanceCatalogItem | null;
-}
-
-export const VmConfigurationStep = ({ catalogItem }: Props) => {
-  const { t } = useTranslation();
-
-  const {
-    data: instanceTypes = [],
-    isPending: instanceTypesLoading,
-    isError: instanceTypesError,
-    refetch: refetchInstanceTypes,
-  } = useInstanceTypes({ filter: INSTANCE_TYPE_ACTIVE_LIST_FILTER });
-
-  const instanceTypeOptions = useMemo(
-    () =>
-      instanceTypes.map((instanceType) => ({
-        value: instanceType.id,
-        label: formatInstanceTypeOptionLabel(
-          instanceType,
-          t('catalogProvision.instanceTypes.deprecatedSuffix'),
-        ),
-      })),
-    [instanceTypes, t],
-  );
-
-  const definitions = useMemo(() => readCatalogFieldDefinitions(catalogItem), [catalogItem]);
-
-  const overlays = useMemo(
-    () => ({
-      image: getCatalogFieldOverlay(
-        'spec.image.source_ref',
-        definitions,
-        t('catalogProvision.vm.fields.image'),
-      ),
-      userData: getCatalogFieldOverlay(
-        'spec.user_data',
-        definitions,
-        t('catalogProvision.vm.fields.userData'),
-      ),
-      bootDisk: getCatalogFieldOverlay(
-        'spec.boot_disk.size_gib',
-        definitions,
-        t('catalogProvision.vm.fields.bootDisk'),
-      ),
-      userDataRequired: hasCatalogFieldDefinition('spec.user_data', definitions),
-    }),
-    [definitions, t],
-  );
-
-  if (!catalogItem) {
-    return null;
-  }
-
-  return (
-    <Stack hasGutter>
-      {instanceTypesError ? (
-        <StackItem>
-          <Alert variant="danger" isInline title={t('catalogProvision.instanceTypes.loadError')}>
-            <Button variant="link" isInline onClick={() => void refetchInstanceTypes()}>
-              {t('catalogProvision.actions.retry')}
-            </Button>
-          </Alert>
-        </StackItem>
-      ) : null}
-      <StackItem>
-        <OsacForm>
-          <InputField
-            name="spec.image.sourceRef"
-            label={overlays.image.label}
-            fieldId="vm-image-source-ref"
-            isRequired
-            helperText={t('catalogProvision.vm.fields.imageDescription')}
-            isDisabled={!overlays.image.editable}
-          />
-          <SelectField
-            name="spec.instanceType"
-            label={t('catalogProvision.vm.fields.instanceType')}
-            fieldId="vm-instance-type"
-            isRequired
-            autoSelectSingleOption
-            isLoading={instanceTypesLoading}
-            placeholder={t('catalogProvision.vm.placeholders.selectInstanceType')}
-            options={instanceTypeOptions}
-          />
-          <InputField
-            name="spec.bootDisk.sizeGib"
-            label={overlays.bootDisk.label}
-            fieldId="vm-boot-disk-size"
-            type="number"
-            isRequired
-            helperText={t('catalogProvision.vm.fields.bootDiskDescription')}
-            isDisabled={!overlays.bootDisk.editable}
-          />
-          <UserDataField catalogItem={catalogItem} name="spec.userData" wirePath="spec.user_data" />
-        </OsacForm>
-      </StackItem>
-    </Stack>
-  );
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/VmGeneralStep.tsx b/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/VmGeneralStep.tsx
deleted file mode 100644
index 1e82db90..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/VmGeneralStep.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { ComputeInstanceCatalogItem } from '@osac/types';
-
-import { VM_SSH_KEY_FORM_PATH, VM_SSH_KEY_WIRE_PATH } from './fields';
-import OsacForm from '../../../../Form/OsacForm';
-import NameField from '../../fields/NameField';
-import SshKeyField from '../../fields/SshKeyField';
-
-interface VmGeneralStepProps {
-  catalogItem: ComputeInstanceCatalogItem | null;
-}
-
-const VmGeneralStep = ({ catalogItem }: VmGeneralStepProps) => (
-  <OsacForm>
-    <NameField />
-    <SshKeyField
-      catalogItem={catalogItem}
-      wirePath={VM_SSH_KEY_WIRE_PATH}
-      name={VM_SSH_KEY_FORM_PATH}
-    />
-  </OsacForm>
-);
-
-export default VmGeneralStep;
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/applyCatalogDefaults.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/applyCatalogDefaults.ts
deleted file mode 100644
index 169ae35d..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/applyCatalogDefaults.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import type { FormikHelpers } from 'formik';
-import type { TFunction } from 'i18next';
-
-import type { ComputeInstanceCatalogItem } from '@osac/types';
-
-import type { ComputeInstanceWizardValues } from './fields';
-import {
-  getCatalogFieldOverlay,
-  overlayDefaultToFormValue,
-  readCatalogFieldDefinitions,
-} from '../../catalogOverlay';
-
-const setDefault = (
-  helpers: FormikHelpers<ComputeInstanceWizardValues>,
-  path: string,
-  value: unknown,
-): void => {
-  if (value !== undefined) {
-    void helpers.setFieldValue(path, value);
-  }
-};
-
-/** Apply catalog overlay defaults once when a catalog item is selected. */
-export const applyVmCatalogConfigurationDefaults = (
-  catalogItem: ComputeInstanceCatalogItem,
-  helpers: FormikHelpers<ComputeInstanceWizardValues>,
-  t: TFunction,
-): void => {
-  const definitions = readCatalogFieldDefinitions(catalogItem);
-
-  const imageOverlay = getCatalogFieldOverlay(
-    'spec.image.source_ref',
-    definitions,
-    t('catalogProvision.vm.fields.image'),
-  );
-  const userDataOverlay = getCatalogFieldOverlay(
-    'spec.user_data',
-    definitions,
-    t('catalogProvision.vm.fields.userData'),
-  );
-  const bootDiskOverlay = getCatalogFieldOverlay(
-    'spec.boot_disk.size_gib',
-    definitions,
-    t('catalogProvision.vm.fields.bootDisk'),
-  );
-
-  setDefault(helpers, 'spec.image.sourceRef', overlayDefaultToFormValue(imageOverlay));
-  setDefault(helpers, 'spec.userData', overlayDefaultToFormValue(userDataOverlay));
-  setDefault(helpers, 'spec.bootDisk.sizeGib', overlayDefaultToFormValue(bootDiskOverlay) ?? '');
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/applyCatalogGeneralDefaults.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/applyCatalogGeneralDefaults.ts
deleted file mode 100644
index 6284d3e2..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/applyCatalogGeneralDefaults.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import type { FormikHelpers } from 'formik';
-import type { TFunction } from 'i18next';
-
-import type { ComputeInstanceCatalogItem } from '@osac/types';
-
-import type { ComputeInstanceWizardValues } from './fields';
-import { vmSshKeyWirePath } from './fields';
-import {
-  getCatalogFieldOverlay,
-  overlayDefaultToFormValue,
-  readCatalogFieldDefinitions,
-} from '../../catalogOverlay';
-
-/** Apply General-step catalog defaults for basics fields (e.g. ssh_key) when the catalog defines a default. */
-export const applyVmCatalogGeneralDefaults = (
-  catalogItem: ComputeInstanceCatalogItem,
-  helpers: FormikHelpers<ComputeInstanceWizardValues>,
-  t: TFunction,
-): void => {
-  const definitions = readCatalogFieldDefinitions(catalogItem);
-  const sshKeyOverlay = getCatalogFieldOverlay(
-    vmSshKeyWirePath,
-    definitions,
-    t('catalogProvision.vm.fields.sshKey'),
-  );
-
-  if (sshKeyOverlay.defaultValue !== undefined) {
-    const value = overlayDefaultToFormValue(sshKeyOverlay);
-    if (value !== undefined) {
-      void helpers.setFieldValue('spec.sshKey', value);
-    }
-  }
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/fields.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/fields.ts
deleted file mode 100644
index 5e310ab7..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/fields.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import type { LabeledResourceRef } from '../../../../Form/labeledResourceRef';
-import { EMPTY_LABELED_RESOURCE_REF } from '../../../../Form/labeledResourceRef';
-
-/** VMs are always created in the running state; stop/start is handled on the details page. */
-export const VM_CREATE_RUN_STRATEGY = 'Always' as const;
-
-export interface ComputeInstanceNetworkingValues {
-  virtualNetwork: LabeledResourceRef;
-  subnet: LabeledResourceRef;
-  securityGroups: LabeledResourceRef[];
-}
-
-export interface ComputeInstanceWizardValues {
-  catalogItemId: string;
-  metadata: {
-    name: string;
-  };
-  spec: {
-    sshKey: string;
-    image: {
-      sourceRef: string;
-    };
-    instanceType: LabeledResourceRef;
-    userData: string;
-    bootDisk: {
-      sizeGib: string;
-    };
-    networking: ComputeInstanceNetworkingValues;
-  };
-}
-
-export { EMPTY_LABELED_RESOURCE_REF };
-
-export const VM_SSH_KEY_WIRE_PATH = 'ssh_key';
-export const VM_SSH_KEY_FORM_PATH = 'spec.sshKey';
-export const vmSshKeyWirePath = VM_SSH_KEY_WIRE_PATH;
-
-export const CONFIGURATION_CATALOG_PATHS = [
-  'spec.image.source_ref',
-  'spec.user_data',
-  'spec.boot_disk.size_gib',
-] as const;
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/generalFields.test.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/generalFields.test.ts
deleted file mode 100644
index 5d65de4d..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/generalFields.test.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-
-import type { ComputeInstanceCatalogItem } from '@osac/types';
-import { tIdentity } from '@osac/ui-components/test-utils/i18n';
-
-import { applyVmCatalogGeneralDefaults } from './applyCatalogGeneralDefaults';
-import { buildComputeInstanceCreatePayload, createEmptyComputeInstanceValues } from './payload';
-
-describe('applyVmCatalogGeneralDefaults', () => {
-  it('prefills ssh default from catalog when defined', () => {
-    const setFieldValue = vi.fn();
-    const helpers = { setFieldValue } as never;
-
-    applyVmCatalogGeneralDefaults(
-      {
-        id: 'cat-locked',
-        fieldDefinitions: [
-          {
-            path: 'ssh_key',
-            editable: false,
-            default: { string_value: 'ssh-ed25519 locked' },
-          },
-        ],
-      } as unknown as ComputeInstanceCatalogItem,
-      helpers,
-      tIdentity,
-    );
-    expect(setFieldValue).toHaveBeenCalledWith('spec.sshKey', 'ssh-ed25519 locked');
-
-    setFieldValue.mockClear();
-    applyVmCatalogGeneralDefaults(
-      {
-        id: 'cat-editable',
-        fieldDefinitions: [
-          {
-            path: 'ssh_key',
-            editable: true,
-            default: { string_value: 'ssh-ed25519 default' },
-          },
-        ],
-      } as unknown as ComputeInstanceCatalogItem,
-      helpers,
-      tIdentity,
-    );
-    expect(setFieldValue).toHaveBeenCalledWith('spec.sshKey', 'ssh-ed25519 default');
-  });
-});
-
-describe('buildComputeInstanceCreatePayload ssh key', () => {
-  it('includes read-only ssh key value in client payload', () => {
-    const values = {
-      ...createEmptyComputeInstanceValues(),
-      catalogItemId: 'cat-locked',
-      metadata: { name: 'web-01' },
-      spec: {
-        ...createEmptyComputeInstanceValues().spec,
-        sshKey: 'ssh-ed25519 locked',
-        image: { sourceRef: 'quay.io/example/rhel9' },
-        networking: {
-          virtualNetwork: { value: 'vn-1', label: 'tenant-vn' },
-          subnet: { value: 'subnet-1', label: 'tenant-subnet' },
-          securityGroups: [{ value: 'sg-1', label: 'default-sg' }],
-        },
-      },
-    };
-
-    const vm = buildComputeInstanceCreatePayload(values, {
-      id: 'cat-locked',
-    } as ComputeInstanceCatalogItem);
-    expect(vm.spec?.sshKey).toBe('ssh-ed25519 locked');
-  });
-
-  it('includes prefilled catalog ssh default in client payload', () => {
-    const values = {
-      ...createEmptyComputeInstanceValues(),
-      catalogItemId: 'cat-editable',
-      metadata: { name: 'web-02' },
-      spec: {
-        ...createEmptyComputeInstanceValues().spec,
-        sshKey: 'ssh-ed25519 default',
-        image: { sourceRef: 'quay.io/example/rhel9' },
-        networking: {
-          virtualNetwork: { value: 'vn-1', label: 'tenant-vn' },
-          subnet: { value: 'subnet-1', label: 'tenant-subnet' },
-          securityGroups: [{ value: 'sg-1', label: 'default-sg' }],
-        },
-      },
-    };
-
-    const vm = buildComputeInstanceCreatePayload(values, {
-      id: 'cat-editable',
-    } as ComputeInstanceCatalogItem);
-    expect(vm.spec?.sshKey).toBe('ssh-ed25519 default');
-  });
-
-  it('omits ssh key when tenant clears prefilled default', () => {
-    const values = {
-      ...createEmptyComputeInstanceValues(),
-      catalogItemId: 'cat-editable',
-      metadata: { name: 'web-02' },
-      spec: {
-        ...createEmptyComputeInstanceValues().spec,
-        image: { sourceRef: 'quay.io/example/rhel9' },
-        networking: {
-          virtualNetwork: { value: 'vn-1', label: 'tenant-vn' },
-          subnet: { value: 'subnet-1', label: 'tenant-subnet' },
-          securityGroups: [{ value: 'sg-1', label: 'default-sg' }],
-        },
-      },
-    };
-
-    const vm = buildComputeInstanceCreatePayload(values, {
-      id: 'cat-editable',
-    } as ComputeInstanceCatalogItem);
-    expect(vm.spec?.sshKey).toBeUndefined();
-  });
-});
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/payload.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/payload.ts
deleted file mode 100644
index b8792e96..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/payload.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { type MessageInitShape } from '@bufbuild/protobuf';
-
-import { type ComputeInstanceCatalogItem, ComputeInstanceSchema } from '@osac/types';
-
-import type { ComputeInstanceWizardValues } from './fields';
-import { EMPTY_LABELED_RESOURCE_REF, VM_CREATE_RUN_STRATEGY } from './fields';
-
-export const createEmptyComputeInstanceValues = (): ComputeInstanceWizardValues => ({
-  catalogItemId: '',
-  metadata: { name: '' },
-  spec: {
-    sshKey: '',
-    image: { sourceRef: '' },
-    instanceType: EMPTY_LABELED_RESOURCE_REF,
-    userData: '',
-    bootDisk: { sizeGib: '' },
-    networking: {
-      virtualNetwork: EMPTY_LABELED_RESOURCE_REF,
-      subnet: EMPTY_LABELED_RESOURCE_REF,
-      securityGroups: [],
-    },
-  },
-});
-
-export const buildComputeInstanceCreatePayload = (
-  values: ComputeInstanceWizardValues,
-  catalogItem: ComputeInstanceCatalogItem,
-): MessageInitShape<typeof ComputeInstanceSchema> => {
-  const instanceType = values.spec.instanceType.value.trim();
-
-  const spec: MessageInitShape<typeof ComputeInstanceSchema>['spec'] = {
-    catalogItem: catalogItem.id,
-    instanceType,
-    image: {
-      sourceType: 'registry',
-      sourceRef: values.spec.image.sourceRef.trim(),
-    },
-    runStrategy: VM_CREATE_RUN_STRATEGY,
-    networkAttachments: [
-      {
-        subnet: values.spec.networking.subnet.value,
-        securityGroups: values.spec.networking.securityGroups.map((group) => group.value),
-      },
-    ],
-  };
-
-  const sshKey = values.spec.sshKey.trim();
-  if (sshKey) {
-    spec.sshKey = sshKey;
-  }
-
-  const userData = values.spec.userData.trim();
-  if (userData) {
-    spec.userData = userData;
-  }
-
-  const bootDiskRaw = values.spec.bootDisk.sizeGib.trim();
-  if (bootDiskRaw) {
-    spec.bootDisk = { sizeGib: Number(bootDiskRaw) };
-  }
-
-  return {
-    metadata: { name: values.metadata.name.trim() },
-    spec,
-  };
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/schemas.test.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/schemas.test.ts
deleted file mode 100644
index 7124ccc7..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/schemas.test.ts
+++ /dev/null
@@ -1,230 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { ValidationError } from 'yup';
-
-import type { ComputeInstanceCatalogItem } from '@osac/types';
-import { tIdentity } from '@osac/ui-components/test-utils/i18n';
-
-import type { ComputeInstanceWizardValues } from './fields';
-import { EMPTY_LABELED_RESOURCE_REF } from './fields';
-import { buildComputeInstanceStepSchema } from './schemas';
-
-const vmCatalogItem: ComputeInstanceCatalogItem = {
-  $typeName: 'osac.public.v1.ComputeInstanceCatalogItem',
-  id: 'catalog-rhel-9',
-  metadata: {
-    $typeName: 'osac.public.v1.Metadata',
-    name: 'catalog-rhel-9',
-    annotations: {},
-    creator: 'foo',
-    labels: {},
-    project: 'foo',
-    tenant: 'foo',
-    version: 1,
-  },
-  title: 'RHEL 9 catalog',
-  description: 'RHEL 9 base image',
-  template: 'tpl-rhel-9',
-  published: true,
-  fieldDefinitions: [
-    {
-      $typeName: 'osac.public.v1.FieldDefinition',
-      path: 'spec.image.source_ref',
-      displayName: 'VM image',
-      editable: true,
-      validationSchema: '',
-      default: {
-        $typeName: 'google.protobuf.Value',
-        kind: { case: 'stringValue', value: 'quay.io/example/rhel9' },
-      },
-    },
-  ],
-};
-
-const emptyValues: ComputeInstanceWizardValues = {
-  catalogItemId: '',
-  metadata: { name: '' },
-  spec: {
-    sshKey: '',
-    image: { sourceRef: '' },
-    instanceType: EMPTY_LABELED_RESOURCE_REF,
-    userData: '',
-    bootDisk: { sizeGib: '' },
-    networking: {
-      virtualNetwork: EMPTY_LABELED_RESOURCE_REF,
-      subnet: EMPTY_LABELED_RESOURCE_REF,
-      securityGroups: [],
-    },
-  },
-};
-
-const validateStep = async (
-  stepId: Parameters<typeof buildComputeInstanceStepSchema>[1],
-  values: ComputeInstanceWizardValues,
-  catalogItem: unknown = null,
-) => {
-  const schema = buildComputeInstanceStepSchema(catalogItem, stepId, tIdentity);
-  if (!schema) {
-    return {};
-  }
-  try {
-    await schema.validate(values, { abortEarly: false });
-    return {};
-  } catch (error) {
-    if (!(error instanceof ValidationError)) {
-      throw error;
-    }
-    const errors: Record<string, unknown> = {};
-    for (const inner of error.inner.length > 0 ? error.inner : [error]) {
-      if (!inner.path) {
-        continue;
-      }
-      const parts = inner.path.split('.');
-      let current: Record<string, unknown> = errors;
-      for (let index = 0; index < parts.length - 1; index += 1) {
-        const key = parts[index];
-        if (!current[key] || typeof current[key] !== 'object') {
-          current[key] = {};
-        }
-        current = current[key] as Record<string, unknown>;
-      }
-      current[parts[parts.length - 1]] = inner.message;
-    }
-    return errors;
-  }
-};
-
-describe('buildComputeInstanceStepSchema', () => {
-  it('requires catalog item on catalog step', async () => {
-    const errors = await validateStep('catalog', emptyValues);
-    expect(errors).toEqual({ catalogItemId: 'catalogProvision.validation.catalogItemRequired' });
-  });
-
-  it('requires name on general step without validating configuration fields', async () => {
-    const errors = await validateStep('general', {
-      ...emptyValues,
-      catalogItemId: vmCatalogItem.id,
-      metadata: { name: '   ' },
-    });
-    expect(errors).toEqual({ metadata: { name: 'catalogProvision.validation.nameRequired' } });
-  });
-
-  it('rejects invalid DNS label names on general step', async () => {
-    const errors = await validateStep('general', {
-      ...emptyValues,
-      catalogItemId: vmCatalogItem.id,
-      metadata: { name: 'MyVM' },
-    });
-    expect(errors).toEqual({
-      metadata: {
-        name: 'Name must only contain lowercase letters (a-z), digits (0-9), and hyphens (-)',
-      },
-    });
-  });
-
-  it('accepts valid DNS label name on general step', async () => {
-    const errors = await validateStep('general', {
-      ...emptyValues,
-      catalogItemId: vmCatalogItem.id,
-      metadata: { name: 'my-vm' },
-    });
-    expect(errors).toEqual({});
-  });
-
-  it('validates boot disk as numeric on configuration step only', async () => {
-    const errors = await validateStep(
-      'configuration',
-      {
-        ...emptyValues,
-        catalogItemId: vmCatalogItem.id,
-        metadata: { name: 'web-01' },
-        spec: {
-          ...emptyValues.spec,
-          image: { sourceRef: 'quay.io/example/rhel9' },
-          instanceType: { value: 'standard-4-8', label: 'standard-4-8' },
-          bootDisk: { sizeGib: 'not-a-number' },
-        },
-      },
-      vmCatalogItem,
-    );
-    expect(errors).toEqual({
-      spec: { bootDisk: { sizeGib: 'catalogProvision.validation.bootDiskNumber' } },
-    });
-  });
-
-  it('requires networking pickers on networking step', async () => {
-    const errors = await validateStep(
-      'networking',
-      {
-        ...emptyValues,
-        catalogItemId: vmCatalogItem.id,
-        metadata: { name: 'web-01' },
-        spec: {
-          ...emptyValues.spec,
-          image: { sourceRef: 'quay.io/example/rhel9' },
-        },
-      },
-      vmCatalogItem,
-    );
-    expect(errors).toEqual({
-      spec: {
-        networking: {
-          virtualNetwork: 'catalogProvision.validation.virtualNetworkRequired',
-          subnet: 'catalogProvision.validation.subnetRequired',
-          securityGroups: 'catalogProvision.validation.securityGroupRequired',
-        },
-      },
-    });
-  });
-
-  it('requires instance type and boot disk on configuration step', async () => {
-    const errors = await validateStep(
-      'configuration',
-      {
-        ...emptyValues,
-        catalogItemId: vmCatalogItem.id,
-        metadata: { name: 'web-01' },
-        spec: {
-          ...emptyValues.spec,
-          image: { sourceRef: 'quay.io/example/rhel9' },
-        },
-      },
-      vmCatalogItem,
-    );
-    expect(errors).toEqual({
-      spec: {
-        instanceType: 'catalogProvision.validation.instanceTypeRequired',
-        bootDisk: { sizeGib: 'catalogProvision.validation.required' },
-      },
-    });
-  });
-
-  it('requires ssh key on general step when defined in catalog field_definitions', async () => {
-    const catalogItem = {
-      ...vmCatalogItem,
-      fieldDefinitions: [
-        ...(vmCatalogItem.fieldDefinitions ?? []),
-        {
-          path: 'ssh_key',
-          displayName: 'SSH key',
-          editable: true,
-        },
-      ],
-    };
-    const errors = await validateStep(
-      'general',
-      {
-        ...emptyValues,
-        catalogItemId: vmCatalogItem.id,
-        metadata: { name: 'web-01' },
-      },
-      catalogItem,
-    );
-    expect(errors).toEqual({
-      spec: { sshKey: 'catalogProvision.validation.required' },
-    });
-  });
-
-  it('returns undefined for review step', () => {
-    expect(buildComputeInstanceStepSchema(vmCatalogItem, 'review', tIdentity)).toBeUndefined();
-  });
-});
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/schemas.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/schemas.ts
deleted file mode 100644
index 1b178e81..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/schemas.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-import type { TFunction } from 'i18next';
-import * as yup from 'yup';
-
-import { userDataSchema } from '@osac/ui-components/validation/user-data';
-
-import {
-  labeledResourceRefArraySchema,
-  labeledResourceRefSchema,
-} from '../../../../Form/labeledResourceRefSchema';
-import {
-  getCatalogFieldOverlay,
-  hasCatalogFieldDefinition,
-  mergeCatalogValidation,
-  readCatalogFieldDefinitions,
-} from '../../catalogOverlay';
-import { isValidSshPublicKey } from '../../fields/credentialValidation';
-import { buildMetadataNameSchema } from '../../metadataNameSchema';
-import type { WizardStepId } from '../../stepIds';
-
-const buildComputeInstanceFieldDefinitions = (catalogItem: unknown, t: TFunction) => {
-  const definitions = readCatalogFieldDefinitions(catalogItem);
-
-  const imageOverlay = getCatalogFieldOverlay(
-    'spec.image.source_ref',
-    definitions,
-    t('catalogProvision.vm.fields.image'),
-  );
-  const userDataOverlay = getCatalogFieldOverlay(
-    'spec.user_data',
-    definitions,
-    t('catalogProvision.vm.fields.userData'),
-  );
-  const bootDiskOverlay = getCatalogFieldOverlay(
-    'spec.boot_disk.size_gib',
-    definitions,
-    t('catalogProvision.vm.fields.bootDisk'),
-  );
-  const sshKeyOverlay = getCatalogFieldOverlay('ssh_key', definitions, t('SSH public key'));
-  const sshKeyRequired = hasCatalogFieldDefinition('ssh_key', definitions);
-  const userDataRequired = hasCatalogFieldDefinition('spec.user_data', definitions);
-
-  return {
-    catalogItemId: yup.string().required(t('catalogProvision.validation.catalogItemRequired')),
-    metadataName: buildMetadataNameSchema(t),
-    specSshKey: mergeCatalogValidation(
-      yup
-        .string()
-        .test(
-          'ssh-public-key',
-          t(
-            'SSH public key must be in the form "[TYPE] key [[EMAIL]]". Supported types are ssh-rsa, ssh-ed25519, and ecdsa-sha2-nistp256/384/521.',
-          ),
-          (value) => isValidSshPublicKey(value),
-        ),
-      sshKeyOverlay,
-      sshKeyRequired,
-      t('catalogProvision.validation.required'),
-    ),
-    specImage: yup.object({
-      sourceRef: mergeCatalogValidation(
-        yup.string().trim(),
-        imageOverlay,
-        true,
-        t('catalogProvision.validation.imageRequired'),
-      ),
-    }),
-    specInstanceType: labeledResourceRefSchema(
-      t('catalogProvision.validation.instanceTypeRequired'),
-    ),
-    specUserData: mergeCatalogValidation(
-      userDataSchema(t),
-      userDataOverlay,
-      userDataRequired,
-      t('catalogProvision.validation.required'),
-    ),
-    specBootDisk: yup.object({
-      sizeGib: mergeCatalogValidation(
-        yup
-          .string()
-          .test(
-            'boot-disk-number',
-            t('catalogProvision.validation.bootDiskNumber'),
-            (value) => !value?.trim() || !Number.isNaN(Number(value)),
-          ),
-        bootDiskOverlay,
-        true,
-        t('catalogProvision.validation.required'),
-      ),
-    }),
-    specNetworking: yup.object({
-      virtualNetwork: labeledResourceRefSchema(
-        t('catalogProvision.validation.virtualNetworkRequired'),
-      ),
-      subnet: labeledResourceRefSchema(t('catalogProvision.validation.subnetRequired')),
-      securityGroups: labeledResourceRefArraySchema(
-        t('catalogProvision.validation.securityGroupRequired'),
-      ),
-    }),
-  };
-};
-
-/**
- * Builds a Yup schema for one wizard step only.
- *
- * Formik always validates the full form values against `validationSchema`. If this
- * included every step's fields, blur and Next would fail on steps the user has not
- * reached yet (for example, empty networking while still on General). Returning
- * only the active step's fields keeps validation scoped to the current step.
- */
-export const buildComputeInstanceStepSchema = (
-  catalogItem: unknown,
-  stepId: WizardStepId,
-  t: TFunction,
-): yup.AnyObjectSchema | undefined => {
-  // Review has no editable fields; Create provisions without Formik validation.
-  if (stepId === 'review') {
-    return undefined;
-  }
-
-  const fields = buildComputeInstanceFieldDefinitions(catalogItem, t);
-
-  switch (stepId) {
-    case 'catalog':
-      return yup.object({
-        catalogItemId: fields.catalogItemId,
-      });
-    case 'general':
-      return yup.object({
-        metadata: yup.object({
-          name: fields.metadataName,
-        }),
-        spec: yup.object({
-          sshKey: fields.specSshKey,
-        }),
-      });
-    case 'configuration':
-      return yup.object({
-        spec: yup.object({
-          image: fields.specImage,
-          instanceType: fields.specInstanceType,
-          userData: fields.specUserData,
-          bootDisk: fields.specBootDisk,
-        }),
-      });
-    case 'networking':
-      return yup.object({
-        spec: yup.object({
-          networking: fields.specNetworking,
-        }),
-      });
-    default:
-      return undefined;
-  }
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstanceAdapter.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstanceAdapter.ts
deleted file mode 100644
index 2161f501..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstanceAdapter.ts
+++ /dev/null
@@ -1,152 +0,0 @@
-import { useMemo } from 'react';
-import { type MessageInitShape } from '@bufbuild/protobuf';
-import type { TFunction } from 'i18next';
-
-import { type ComputeInstanceCatalogItem, ComputeInstanceSchema } from '@osac/types';
-
-import {
-  type ReviewSection,
-  formatBootDiskSizeForReview,
-  formatReviewScalar,
-  getCatalogFieldOverlay,
-  readCatalogFieldDefinitions,
-  reviewRow,
-} from '../catalogOverlay';
-import { applyVmCatalogConfigurationDefaults } from './computeInstance/applyCatalogDefaults';
-import { applyVmCatalogGeneralDefaults } from './computeInstance/applyCatalogGeneralDefaults';
-import type { ComputeInstanceWizardValues } from './computeInstance/fields';
-import {
-  buildComputeInstanceCreatePayload,
-  createEmptyComputeInstanceValues,
-} from './computeInstance/payload';
-import { buildComputeInstanceStepSchema } from './computeInstance/schemas';
-import { VmConfigurationStep } from './computeInstance/VmConfigurationStep';
-import VmGeneralStep from './computeInstance/VmGeneralStep';
-import { VmNetworkingStep } from './computeInstance/VmNetworkingStep';
-import type { CatalogProvisionAdapter } from './types';
-import { useComputeInstanceCatalogItems } from '../../../../api/v1/compute-instance-catalog-item';
-import { useTranslation } from '../../../../hooks/useTranslation';
-import {
-  formatLabeledResourceRefForReview,
-  formatLabeledResourceRefsForReview,
-} from '../../../Form/labeledResourceRef';
-
-export {
-  buildComputeInstanceCreatePayload,
-  createEmptyComputeInstanceValues,
-} from './computeInstance/payload';
-
-const buildReviewSections = (
-  values: ComputeInstanceWizardValues,
-  catalogItem: ComputeInstanceCatalogItem,
-  t: TFunction,
-): ReviewSection[] => {
-  const definitions = readCatalogFieldDefinitions(catalogItem);
-  const imageOverlay = getCatalogFieldOverlay(
-    'spec.image.source_ref',
-    definitions,
-    t('catalogProvision.vm.fields.image'),
-  );
-  const userDataOverlay = getCatalogFieldOverlay(
-    'spec.user_data',
-    definitions,
-    t('catalogProvision.vm.fields.userData'),
-  );
-  const bootDiskOverlay = getCatalogFieldOverlay(
-    'spec.boot_disk.size_gib',
-    definitions,
-    t('catalogProvision.vm.fields.bootDisk'),
-  );
-  const sshKeyOverlay = getCatalogFieldOverlay(
-    'ssh_key',
-    definitions,
-    t('catalogProvision.vm.fields.sshKey'),
-  );
-
-  return [
-    {
-      title: t('catalogProvision.steps.general.title'),
-      rows: [
-        reviewRow(t('catalogProvision.vm.fields.name'), formatReviewScalar(values.metadata.name)),
-        reviewRow(sshKeyOverlay.label, formatReviewScalar(values.spec.sshKey, true)),
-      ],
-    },
-    {
-      title: t('catalogProvision.steps.configuration.title'),
-      rows: [
-        reviewRow(imageOverlay.label, formatReviewScalar(values.spec.image.sourceRef)),
-        reviewRow(
-          t('catalogProvision.vm.fields.instanceType'),
-          formatLabeledResourceRefForReview(values.spec.instanceType),
-        ),
-        reviewRow(bootDiskOverlay.label, formatBootDiskSizeForReview(values.spec.bootDisk.sizeGib)),
-        reviewRow(userDataOverlay.label, formatReviewScalar(values.spec.userData, true)),
-      ],
-    },
-    {
-      title: t('catalogProvision.steps.networking.title'),
-      rows: [
-        reviewRow(
-          t('catalogProvision.vm.fields.virtualNetwork'),
-          formatLabeledResourceRefForReview(values.spec.networking.virtualNetwork),
-        ),
-        reviewRow(
-          t('catalogProvision.vm.fields.subnet'),
-          formatLabeledResourceRefForReview(values.spec.networking.subnet),
-        ),
-        reviewRow(
-          t('catalogProvision.vm.fields.securityGroup'),
-          formatLabeledResourceRefsForReview(values.spec.networking.securityGroups),
-        ),
-      ],
-    },
-  ];
-};
-
-export const useComputeInstanceAdapter = (): CatalogProvisionAdapter<
-  ComputeInstanceCatalogItem,
-  ComputeInstanceWizardValues,
-  MessageInitShape<typeof ComputeInstanceSchema>
-> => {
-  const { t } = useTranslation();
-
-  return useMemo(
-    () => ({
-      kind: 'compute_instance' as const,
-      useCatalogItems: () => {
-        const query = useComputeInstanceCatalogItems();
-        return {
-          data: query.data ?? [],
-          isPending: query.isPending,
-          isError: query.isError,
-          refetch: () => {
-            void query.refetch();
-          },
-        };
-      },
-      getInitialValues: (_catalogItem) => createEmptyComputeInstanceValues(),
-      buildCreatePayload: buildComputeInstanceCreatePayload,
-      ConfigurationStep: VmConfigurationStep,
-      NetworkingStep: VmNetworkingStep,
-      GeneralStep: VmGeneralStep,
-      getStepValidationSchema: (catalogItem, stepId) =>
-        buildComputeInstanceStepSchema(catalogItem, stepId, t),
-      getReviewSections: (values, catalogItem) => buildReviewSections(values, catalogItem, t),
-      onCatalogItemSelected: (item, helpers) => {
-        helpers.resetForm({
-          values: {
-            ...createEmptyComputeInstanceValues(),
-            catalogItemId: item.id,
-          },
-        });
-        applyVmCatalogConfigurationDefaults(item, helpers, t);
-        applyVmCatalogGeneralDefaults(item, helpers, t);
-      },
-      wizardTitleKey: 'catalogProvision.vm.wizardTitle',
-      wizardDescriptionKey: 'catalogProvision.vm.wizardDescription',
-      breadcrumbCreateLabelKey: 'catalogProvision.vm.breadcrumbCreate',
-      ariaLabelKey: 'catalogProvision.vm.ariaLabel',
-    }),
-    [t],
-  );
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/types.ts b/libs/ui-components/src/components/catalogProvision/wizard/adapters/types.ts
deleted file mode 100644
index 05c6987e..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/types.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import type { ComponentType } from 'react';
-import type { FormikHelpers } from 'formik';
-import type { AnyObjectSchema } from 'yup';
-
-import type { CatalogItem } from '../../../catalog/catalogItemDisplay';
-import type { CatalogProvisionKind } from '../../catalogFieldDefinition';
-import type { ReviewSection } from '../catalogOverlay';
-import type { WizardStepId } from '../stepIds';
-
-export interface CatalogItemsQueryResult<TItem extends CatalogItem> {
-  data: TItem[];
-  isPending: boolean;
-  isError: boolean;
-  refetch: () => void;
-}
-
-export interface GeneralFieldDescriptor {
-  name: string;
-  labelKey: string;
-  /** Catalog `display_name` override; falls back to `t(labelKey)`. */
-  label?: string;
-  multiline?: boolean;
-  isRequired?: boolean;
-  isPassword?: boolean;
-  isDisabled?: boolean;
-  /** i18n key for InputField helperText (e.g. RFC 1035 DNS label description). */
-  helperTextKey?: string;
-}
-
-export interface CatalogProvisionAdapter<TItem extends CatalogItem, TValues, TPayload> {
-  kind: CatalogProvisionKind;
-  useCatalogItems: () => CatalogItemsQueryResult<TItem>;
-  getInitialValues: (catalogItem: TItem | null) => TValues;
-  buildCreatePayload: (values: TValues, catalogItem: TItem) => TPayload;
-  ConfigurationStep: ComponentType<{ catalogItem: TItem | null }>;
-  NetworkingStep: ComponentType<{ catalogItem: TItem | null }>;
-  GeneralStep: ComponentType<{ catalogItem: TItem | null }>;
-  getStepValidationSchema: (
-    catalogItem: TItem | null,
-    stepId: WizardStepId,
-  ) => AnyObjectSchema | undefined;
-  getReviewSections: (values: TValues, catalogItem: TItem) => ReviewSection[];
-  onCatalogItemSelected?: (item: TItem, helpers: FormikHelpers<TValues>) => void | Promise<void>;
-  wizardTitleKey: string;
-  wizardDescriptionKey: string;
-  breadcrumbCreateLabelKey: string;
-  ariaLabelKey: string;
-}
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/catalogOverlay.test.ts b/libs/ui-components/src/components/catalogProvision/wizard/catalogOverlay.test.ts
deleted file mode 100644
index 44827758..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/catalogOverlay.test.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import * as yup from 'yup';
-
-import type { CatalogFieldDefinition } from '../catalogFieldDefinition';
-import {
-  compileJsonSchemaPattern,
-  matchesJsonSchemaPattern,
-  validateValueAgainstJsonSchema,
-} from '../catalogFieldDefinition';
-import {
-  findCatalogFieldDefinition,
-  formatBootDiskSizeForReview,
-  getCatalogFieldOverlay,
-  hasCatalogFieldDefinition,
-  mergeCatalogValidation,
-} from './catalogOverlay';
-
-const definitions: CatalogFieldDefinition[] = [
-  {
-    path: 'boot_disk.size_gib',
-    displayName: 'Boot disk',
-    editable: true,
-    default: 40,
-  },
-  {
-    path: 'image.source_ref',
-    displayName: 'Image reference',
-    editable: true,
-    default: 'quay.io/containerdisks/fedora:latest',
-  },
-];
-
-describe('findCatalogFieldDefinition', () => {
-  it('matches spec-relative API paths when the wizard queries with a spec. prefix', () => {
-    expect(findCatalogFieldDefinition('spec.boot_disk.size_gib', definitions)?.path).toBe(
-      'boot_disk.size_gib',
-    );
-    expect(findCatalogFieldDefinition('spec.image.source_ref', definitions)?.path).toBe(
-      'image.source_ref',
-    );
-  });
-
-  it('matches when query and definition use the same path form', () => {
-    expect(findCatalogFieldDefinition('boot_disk.size_gib', definitions)?.default).toBe(40);
-  });
-});
-
-describe('hasCatalogFieldDefinition', () => {
-  it('returns true when a matching field definition exists', () => {
-    expect(hasCatalogFieldDefinition('spec.user_data', definitions)).toBe(false);
-    expect(hasCatalogFieldDefinition('spec.boot_disk.size_gib', definitions)).toBe(true);
-  });
-});
-
-describe('getCatalogFieldOverlay', () => {
-  it('returns catalog defaults for spec-prefixed wizard paths', () => {
-    const overlay = getCatalogFieldOverlay('spec.boot_disk.size_gib', definitions, 'Boot disk');
-
-    expect(overlay.defaultValue).toBe(40);
-    expect(overlay.label).toBe('Boot disk');
-  });
-});
-
-describe('formatBootDiskSizeForReview', () => {
-  it('appends GB to numeric boot disk values', () => {
-    expect(formatBootDiskSizeForReview(40)).toBe('40 GB');
-    expect(formatBootDiskSizeForReview('64')).toBe('64 GB');
-  });
-
-  it('returns em dash for empty values', () => {
-    expect(formatBootDiskSizeForReview(undefined)).toBe('—');
-    expect(formatBootDiskSizeForReview('')).toBe('—');
-  });
-});
-
-describe('json schema pattern validation', () => {
-  const cidrSchema = { type: 'string', pattern: '^[0-9./]+$' };
-
-  it('compiles and matches JSON Schema pattern strings', () => {
-    expect(compileJsonSchemaPattern('[')).toBeUndefined();
-    expect(matchesJsonSchemaPattern('10.0.0.0/8', cidrSchema)).toBe(true);
-    expect(matchesJsonSchemaPattern('bad cidr', cidrSchema)).toBe(false);
-  });
-
-  it('validates user-provided values against pattern in validateValueAgainstJsonSchema', () => {
-    expect(
-      validateValueAgainstJsonSchema('10.128.0.0/14', cidrSchema, { displayName: 'Pod CIDR' }),
-    ).toBeNull();
-    expect(
-      validateValueAgainstJsonSchema('not-a-cidr', cidrSchema, { displayName: 'Pod CIDR' }),
-    ).toBe('Pod CIDR must match pattern: ^[0-9./]+$');
-  });
-
-  it('merges validation_schema pattern into Yup via mergeCatalogValidation', async () => {
-    const overlay = getCatalogFieldOverlay(
-      'network.pod_cidr',
-      [
-        {
-          path: 'network.pod_cidr',
-          displayName: 'Pod CIDR',
-          editable: true,
-          validationSchema: cidrSchema,
-        },
-      ],
-      'Pod CIDR',
-    );
-    const rule = mergeCatalogValidation(yup.string(), overlay, false, 'required');
-
-    await expect(rule.validate('10.0.0.0/8')).resolves.toBe('10.0.0.0/8');
-    await expect(rule.validate('')).resolves.toBe('');
-    await expect(rule.validate('invalid!')).rejects.toThrow(
-      'Pod CIDR must match pattern: ^[0-9./]+$',
-    );
-  });
-});
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/catalogOverlay.ts b/libs/ui-components/src/components/catalogProvision/wizard/catalogOverlay.ts
deleted file mode 100644
index 84b76294..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/catalogOverlay.ts
+++ /dev/null
@@ -1,222 +0,0 @@
-import type { TFunction } from 'i18next';
-import type { AnySchema } from 'yup';
-import * as yup from 'yup';
-
-import {
-  type CatalogFieldDefinition,
-  catalogItemFieldDefinitions,
-  compileJsonSchemaPattern,
-  fieldDefinitionDefaultToInputString,
-  jsonSchemaPatternErrorMessage,
-  parseFieldDefinitionDefault,
-} from '../catalogFieldDefinition';
-
-export interface CatalogFieldOverlay {
-  path: string;
-  label: string;
-  editable: boolean;
-  defaultValue?: unknown;
-  validationSchema?: Record<string, unknown>;
-}
-
-const wirePathToFormPath = (wirePath: string): string => {
-  const withSpec = wirePath.startsWith('spec.') ? wirePath : `spec.${wirePath}`;
-  return withSpec
-    .split('.')
-    .map((segment, index) => {
-      if (index === 0) {
-        return segment;
-      }
-      return segment.replace(/_([a-z])/g, (_, letter: string) => letter.toUpperCase());
-    })
-    .join('.');
-};
-
-export const catalogPathToFormPath = (wirePath: string): string => {
-  if (wirePath === 'metadata.name') {
-    return 'metadata.name';
-  }
-  if (wirePath.startsWith('metadata.')) {
-    return wirePath;
-  }
-  return wirePathToFormPath(wirePath);
-};
-
-/** Catalog field_definitions paths are spec-relative and omit the leading `spec.` segment. */
-export const catalogFieldDefinitionWirePaths = (wirePath: string): string[] => {
-  const trimmed = wirePath.trim();
-  if (!trimmed) {
-    return [];
-  }
-  if (trimmed.startsWith('spec.')) {
-    const withoutSpec = trimmed.slice('spec.'.length);
-    return withoutSpec === trimmed ? [trimmed] : [trimmed, withoutSpec];
-  }
-  return [trimmed, `spec.${trimmed}`];
-};
-
-export const findCatalogFieldDefinition = (
-  wirePath: string,
-  definitions: CatalogFieldDefinition[],
-): CatalogFieldDefinition | undefined => {
-  const candidates = new Set(catalogFieldDefinitionWirePaths(wirePath));
-  return definitions.find((entry) => candidates.has(entry.path));
-};
-
-export const hasCatalogFieldDefinition = (
-  wirePath: string,
-  definitions: CatalogFieldDefinition[],
-): boolean => findCatalogFieldDefinition(wirePath, definitions) !== undefined;
-
-export const getCatalogFieldOverlay = (
-  wirePath: string,
-  definitions: CatalogFieldDefinition[],
-  defaultLabel: string,
-): CatalogFieldOverlay => {
-  const def = findCatalogFieldDefinition(wirePath, definitions);
-  if (!def) {
-    return { path: wirePath, label: defaultLabel, editable: true };
-  }
-  const defaultRaw =
-    def.default !== undefined ? parseFieldDefinitionDefault(def.default) : undefined;
-  return {
-    path: wirePath,
-    label: def.displayName || defaultLabel,
-    editable: def.editable,
-    ...(defaultRaw !== undefined ? { defaultValue: defaultRaw } : {}),
-    ...(def.validationSchema ? { validationSchema: def.validationSchema } : {}),
-  };
-};
-
-export const readCatalogFieldDefinitions = (catalogItem: unknown): CatalogFieldDefinition[] =>
-  catalogItemFieldDefinitions(catalogItem);
-
-const yupFromJsonSchema = (
-  schema: Record<string, unknown> | undefined,
-  requiredMessage: string,
-  fieldLabel?: string,
-): AnySchema | undefined => {
-  if (!schema) {
-    return undefined;
-  }
-  const type = schema.type;
-  if (type === 'integer' || type === 'number') {
-    let rule = yup.number().typeError(requiredMessage);
-    if (typeof schema.minimum === 'number') {
-      rule = rule.min(schema.minimum);
-    }
-    if (typeof schema.maximum === 'number') {
-      rule = rule.max(schema.maximum);
-    }
-    return rule;
-  }
-  if (type === 'string') {
-    let rule = yup.string();
-    if (Array.isArray(schema.enum)) {
-      rule = rule.oneOf(schema.enum.map(String));
-    }
-    if (typeof schema.minLength === 'number') {
-      rule = rule.min(schema.minLength);
-    }
-    if (typeof schema.maxLength === 'number') {
-      rule = rule.max(schema.maxLength);
-    }
-    const patternRegex = compileJsonSchemaPattern(schema.pattern);
-    if (patternRegex) {
-      const pattern = typeof schema.pattern === 'string' ? schema.pattern : '';
-      rule = rule.matches(patternRegex, {
-        excludeEmptyString: true,
-        message: jsonSchemaPatternErrorMessage(fieldLabel?.trim() || 'This field', pattern),
-      });
-    }
-    return rule;
-  }
-  if (type === 'boolean') {
-    return yup.boolean();
-  }
-  return undefined;
-};
-
-export const mergeCatalogValidation = (
-  base: AnySchema,
-  overlay: CatalogFieldOverlay | undefined,
-  required: boolean,
-  requiredMessage: string,
-): AnySchema => {
-  const catalogRule = yupFromJsonSchema(overlay?.validationSchema, requiredMessage, overlay?.label);
-  const rule = catalogRule ?? base;
-  if (required) {
-    return rule.required(requiredMessage) as AnySchema;
-  }
-  return rule;
-};
-
-export const overlayDefaultToFormValue = (overlay: CatalogFieldOverlay): unknown => {
-  if (overlay.defaultValue === undefined) {
-    return undefined;
-  }
-  if (typeof overlay.defaultValue === 'boolean') {
-    return overlay.defaultValue;
-  }
-  return fieldDefinitionDefaultToInputString(overlay.defaultValue);
-};
-
-export const setNestedFormValue = (
-  target: Record<string, unknown>,
-  path: string,
-  value: unknown,
-): void => {
-  const parts = path.split('.');
-  let current: Record<string, unknown> = target;
-  for (let index = 0; index < parts.length - 1; index += 1) {
-    const key = parts[index];
-    const next = current[key];
-    if (!next || typeof next !== 'object' || Array.isArray(next)) {
-      current[key] = {};
-    }
-    current = current[key] as Record<string, unknown>;
-  }
-  current[parts[parts.length - 1]] = value;
-};
-
-export const getNestedFormValue = (source: Record<string, unknown>, path: string): unknown => {
-  return path.split('.').reduce<unknown>((current, key) => {
-    if (!current || typeof current !== 'object' || Array.isArray(current)) {
-      return undefined;
-    }
-    return (current as Record<string, unknown>)[key];
-  }, source);
-};
-
-export const formatReviewScalar = (value: unknown, sensitive = false): string => {
-  if (value === undefined || value === null || value === '') {
-    return '—';
-  }
-  if (sensitive && typeof value === 'string' && value.trim()) {
-    return 'Provided';
-  }
-  if (typeof value === 'boolean') {
-    return value ? 'true' : 'false';
-  }
-  if (typeof value === 'string' || typeof value === 'number' || typeof value === 'bigint') {
-    return String(value);
-  }
-  return '—';
-};
-
-export const formatBootDiskSizeForReview = (value: unknown): string => {
-  const formatted = formatReviewScalar(value);
-  if (formatted === '—') {
-    return formatted;
-  }
-  return `${formatted} GB`;
-};
-
-export type ReviewSection = {
-  title: string;
-  rows: Array<{ label: string; value: string }>;
-};
-
-export const reviewRow = (label: string, value: string) => ({ label, value });
-
-export type TranslateFn = TFunction;
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/constants.ts b/libs/ui-components/src/components/catalogProvision/wizard/constants.ts
deleted file mode 100644
index bc55a6f4..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/constants.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/** Shared sizing for catalog wizard multiline fields (SSH key, user data, etc.). */
-export const CATALOG_PROVISION_MULTILINE_TEXTAREA = {
-  rows: 8,
-  resizeOrientation: 'vertical' as const,
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/fields/ClusterPoolSizeField.tsx b/libs/ui-components/src/components/catalogProvision/wizard/fields/ClusterPoolSizeField.tsx
deleted file mode 100644
index e6c98a5c..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/fields/ClusterPoolSizeField.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { useTranslation } from '../../../../hooks/useTranslation';
-import { InputField } from '../../../Form/InputField';
-
-interface ClusterPoolSizeFieldProps {
-  rowIndex: number;
-  isRequired?: boolean;
-}
-
-const ClusterPoolSizeField = ({ rowIndex, isRequired = false }: ClusterPoolSizeFieldProps) => {
-  const { t } = useTranslation();
-
-  return (
-    <InputField
-      name={`spec.nodeSetRows.${rowIndex}.size`}
-      label={t('Nodes')}
-      fieldId={`cluster-node-set-size-${rowIndex}`}
-      isRequired={isRequired}
-      type="number"
-    />
-  );
-};
-
-export default ClusterPoolSizeField;
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/fields/PullSecretField.tsx b/libs/ui-components/src/components/catalogProvision/wizard/fields/PullSecretField.tsx
deleted file mode 100644
index fc14329e..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/fields/PullSecretField.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import type { ClusterCatalogItem } from '@osac/types';
-
-import { useTranslation } from '../../../../hooks/useTranslation';
-import { InputField } from '../../../Form/InputField';
-import { getCatalogFieldOverlay, readCatalogFieldDefinitions } from '../catalogOverlay';
-import { CATALOG_PROVISION_MULTILINE_TEXTAREA } from '../constants';
-
-interface PullSecretFieldProps {
-  catalogItem: ClusterCatalogItem | null;
-}
-
-const PullSecretField = ({ catalogItem }: PullSecretFieldProps) => {
-  const { t } = useTranslation();
-  const definitions = readCatalogFieldDefinitions(catalogItem);
-  const overlay = getCatalogFieldOverlay('pull_secret', definitions, t('Pull secret'));
-
-  return (
-    <InputField
-      name="spec.pullSecret"
-      label={overlay.label}
-      fieldId="spec-pullSecret"
-      isRequired
-      isDisabled={!overlay.editable}
-      multiline
-      rows={CATALOG_PROVISION_MULTILINE_TEXTAREA.rows}
-      resizeOrientation={CATALOG_PROVISION_MULTILINE_TEXTAREA.resizeOrientation}
-      helperText={t(
-        'Pull secrets download OpenShift components and connect clusters to your Red Hat account. Copy the full JSON from OpenShift Cluster Manager (console.redhat.com/openshift/install/pull-secret).',
-      )}
-    />
-  );
-};
-
-export default PullSecretField;
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/fields/SshKeyField.tsx b/libs/ui-components/src/components/catalogProvision/wizard/fields/SshKeyField.tsx
deleted file mode 100644
index 5bed478f..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/fields/SshKeyField.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { useField, useFormikContext } from 'formik';
-
-import { CatalogItem } from '@osac/ui-components/components/catalog/catalogItemDisplay';
-
-import {
-  getCatalogFieldOverlay,
-  hasCatalogFieldDefinition,
-  readCatalogFieldDefinitions,
-} from '../catalogOverlay';
-import { CATALOG_PROVISION_MULTILINE_TEXTAREA } from '../constants';
-import { trimSshPublicKey } from './credentialValidation';
-import { useTranslation } from '../../../../hooks/useTranslation';
-import { InputField } from '../../../Form/InputField';
-
-interface SshKeyFieldProps {
-  catalogItem: CatalogItem | null;
-  wirePath: string;
-  name: string;
-}
-
-const SshKeyField = ({ catalogItem, wirePath, name }: SshKeyFieldProps) => {
-  const { t } = useTranslation();
-  const { setFieldValue } = useFormikContext();
-  const [field] = useField<string>(name);
-  const definitions = readCatalogFieldDefinitions(catalogItem);
-  const overlay = getCatalogFieldOverlay(wirePath, definitions, t('SSH public key'));
-  const isRequired = hasCatalogFieldDefinition(wirePath, definitions);
-
-  const handleBlur = () => {
-    const trimmed = trimSshPublicKey(field.value ?? '');
-    if (trimmed !== field.value) {
-      void setFieldValue(name, trimmed);
-    }
-  };
-
-  return (
-    <InputField
-      name={name}
-      label={overlay.label}
-      fieldId={name.replace(/\./g, '-')}
-      isRequired={isRequired}
-      isDisabled={!overlay.editable}
-      multiline
-      rows={CATALOG_PROVISION_MULTILINE_TEXTAREA.rows}
-      resizeOrientation={CATALOG_PROVISION_MULTILINE_TEXTAREA.resizeOrientation}
-      helperText={t(
-        'Paste a public SSH key for remote access. Supported types: ssh-rsa, ssh-ed25519, and ecdsa-sha2-nistp256/384/521.',
-      )}
-      onBlur={handleBlur}
-    />
-  );
-};
-
-export default SshKeyField;
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/fields/UserDataField.tsx b/libs/ui-components/src/components/catalogProvision/wizard/fields/UserDataField.tsx
deleted file mode 100644
index cea213dd..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/fields/UserDataField.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { CatalogItem } from '@osac/ui-components/components/catalog/catalogItemDisplay';
-import { InputField } from '@osac/ui-components/components/Form/InputField';
-import { useTranslation } from '@osac/ui-components/hooks/useTranslation';
-
-import {
-  getCatalogFieldOverlay,
-  hasCatalogFieldDefinition,
-  readCatalogFieldDefinitions,
-} from '../catalogOverlay';
-import { CATALOG_PROVISION_MULTILINE_TEXTAREA } from '../constants';
-
-type UserDataFieldProps = {
-  catalogItem: CatalogItem | null;
-  wirePath: string;
-  name: string;
-};
-
-const UserDataField = ({ catalogItem, wirePath, name }: UserDataFieldProps) => {
-  const { t } = useTranslation();
-
-  const definitions = readCatalogFieldDefinitions(catalogItem);
-  const overlay = getCatalogFieldOverlay(wirePath, definitions, t('User data'));
-  const isRequired = hasCatalogFieldDefinition(wirePath, definitions);
-  return (
-    <InputField
-      name={name}
-      label={overlay.label}
-      fieldId="bm-user-data"
-      multiline
-      rows={CATALOG_PROVISION_MULTILINE_TEXTAREA.rows}
-      resizeOrientation={CATALOG_PROVISION_MULTILINE_TEXTAREA.resizeOrientation}
-      helperText={t('Optional cloud-init user data (max 64 KB).')}
-      isDisabled={!overlay.editable}
-      isRequired={isRequired}
-    />
-  );
-};
-
-export default UserDataField;
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/fields/credentialValidation.test.ts b/libs/ui-components/src/components/catalogProvision/wizard/fields/credentialValidation.test.ts
deleted file mode 100644
index 3f58684f..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/fields/credentialValidation.test.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { describe, expect, it } from 'vitest';
-
-import { isValidPullSecret, isValidSshPublicKey, trimSshPublicKey } from './credentialValidation';
-
-describe('trimSshPublicKey', () => {
-  it('trims lines and removes empty rows', () => {
-    expect(trimSshPublicKey('  ssh-ed25519 AAAA  user@host\n\n')).toBe(
-      'ssh-ed25519 AAAA  user@host',
-    );
-  });
-});
-
-describe('isValidSshPublicKey', () => {
-  it('accepts empty values', () => {
-    expect(isValidSshPublicKey('')).toBe(true);
-    expect(isValidSshPublicKey(undefined)).toBe(true);
-  });
-
-  it('accepts supported key types', () => {
-    expect(
-      isValidSshPublicKey(
-        'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBJACfzqANDyW1ygNn0FWP7YBZ6XLt+XPGpSw5PyknOW user@host',
-      ),
-    ).toBe(true);
-  });
-
-  it('rejects malformed keys', () => {
-    expect(isValidSshPublicKey('not-a-key')).toBe(false);
-  });
-});
-
-describe('isValidPullSecret', () => {
-  it('accepts well-formed pull secrets', () => {
-    expect(isValidPullSecret('{"auths": {}}')).toBe(true);
-  });
-
-  it('rejects malformed pull secrets', () => {
-    expect(isValidPullSecret('{}')).toBe(false);
-    expect(isValidPullSecret('{"foo":"bar"}')).toBe(false);
-  });
-});
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/fields/credentialValidation.ts b/libs/ui-components/src/components/catalogProvision/wizard/fields/credentialValidation.ts
deleted file mode 100644
index 279cb9cf..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/fields/credentialValidation.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-const SSH_PUBLIC_KEY_REGEX =
-  /^(ssh-rsa AAAAB3NzaC1yc2|ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNT|ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzOD|ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1Mj|ssh-ed25519 AAAAC3NzaC1lZDI1NTE5)[0-9A-Za-z+/]+[=]{0,3}( .*)?$/;
-
-export const trimSshPublicKey = (value: string): string =>
-  value
-    .split('\n')
-    .map((line) => line.trim())
-    .filter((line) => line.length > 0)
-    .join('\n');
-
-export const isValidSshPublicKey = (value?: string): boolean => {
-  if (!value?.trim()) {
-    return true;
-  }
-  return !!trimSshPublicKey(value).match(SSH_PUBLIC_KEY_REGEX);
-};
-
-export const isValidPullSecret = (value?: string): boolean => {
-  if (!value?.trim()) {
-    return true;
-  }
-  try {
-    const pullSecret = JSON.parse(value) as { auths?: unknown };
-    return (
-      pullSecret !== null &&
-      typeof pullSecret === 'object' &&
-      pullSecret.auths !== null &&
-      typeof pullSecret.auths === 'object'
-    );
-  } catch {
-    return false;
-  }
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/metadataNameSchema.test.ts b/libs/ui-components/src/components/catalogProvision/wizard/metadataNameSchema.test.ts
deleted file mode 100644
index 5cdac3b8..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/metadataNameSchema.test.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { ValidationError } from 'yup';
-
-import { buildMetadataNameSchema } from './metadataNameSchema';
-import { tIdentity as t } from '../../../test-utils/i18n';
-
-const validateName = async (name: string) => {
-  const schema = buildMetadataNameSchema(t);
-  try {
-    await schema.validate(name);
-    return undefined;
-  } catch (error) {
-    if (error instanceof ValidationError) {
-      return error.message;
-    }
-    throw error;
-  }
-};
-
-describe('buildMetadataNameSchema', () => {
-  it.each([
-    ['my-cluster', undefined],
-    ['web-vm-1', undefined],
-    ['a', undefined],
-    ['a23456789012345678901234567890123456789012345678901234567890123', undefined],
-  ])('accepts valid DNS label %s', async (name, expected) => {
-    await expect(validateName(name)).resolves.toBe(expected);
-  });
-
-  it.each([
-    ['', 'catalogProvision.validation.nameRequired'],
-    ['   ', 'catalogProvision.validation.nameRequired'],
-    [
-      'a234567890123456789012345678901234567890123456789012345678901234',
-      'Name must be at most 63 characters long',
-    ],
-    ['MyVM', 'Name must only contain lowercase letters (a-z), digits (0-9), and hyphens (-)'],
-    ['my_vm', 'Name must only contain lowercase letters (a-z), digits (0-9), and hyphens (-)'],
-    ['-myvm', 'Name cannot start with a hyphen'],
-    ['myvm-', 'Name cannot end with a hyphen'],
-  ])('rejects invalid name %s', async (name, expectedMessage) => {
-    await expect(validateName(name)).resolves.toBe(expectedMessage);
-  });
-});
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/stepIds.ts b/libs/ui-components/src/components/catalogProvision/wizard/stepIds.ts
deleted file mode 100644
index 6eece8c2..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/stepIds.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { CatalogProvisionKind } from '../catalogFieldDefinition';
-
-export const WIZARD_STEP_IDS = [
-  'catalog',
-  'general',
-  'configuration',
-  'networking',
-  'review',
-] as const;
-
-export type WizardStepId = (typeof WIZARD_STEP_IDS)[number];
-
-export const STEP_LABEL_KEYS: Record<WizardStepId, string> = {
-  catalog: 'catalogProvision.steps.catalog.title',
-  general: 'catalogProvision.steps.general.title',
-  configuration: 'catalogProvision.steps.configuration.title',
-  networking: 'catalogProvision.steps.networking.title',
-  review: 'catalogProvision.steps.review.title',
-};
-
-const BARE_METAL_WIZARD_STEPS: readonly WizardStepId[] = [
-  'catalog',
-  'general',
-  'configuration',
-  'review',
-];
-
-export const getWizardOrderedSteps = (kind?: CatalogProvisionKind): readonly WizardStepId[] => {
-  if (kind === 'bare_metal_instance') {
-    return BARE_METAL_WIZARD_STEPS;
-  }
-  return WIZARD_STEP_IDS;
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/steps/CatalogStep.tsx b/libs/ui-components/src/components/catalogProvision/wizard/steps/CatalogStep.tsx
deleted file mode 100644
index 3763ba4c..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/steps/CatalogStep.tsx
+++ /dev/null
@@ -1,151 +0,0 @@
-import { useMemo, useState } from 'react';
-import {
-  Alert,
-  Bullseye,
-  Button,
-  Content,
-  Flex,
-  FlexItem,
-  Gallery,
-  GalleryItem,
-  SearchInput,
-  Spinner,
-  Stack,
-  StackItem,
-} from '@patternfly/react-core';
-import { useFormikContext } from 'formik';
-
-import { useTranslation } from '../../../../hooks/useTranslation';
-import CatalogItemCard from '../../../catalog/CatalogItemCard';
-import { CatalogItem, filterCatalogItemsBySearch } from '../../../catalog/catalogItemDisplay';
-import { getVisibleFieldError } from '../../../Form/fieldError';
-import { useShowFieldValidationErrors } from '../../../Form/FieldValidationContext';
-import { FormFieldHelper } from '../../../Form/FormFieldHelper';
-import type { CatalogProvisionAdapter } from '../adapters/types';
-
-interface Props<TValues extends { catalogItemId: string }, TPayload> {
-  adapter: CatalogProvisionAdapter<CatalogItem, TValues, TPayload>;
-}
-
-export const CatalogStep = <TValues extends { catalogItemId: string }, TPayload>({
-  adapter,
-}: Props<TValues, TPayload>) => {
-  const { t } = useTranslation();
-  const [search, setSearch] = useState('');
-  const formik = useFormikContext<TValues>();
-  const { values } = formik;
-
-  const {
-    data: catalogItems = [],
-    isPending: catalogLoading,
-    isError: catalogError,
-    refetch: refetchCatalogItems,
-  } = adapter.useCatalogItems();
-
-  const filtered = useMemo(
-    () => filterCatalogItemsBySearch(catalogItems, search),
-    [catalogItems, search],
-  );
-
-  const count = filtered.length;
-  const countPhrase = t('catalogProvision.catalog.count', { count });
-  const showValidationErrors = useShowFieldValidationErrors();
-  const catalogItemError = getVisibleFieldError(
-    formik.getFieldMeta('catalogItemId'),
-    showValidationErrors,
-  );
-
-  const handleSelect = async (item: CatalogItem) => {
-    await adapter.onCatalogItemSelected?.(item, formik);
-  };
-
-  return (
-    <Stack hasGutter>
-      <StackItem>
-        <Flex
-          direction={{ default: 'column', md: 'row' }}
-          flexWrap={{ default: 'wrap' }}
-          alignItems={{ default: 'alignItemsFlexEnd' }}
-          gap={{ default: 'gapMd' }}
-        >
-          <FlexItem flex={{ default: 'flex_1' }}>
-            <SearchInput
-              placeholder={t('catalogProvision.catalog.searchPlaceholder')}
-              value={search}
-              onChange={(_event, value) => setSearch(value)}
-              onClear={() => setSearch('')}
-              aria-label={t('catalogProvision.catalog.searchAria')}
-            />
-          </FlexItem>
-        </Flex>
-      </StackItem>
-      <StackItem>
-        <Content component="p">
-          {catalogLoading ? t('catalogProvision.catalog.loading') : countPhrase}
-        </Content>
-      </StackItem>
-      {catalogItemError ? (
-        <StackItem>
-          <FormFieldHelper error={catalogItemError} fieldId="catalog-item-selection" />
-        </StackItem>
-      ) : null}
-      {catalogError ? (
-        <StackItem>
-          <Stack hasGutter>
-            <StackItem>
-              <Alert variant="danger" title={t('catalogProvision.catalog.loadError')}>
-                {t('catalogProvision.catalog.loadErrorDetail')}
-              </Alert>
-            </StackItem>
-            <StackItem>
-              <Button variant="primary" onClick={() => void refetchCatalogItems()}>
-                {t('catalogProvision.actions.retry')}
-              </Button>
-            </StackItem>
-          </Stack>
-        </StackItem>
-      ) : null}
-      <StackItem>
-        <Gallery
-          hasGutter
-          minWidths={{ default: '200px' }}
-          role="radiogroup"
-          aria-label={t('catalogProvision.steps.catalog.title')}
-        >
-          {catalogLoading ? (
-            <GalleryItem>
-              <Bullseye>
-                <Spinner aria-label={t('catalogProvision.catalog.loading')} />
-              </Bullseye>
-            </GalleryItem>
-          ) : null}
-          {!catalogLoading && !catalogError && count === 0 ? (
-            <GalleryItem>
-              <Content component="p">{t('catalogProvision.catalog.empty')}</Content>
-            </GalleryItem>
-          ) : null}
-          {!catalogLoading &&
-            !catalogError &&
-            filtered.map((item) => {
-              const selected = values.catalogItemId === item.id;
-              return (
-                <GalleryItem key={item.id}>
-                  <CatalogItemCard
-                    item={item}
-                    ouiaId={`catalog-item-option-${item.id}`}
-                    selection={{
-                      selected,
-                      radioName: 'selectedCatalogItem',
-                      onSelect: () => {
-                        void handleSelect(item);
-                      },
-                    }}
-                  />
-                </GalleryItem>
-              );
-            })}
-        </Gallery>
-      </StackItem>
-    </Stack>
-  );
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/steps/ReviewStep.tsx b/libs/ui-components/src/components/catalogProvision/wizard/steps/ReviewStep.tsx
deleted file mode 100644
index c51f331b..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/steps/ReviewStep.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import {
-  DescriptionList,
-  DescriptionListDescription,
-  DescriptionListGroup,
-  DescriptionListTerm,
-} from '@patternfly/react-core';
-
-import { CatalogItem } from '@osac/ui-components/components/catalog/catalogItemDisplay';
-
-import { useTranslation } from '../../../../hooks/useTranslation';
-import type { CatalogProvisionAdapter } from '../adapters/types';
-
-interface Props<TItem extends CatalogItem, TValues extends { catalogItemId: string }, TPayload> {
-  adapter: CatalogProvisionAdapter<TItem, TValues, TPayload>;
-  catalogItem: TItem | null;
-  values: TValues;
-}
-
-export const ReviewStep = <
-  TItem extends CatalogItem,
-  TValues extends { catalogItemId: string },
-  TPayload,
->({
-  adapter,
-  catalogItem,
-  values,
-}: Props<TItem, TValues, TPayload>) => {
-  const { t } = useTranslation();
-  const sections = catalogItem ? adapter.getReviewSections(values, catalogItem) : [];
-  const rows = sections.flatMap((section) => section.rows);
-
-  return (
-    <DescriptionList isHorizontal isCompact aria-label={t('catalogProvision.steps.review.title')}>
-      <DescriptionListGroup>
-        <DescriptionListTerm>{t('catalogProvision.review.catalogItem')}</DescriptionListTerm>
-        <DescriptionListDescription>{catalogItem?.title ?? '—'}</DescriptionListDescription>
-      </DescriptionListGroup>
-      {rows.map((row) => (
-        <DescriptionListGroup key={row.label}>
-          <DescriptionListTerm>{row.label}</DescriptionListTerm>
-          <DescriptionListDescription>{row.value}</DescriptionListDescription>
-        </DescriptionListGroup>
-      ))}
-    </DescriptionList>
-  );
-};
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/steps/WizardSteps.tsx b/libs/ui-components/src/components/catalogProvision/wizard/steps/WizardSteps.tsx
deleted file mode 100644
index f370c685..00000000
--- a/libs/ui-components/src/components/catalogProvision/wizard/steps/WizardSteps.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export { CatalogStep } from './CatalogStep';
-export { ReviewStep } from './ReviewStep';
diff --git a/libs/ui-components/src/components/networking/SecurityGroupCreateModal.tsx b/libs/ui-components/src/components/networking/SecurityGroupCreateModal.tsx
index aaf4d1d3..66110577 100644
--- a/libs/ui-components/src/components/networking/SecurityGroupCreateModal.tsx
+++ b/libs/ui-components/src/components/networking/SecurityGroupCreateModal.tsx
@@ -18,7 +18,6 @@ import type { SecurityGroupSchema } from '@osac/types';
 
 import { useCreateSecurityGroup, useVirtualNetworks } from '../../api/v1/networking';
 import { InputField } from '../../components/Form/InputField';
-import { labeledResourceRefSchema } from '../../components/Form/labeledResourceRefSchema';
 import OsacForm from '../../components/Form/OsacForm';
 import { SelectField } from '../../components/Form/SelectField';
 import { useTranslation } from '../../hooks/useTranslation';
@@ -32,13 +31,13 @@ interface SecurityGroupCreateModalProps {
 
 interface FormValues {
   name: string;
-  virtualNetwork: { value: string; label: string };
+  virtualNetwork: string;
 }
 
 const validationSchema = (t: TFunction) =>
   Yup.object({
     name: Yup.string().required(t('Name is required')),
-    virtualNetwork: labeledResourceRefSchema(t('Virtual network is required')),
+    virtualNetwork: Yup.string().required(t('Virtual network is required')),
   });
 
 export const SecurityGroupCreateModal = ({
@@ -55,26 +54,19 @@ export const SecurityGroupCreateModal = ({
     label: `${vn.metadata?.name ?? vn.id} (${vn.spec?.ipv4Cidr ?? ''})`,
   }));
 
-  const preselectedVirtualNetwork = virtualNetworkId
-    ? (virtualNetworkOptions.find((option) => option.value === virtualNetworkId) ?? {
-        value: virtualNetworkId,
-        label: virtualNetworkId,
-      })
-    : { value: '', label: '' };
-
   return (
     <Formik<FormValues>
       enableReinitialize
       initialValues={{
         name: '',
-        virtualNetwork: preselectedVirtualNetwork,
+        virtualNetwork: virtualNetworkId || '',
       }}
       validationSchema={validationSchema(t)}
       onSubmit={async (values) => {
         try {
           const body: MessageInitShape<typeof SecurityGroupSchema> = {
             metadata: { name: values.name },
-            spec: { virtualNetwork: values.virtualNetwork.value, ingress: [], egress: [] },
+            spec: { virtualNetwork: values.virtualNetwork, ingress: [], egress: [] },
           };
           const sg = await createSecurityGroup.mutateAsync(body);
           navigate(`/networking/security-groups/${sg.id}`);
diff --git a/libs/ui-components/src/components/networking/SecurityGroupRuleForm.tsx b/libs/ui-components/src/components/networking/SecurityGroupRuleForm.tsx
index fcc5766c..95e94efc 100644
--- a/libs/ui-components/src/components/networking/SecurityGroupRuleForm.tsx
+++ b/libs/ui-components/src/components/networking/SecurityGroupRuleForm.tsx
@@ -5,11 +5,10 @@ import { Protocol } from '@osac/types';
 import { protocolToString } from './SecurityGroupRulesTable';
 import { useTranslation } from '../../hooks/useTranslation';
 import { InputField } from '../Form/InputField';
-import type { LabeledResourceRef } from '../Form/labeledResourceRef';
 import { SelectField } from '../Form/SelectField';
 
 export interface RuleFormValues {
-  protocol: LabeledResourceRef;
+  protocol: number;
   portFrom: string;
   portTo: string;
   ipv4Cidr: string;
@@ -21,15 +20,13 @@ export const SecurityGroupRuleForm = () => {
   const { values } = useFormikContext<RuleFormValues>();
 
   const protocolOptions = [
-    { value: String(Protocol.TCP), label: protocolToString(Protocol.TCP, t) },
-    { value: String(Protocol.UDP), label: protocolToString(Protocol.UDP, t) },
-    { value: String(Protocol.ICMP), label: protocolToString(Protocol.ICMP, t) },
-    { value: String(Protocol.ALL), label: protocolToString(Protocol.ALL, t) },
+    { value: Protocol.TCP, label: protocolToString(Protocol.TCP, t) },
+    { value: Protocol.UDP, label: protocolToString(Protocol.UDP, t) },
+    { value: Protocol.ICMP, label: protocolToString(Protocol.ICMP, t) },
+    { value: Protocol.ALL, label: protocolToString(Protocol.ALL, t) },
   ];
 
-  const showPortRange =
-    values.protocol.value === String(Protocol.TCP) ||
-    values.protocol.value === String(Protocol.UDP);
+  const showPortRange = values.protocol === Protocol.TCP || values.protocol === Protocol.UDP;
 
   return (
     <>
diff --git a/libs/ui-components/src/components/networking/SecurityGroupRuleModal.tsx b/libs/ui-components/src/components/networking/SecurityGroupRuleModal.tsx
index f05e61ec..17b26464 100644
--- a/libs/ui-components/src/components/networking/SecurityGroupRuleModal.tsx
+++ b/libs/ui-components/src/components/networking/SecurityGroupRuleModal.tsx
@@ -2,8 +2,6 @@ import { MessageInitShape } from '@bufbuild/protobuf';
 import {
   Alert,
   Button,
-  // eslint-disable-next-line no-restricted-imports
-  Form,
   Modal,
   ModalBody,
   ModalFooter,
@@ -17,16 +15,15 @@ import * as Yup from 'yup';
 import { Protocol, type SecurityGroup, SecurityGroupSchema, type SecurityRule } from '@osac/types';
 
 import { type RuleFormValues, SecurityGroupRuleForm } from './SecurityGroupRuleForm';
-import { protocolToString } from './SecurityGroupRulesTable';
 import { toPlainRule } from './securityGroupRuleUtils';
 import { useUpdateSecurityGroup } from '../../api/v1/networking';
 import { useTranslation } from '../../hooks/useTranslation';
 import { getErrorMessage } from '../../utils/error';
-import { labeledResourceRefSchema } from '../Form/labeledResourceRefSchema';
+import OsacForm from '../Form/OsacForm';
 
 const createRuleValidationSchema = (t: TFunction) =>
   Yup.object({
-    protocol: labeledResourceRefSchema(t('Protocol is required')),
+    protocol: Yup.number().required(t('Protocol is required')),
     portFrom: Yup.string().when('protocol', {
       is: (protocol: { value?: string }) =>
         protocol?.value === String(Protocol.TCP) || protocol?.value === String(Protocol.UDP),
@@ -121,10 +118,7 @@ export const SecurityGroupRuleModal = ({
     ruleIndex !== undefined ? securityGroup.spec?.[direction]?.[ruleIndex] : undefined;
 
   const defaultValues: RuleFormValues = {
-    protocol: {
-      value: String(initialValues?.protocol ?? Protocol.TCP),
-      label: protocolToString(initialValues?.protocol ?? Protocol.TCP, t),
-    },
+    protocol: initialValues?.protocol ?? Protocol.TCP,
     portFrom: initialValues?.portFrom?.toString() ?? '',
     portTo: initialValues?.portTo?.toString() ?? '',
     ipv4Cidr: initialValues?.ipv4Cidr ?? '',
@@ -134,7 +128,7 @@ export const SecurityGroupRuleModal = ({
   const handleSubmit = async (values: RuleFormValues) => {
     try {
       const rule = {
-        protocol: Number(values.protocol.value),
+        protocol: values.protocol,
         ...(values.portFrom &&
           String(values.portFrom).trim() !== '' && {
             portFrom: parseInt(String(values.portFrom), 10),
@@ -187,7 +181,7 @@ export const SecurityGroupRuleModal = ({
         onSubmit={handleSubmit}
       >
         {({ handleSubmit: formikSubmit, isValid }) => (
-          <Form onSubmit={(e) => e.preventDefault()}>
+          <OsacForm>
             <ModalBody>
               {!!updateSecurityGroup.error && (
                 <Alert
@@ -214,7 +208,7 @@ export const SecurityGroupRuleModal = ({
                 {t('Cancel')}
               </Button>
             </ModalFooter>
-          </Form>
+          </OsacForm>
         )}
       </Formik>
     </Modal>
diff --git a/libs/ui-components/src/components/vm/CreateWizard/ComputeInstanceProvisionWizard.tsx b/libs/ui-components/src/components/vm/CreateWizard/ComputeInstanceProvisionWizard.tsx
new file mode 100644
index 00000000..d9c340af
--- /dev/null
+++ b/libs/ui-components/src/components/vm/CreateWizard/ComputeInstanceProvisionWizard.tsx
@@ -0,0 +1,147 @@
+import { useState } from 'react';
+import { useNavigate, useParams } from 'react-router-dom';
+import {
+  Breadcrumb,
+  BreadcrumbItem,
+  Bullseye,
+  Button,
+  Content,
+  PageSection,
+  PageSectionTypes,
+  Spinner,
+  Title,
+  Wizard,
+  WizardStep,
+  WizardStepType,
+} from '@patternfly/react-core';
+import { Formik } from 'formik';
+
+import { useProvisionComputeInstance } from '@osac/ui-components/api/v1/compute-instance';
+import { useComputeInstanceCatalogItems } from '@osac/ui-components/api/v1/compute-instance-catalog-item';
+
+import { buildComputeInstanceCreatePayload } from './payload';
+import { buildFullVmSchema, vmStepHasErrors } from './schemas';
+import { VmConfigurationStep } from './steps/VmConfigurationStep';
+import VmGeneralStep from './steps/VmGeneralStep';
+import { VmNetworkingStep } from './steps/VmNetworkingStep';
+import { VmReview } from './steps/VmReview';
+import { type ComputeInstanceWizardValues, buildVmInitialValues } from './values';
+import { useTranslation } from '../../../hooks/useTranslation';
+import { CatalogStepContent } from '../../catalogProvision/shared/CatalogStepContent';
+import { FieldValidationProvider } from '../../Form/FieldValidationContext';
+import { LeaveFormConfirmation } from '../../Form/LeaveFormConfirmation';
+import { OSACWizardFooter } from '../../Wizard/OSACWizardFooter';
+
+const ComputeInstanceProvisionWizard = () => {
+  const navigate = useNavigate();
+  const { catalogItemId } = useParams<{ catalogItemId?: string }>();
+  const { t } = useTranslation();
+  const { data: catalogItems = [], isLoading, error, refetch } = useComputeInstanceCatalogItems();
+  const provisionVm = useProvisionComputeInstance();
+  const [currentStep, setCurrentStep] = useState<WizardStepType>();
+
+  const initialItem = catalogItemId
+    ? catalogItems.find((item) => item.id === catalogItemId)
+    : undefined;
+
+  if (isLoading) {
+    return (
+      <Bullseye>
+        <Spinner aria-label={t('Loading catalog')} />
+      </Bullseye>
+    );
+  }
+
+  const initialValues = buildVmInitialValues(initialItem);
+
+  const onSubmit = async (
+    values: ComputeInstanceWizardValues,
+    helpers: { setStatus: (status: unknown) => void },
+  ) => {
+    try {
+      const result = await provisionVm.mutateAsync(buildComputeInstanceCreatePayload(values));
+      navigate(`/vms/${result?.id}`);
+    } catch (err) {
+      helpers.setStatus({
+        provisionError:
+          err instanceof Error ? err.message : t('Provisioning failed. Please try again.'),
+      });
+    }
+  };
+
+  return (
+    <Formik
+      initialValues={initialValues}
+      validationSchema={buildFullVmSchema(t)}
+      onSubmit={onSubmit}
+    >
+      {(formik) => (
+        <>
+          <PageSection hasBodyWrapper={false}>
+            <Breadcrumb>
+              <BreadcrumbItem>
+                <Button variant="link" isInline onClick={() => navigate('/vms')}>
+                  {t('Virtual Machines')}
+                </Button>
+              </BreadcrumbItem>
+              <BreadcrumbItem isActive>{t('Create')}</BreadcrumbItem>
+            </Breadcrumb>
+            <Title headingLevel="h1" size="3xl">
+              {t('Create virtual machine')}
+            </Title>
+            <Content component="p">{t('Select a catalog item, configure, and provision.')}</Content>
+          </PageSection>
+          <FieldValidationProvider>
+            <LeaveFormConfirmation />
+            <PageSection
+              hasBodyWrapper={false}
+              type={PageSectionTypes.wizard}
+              aria-label={t('Compute instance provisioning wizard')}
+            >
+              <Wizard
+                navAriaLabel={t('Create virtual machine steps')}
+                isVisitRequired
+                footer={
+                  <OSACWizardFooter
+                    onCancel={() => navigate('/vms')}
+                    stepHasErrors={vmStepHasErrors}
+                  />
+                }
+                onStepChange={(_, step) => {
+                  setCurrentStep(step);
+                }}
+              >
+                <WizardStep id="catalog" name={t('Catalog')}>
+                  {(!currentStep || currentStep.id === 'catalog') && (
+                    <CatalogStepContent
+                      catalogItems={catalogItems}
+                      error={error}
+                      onRefetch={() => void refetch()}
+                      onSelect={(item) => {
+                        formik.resetForm({ values: buildVmInitialValues(item) });
+                      }}
+                    />
+                  )}
+                </WizardStep>
+                <WizardStep id="general" name={t('General')}>
+                  {currentStep?.id === 'general' && <VmGeneralStep />}
+                </WizardStep>
+                <WizardStep id="configuration" name={t('Configuration')}>
+                  {currentStep?.id === 'configuration' && <VmConfigurationStep />}
+                </WizardStep>
+                <WizardStep id="networking" name={t('Networking')}>
+                  {currentStep?.id === 'networking' && <VmNetworkingStep />}
+                </WizardStep>
+                <WizardStep id="review" name={t('Review')}>
+                  {currentStep?.id === 'review' && <VmReview />}
+                </WizardStep>
+              </Wizard>
+            </PageSection>
+          </FieldValidationProvider>
+        </>
+      )}
+    </Formik>
+  );
+};
+
+export default ComputeInstanceProvisionWizard;
diff --git a/libs/ui-components/src/components/vm/CreateWizard/payload.ts b/libs/ui-components/src/components/vm/CreateWizard/payload.ts
new file mode 100644
index 00000000..be9ada15
--- /dev/null
+++ b/libs/ui-components/src/components/vm/CreateWizard/payload.ts
@@ -0,0 +1,69 @@
+import { type MessageInitShape } from '@bufbuild/protobuf';
+
+import { ComputeInstanceSchema } from '@osac/types';
+
+import { type ComputeInstanceWizardValues } from './values';
+import { isFieldEditable } from '../../catalogProvision/utils';
+
+export const buildComputeInstanceCreatePayload = (
+  values: ComputeInstanceWizardValues,
+): MessageInitShape<typeof ComputeInstanceSchema> => {
+  const vm: MessageInitShape<typeof ComputeInstanceSchema> = {
+    metadata: { name: values.metadata.name },
+    spec: {
+      catalogItem: values.catalogItem?.id,
+    },
+  };
+
+  if (vm.spec) {
+    const fds = values.catalogItem?.fieldDefinitions || [];
+
+    if (isFieldEditable('ssh_public_key', fds)) {
+      vm.spec.sshPublicKey = values.spec.sshPublicKey;
+    }
+
+    if (isFieldEditable('user_data', fds)) {
+      vm.spec.userData = values.spec.userData;
+    }
+
+    if (isFieldEditable('boot_disk.size_gib', fds)) {
+      vm.spec.bootDisk = {
+        sizeGib: values.spec.bootDisk.sizeGib,
+      };
+    }
+
+    if (isFieldEditable('instance_type', fds)) {
+      vm.spec.instanceType = values.spec.instanceType;
+    }
+
+    if (isFieldEditable('run_strategy', fds)) {
+      vm.spec.runStrategy = values.spec.runStrategy;
+    }
+
+    if (isFieldEditable('network_attachments', fds)) {
+      vm.spec.networkAttachments = [
+        {
+          subnet: values.spec.networking.subnet,
+          securityGroups: values.spec.networking.securityGroups,
+        },
+      ];
+    }
+
+    if (isFieldEditable('image.source_ref', fds)) {
+      vm.spec.image = {
+        sourceRef: values.spec.image.sourceRef,
+      };
+    }
+
+    if (isFieldEditable('image.source_type', fds)) {
+      if (vm.spec.image) {
+        vm.spec.image.sourceType = 'registry';
+      } else {
+        vm.spec.image = {
+          sourceType: 'registry',
+        };
+      }
+    }
+  }
+  return vm;
+};
diff --git a/libs/ui-components/src/components/vm/CreateWizard/schemas.ts b/libs/ui-components/src/components/vm/CreateWizard/schemas.ts
new file mode 100644
index 00000000..123dff26
--- /dev/null
+++ b/libs/ui-components/src/components/vm/CreateWizard/schemas.ts
@@ -0,0 +1,86 @@
+import type { FormikErrors } from 'formik';
+import type { TFunction } from 'i18next';
+import * as Yup from 'yup';
+
+import { camelKeysToSnake } from '@osac/ui-components/utils/snakeCase';
+import { buildMetadataNameSchema } from '@osac/ui-components/validation/name';
+import { sshPublicKeySchema } from '@osac/ui-components/validation/ssh-public-key';
+import { userDataSchema } from '@osac/ui-components/validation/user-data';
+
+import { buildComputeInstanceCreatePayload } from './payload';
+import type { ComputeInstanceWizardValues } from './values';
+import { buildFieldSchema } from '../../catalogProvision/validation';
+
+export const buildFullVmSchema = (t: TFunction) => {
+  return Yup.lazy((values: ComputeInstanceWizardValues) => {
+    const fds = values.catalogItem?.fieldDefinitions || [];
+    const payload = buildComputeInstanceCreatePayload(values);
+    const snakeSpec = camelKeysToSnake(payload.spec ?? {}) as Record<string, unknown>;
+    const fieldSchema = buildFieldSchema(snakeSpec, fds);
+
+    return Yup.object({
+      catalogItem: Yup.object().required(t('Select a catalog item')),
+      metadata: Yup.object({
+        name: buildMetadataNameSchema(t),
+      }),
+      spec: Yup.object({
+        sshPublicKey: fieldSchema('ssh_public_key', sshPublicKeySchema(t)),
+        userData: fieldSchema('user_data', userDataSchema(t)),
+        image: Yup.object({
+          sourceRef: fieldSchema(
+            'image.source_ref',
+            Yup.string().required(t('VM image is required')),
+          ),
+        }),
+        instanceType: fieldSchema(
+          'instance_type',
+          Yup.string().required(t('Instance type is required')),
+        ),
+        runStrategy: fieldSchema(
+          'run_strategy',
+          Yup.string().required(t('Run strategy is required')),
+        ),
+        bootDisk: Yup.object({
+          sizeGib: fieldSchema(
+            'boot_disk.size_gib',
+            Yup.number()
+              .required(t('Boot disk size is required'))
+              .positive(t('Boot disk size must be greater than zero')),
+          ),
+        }),
+        networking: fieldSchema(
+          'network_attachments',
+          Yup.object({
+            virtualNetwork: Yup.string().required(t('Virtual network is required')),
+            subnet: Yup.string().required(t('Subnet is required')),
+            securityGroups: Yup.array().min(1, t('At least one security group is required')),
+          }),
+        ),
+      }),
+    });
+  });
+};
+
+export const vmStepHasErrors = (
+  stepId: string,
+  errors: FormikErrors<ComputeInstanceWizardValues>,
+): boolean => {
+  switch (stepId) {
+    case 'catalog':
+      return Boolean(errors.catalogItem);
+    case 'general':
+      return Boolean(errors.metadata?.name || errors.spec?.sshPublicKey);
+    case 'configuration':
+      return Boolean(
+        errors.spec?.image ||
+        errors.spec?.instanceType ||
+        errors.spec?.bootDisk ||
+        errors.spec?.userData ||
+        errors.spec?.runStrategy,
+      );
+    case 'networking':
+      return Boolean(errors.spec?.networking);
+    default:
+      return false;
+  }
+};
diff --git a/libs/ui-components/src/components/vm/CreateWizard/steps/VmConfigurationStep.tsx b/libs/ui-components/src/components/vm/CreateWizard/steps/VmConfigurationStep.tsx
new file mode 100644
index 00000000..9305dee6
--- /dev/null
+++ b/libs/ui-components/src/components/vm/CreateWizard/steps/VmConfigurationStep.tsx
@@ -0,0 +1,105 @@
+import { useMemo } from 'react';
+import { Alert, Button, Stack, StackItem } from '@patternfly/react-core';
+import { useFormikContext } from 'formik';
+
+import {
+  INSTANCE_TYPE_ACTIVE_LIST_FILTER,
+  useInstanceTypes,
+} from '@osac/ui-components/api/v1/instance-types';
+import UserDataField from '@osac/ui-components/components/catalogProvision/UserDataField';
+import { isFieldEditable } from '@osac/ui-components/components/catalogProvision/utils';
+import { InputField } from '@osac/ui-components/components/Form/InputField';
+import OsacForm from '@osac/ui-components/components/Form/OsacForm';
+import { SelectField } from '@osac/ui-components/components/Form/SelectField';
+import { formatInstanceTypeOptionLabel } from '@osac/ui-components/components/vm/utils';
+import { getErrorMessage } from '@osac/ui-components/utils/error';
+
+import { useTranslation } from '../../../../hooks/useTranslation';
+import type { ComputeInstanceWizardValues } from '../values';
+
+export const VmConfigurationStep = () => {
+  const { t } = useTranslation();
+  const { values } = useFormikContext<ComputeInstanceWizardValues>();
+
+  const {
+    data: instanceTypes = [],
+    isLoading,
+    error,
+    refetch,
+  } = useInstanceTypes({ filter: INSTANCE_TYPE_ACTIVE_LIST_FILTER });
+
+  const instanceTypeOptions = useMemo(
+    () =>
+      instanceTypes.map((instanceType) => ({
+        value: instanceType.id,
+        label: formatInstanceTypeOptionLabel(instanceType, t(' (deprecated)')),
+      })),
+    [instanceTypes, t],
+  );
+
+  if (!values.catalogItem) {
+    return null;
+  }
+
+  const fds = values.catalogItem.fieldDefinitions;
+
+  return (
+    <Stack hasGutter>
+      {error ? (
+        <StackItem>
+          <Alert variant="danger" isInline title={t('Could not load instance types')}>
+            {getErrorMessage(error)}
+            <Button variant="link" isInline onClick={() => void refetch()}>
+              {t('Retry')}
+            </Button>
+          </Alert>
+        </StackItem>
+      ) : null}
+      <StackItem>
+        <OsacForm>
+          <SelectField
+            name="spec.runStrategy"
+            label={t('Run strategy')}
+            fieldId="vm-run-strategy"
+            isRequired
+            autoSelectSingleOption={isFieldEditable('run_strategy', fds)}
+            placeholder={t('Select a run strategy')}
+            options={[
+              { value: 'Always', label: t('Always') },
+              { value: 'Halted', label: t('Halted') },
+            ]}
+            isDisabled={!isFieldEditable('run_strategy', fds)}
+          />
+          <InputField
+            name="spec.image.sourceRef"
+            label={t('VM image')}
+            fieldId="vm-image-source-ref"
+            isRequired
+            helperText={t('OCI reference')}
+            isDisabled={!isFieldEditable('image.source_ref', fds)}
+          />
+          <SelectField
+            name="spec.instanceType"
+            label={t('Instance type')}
+            fieldId="vm-instance-type"
+            isRequired
+            autoSelectSingleOption={isFieldEditable('instance_type', fds)}
+            isLoading={isLoading}
+            placeholder={t('Select an instance type')}
+            options={instanceTypeOptions}
+            isDisabled={!isFieldEditable('instance_type', fds)}
+          />
+          <InputField
+            name="spec.bootDisk.sizeGib"
+            label={t('Boot disk size (GiB)')}
+            fieldId="vm-boot-disk-size"
+            type="number"
+            isRequired
+            isDisabled={!isFieldEditable('boot_disk.size_gib', fds)}
+          />
+          <UserDataField fieldDefinitions={fds} />
+        </OsacForm>
+      </StackItem>
+    </Stack>
+  );
+};
diff --git a/libs/ui-components/src/components/vm/CreateWizard/steps/VmGeneralStep.tsx b/libs/ui-components/src/components/vm/CreateWizard/steps/VmGeneralStep.tsx
new file mode 100644
index 00000000..6eaf67b8
--- /dev/null
+++ b/libs/ui-components/src/components/vm/CreateWizard/steps/VmGeneralStep.tsx
@@ -0,0 +1,24 @@
+import { useFormikContext } from 'formik';
+
+import NameField from '@osac/ui-components/components/catalogProvision/NameField';
+import SshKeyField from '@osac/ui-components/components/catalogProvision/SshKeyField';
+import OsacForm from '@osac/ui-components/components/Form/OsacForm';
+
+import { ComputeInstanceWizardValues } from '../values';
+
+const VmGeneralStep = () => {
+  const { values } = useFormikContext<ComputeInstanceWizardValues>();
+
+  if (!values.catalogItem) {
+    return null;
+  }
+
+  return (
+    <OsacForm>
+      <NameField />
+      <SshKeyField fieldDefinitions={values.catalogItem.fieldDefinitions} />
+    </OsacForm>
+  );
+};
+
+export default VmGeneralStep;
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/VmNetworkingStep.tsx b/libs/ui-components/src/components/vm/CreateWizard/steps/VmNetworkingStep.tsx
similarity index 72%
rename from libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/VmNetworkingStep.tsx
rename to libs/ui-components/src/components/vm/CreateWizard/steps/VmNetworkingStep.tsx
index d1356f05..e114c959 100644
--- a/libs/ui-components/src/components/catalogProvision/wizard/adapters/computeInstance/VmNetworkingStep.tsx
+++ b/libs/ui-components/src/components/vm/CreateWizard/steps/VmNetworkingStep.tsx
@@ -2,10 +2,8 @@ import { useEffect, useMemo, useRef } from 'react';
 import { Alert, Button, Stack, StackItem } from '@patternfly/react-core';
 import { useFormikContext } from 'formik';
 
-import type { ComputeInstanceCatalogItem } from '@osac/types';
+import { getErrorMessage } from '@osac/ui-components/utils/error';
 
-import type { ComputeInstanceWizardValues } from './fields';
-import { EMPTY_LABELED_RESOURCE_REF } from './fields';
 import {
   VIRTUAL_NETWORK_READY_LIST_FILTER,
   resourceDisplayName,
@@ -14,25 +12,22 @@ import {
   useSubnets,
   useVirtualNetworks,
   virtualNetworkFilterForSubnetList,
-} from '../../../../../api/v1/networking';
-import { useTranslation } from '../../../../../hooks/useTranslation';
-import { MultiSelectField } from '../../../../Form/MultiSelectField';
-import OsacForm from '../../../../Form/OsacForm';
-import { SelectField } from '../../../../Form/SelectField';
-
-interface Props {
-  catalogItem: ComputeInstanceCatalogItem | null;
-}
-
-export const VmNetworkingStep = ({ catalogItem }: Props) => {
+} from '../../../../api/v1/networking';
+import { useTranslation } from '../../../../hooks/useTranslation';
+import { MultiSelectField } from '../../../Form/MultiSelectField';
+import OsacForm from '../../../Form/OsacForm';
+import { SelectField } from '../../../Form/SelectField';
+import type { ComputeInstanceWizardValues } from '../values';
+
+export const VmNetworkingStep = () => {
   const { t } = useTranslation();
   const { values, setFieldValue } = useFormikContext<ComputeInstanceWizardValues>();
-  const virtualNetworkId = values.spec.networking.virtualNetwork.value;
+  const virtualNetworkId = values.spec.networking.virtualNetwork;
 
   const {
     data: virtualNetworks = [],
-    isPending: virtualNetworksLoading,
-    isError: virtualNetworksError,
+    isLoading: virtualNetworksLoading,
+    error: virtualNetworksError,
     refetch: refetchVirtualNetworks,
   } = useVirtualNetworks({ filter: VIRTUAL_NETWORK_READY_LIST_FILTER });
 
@@ -45,8 +40,8 @@ export const VmNetworkingStep = ({ catalogItem }: Props) => {
 
   const {
     data: subnets = [],
-    isPending: subnetsLoading,
-    isError: subnetsError,
+    isLoading: subnetsLoading,
+    error: subnetsError,
     refetch: refetchSubnets,
   } = useSubnets(subnetFilter ? { filter: subnetFilter } : {}, {
     enabled: Boolean(virtualNetworkId),
@@ -54,8 +49,8 @@ export const VmNetworkingStep = ({ catalogItem }: Props) => {
 
   const {
     data: securityGroups = [],
-    isPending: securityGroupsLoading,
-    isError: securityGroupsError,
+    isLoading: securityGroupsLoading,
+    error: securityGroupsError,
     refetch: refetchSecurityGroups,
   } = useSecurityGroups(securityGroupFilter ? { filter: securityGroupFilter } : {}, {
     enabled: Boolean(virtualNetworkId),
@@ -94,17 +89,13 @@ export const VmNetworkingStep = ({ catalogItem }: Props) => {
     const previous = previousVirtualNetworkIdRef.current;
     previousVirtualNetworkIdRef.current = virtualNetworkId;
     if (previous && previous !== virtualNetworkId) {
-      void setFieldValue('spec.networking.subnet', EMPTY_LABELED_RESOURCE_REF);
+      void setFieldValue('spec.networking.subnet', '');
       void setFieldValue('spec.networking.securityGroups', []);
     }
   }, [setFieldValue, virtualNetworkId]);
 
-  if (!catalogItem) {
-    return null;
-  }
-
   const listError = virtualNetworksError || subnetsError || securityGroupsError;
-  const loadingPlaceholder = t('catalogProvision.common.loading');
+  const loadingPlaceholder = t('Loading...');
   const subnetListLoading = Boolean(virtualNetworkId) && subnetsLoading;
   const securityGroupListLoading = Boolean(virtualNetworkId) && securityGroupsLoading;
 
@@ -112,7 +103,8 @@ export const VmNetworkingStep = ({ catalogItem }: Props) => {
     <Stack hasGutter>
       {listError ? (
         <StackItem>
-          <Alert variant="danger" isInline title={t('catalogProvision.networking.loadError')}>
+          <Alert variant="danger" isInline title={t('Could not load networking options')}>
+            {getErrorMessage(listError)}
             <Button
               variant="link"
               isInline
@@ -122,7 +114,7 @@ export const VmNetworkingStep = ({ catalogItem }: Props) => {
                 void refetchSecurityGroups();
               }}
             >
-              {t('catalogProvision.actions.retry')}
+              {t('Retry')}
             </Button>
           </Alert>
         </StackItem>
@@ -131,37 +123,37 @@ export const VmNetworkingStep = ({ catalogItem }: Props) => {
         <OsacForm>
           <SelectField
             name="spec.networking.virtualNetwork"
-            label={t('catalogProvision.vm.fields.virtualNetwork')}
+            label={t('Virtual network')}
             fieldId="vm-virtual-network"
             isRequired
             autoSelectSingleOption
             isLoading={virtualNetworksLoading}
             loadingPlaceholder={loadingPlaceholder}
-            placeholder={t('catalogProvision.vm.placeholders.selectVirtualNetwork')}
+            placeholder={t('Select a virtual network')}
             options={virtualNetworkOptions}
           />
           <SelectField
             name="spec.networking.subnet"
-            label={t('catalogProvision.vm.fields.subnet')}
+            label={t('Subnet')}
             fieldId="vm-subnet"
             isRequired
             autoSelectSingleOption
             isLoading={subnetListLoading}
             isDisabled={!virtualNetworkId}
             loadingPlaceholder={loadingPlaceholder}
-            placeholder={t('catalogProvision.vm.placeholders.selectSubnet')}
+            placeholder={t('Select a subnet')}
             options={subnetOptions}
           />
           <MultiSelectField
             name="spec.networking.securityGroups"
-            label={t('catalogProvision.vm.fields.securityGroup')}
+            label={t('Security groups')}
             fieldId="vm-security-group"
             isRequired
             autoSelectSingleOption
             isLoading={securityGroupListLoading}
             isDisabled={!virtualNetworkId}
             loadingPlaceholder={loadingPlaceholder}
-            placeholder={t('catalogProvision.vm.placeholders.selectSecurityGroup')}
+            placeholder={t('Select security groups')}
             options={securityGroupOptions}
           />
         </OsacForm>
diff --git a/libs/ui-components/src/components/vm/CreateWizard/steps/VmReview.tsx b/libs/ui-components/src/components/vm/CreateWizard/steps/VmReview.tsx
new file mode 100644
index 00000000..fbda6f9a
--- /dev/null
+++ b/libs/ui-components/src/components/vm/CreateWizard/steps/VmReview.tsx
@@ -0,0 +1,106 @@
+import {
+  DescriptionList,
+  DescriptionListDescription,
+  DescriptionListGroup,
+  DescriptionListTerm,
+  Spinner,
+} from '@patternfly/react-core';
+import { useFormikContext } from 'formik';
+
+import { useInstanceType } from '@osac/ui-components/api/v1/instance-types';
+import {
+  resourceDisplayName,
+  useSecurityGroupsByIds,
+  useSubnet,
+  useVirtualNetwork,
+} from '@osac/ui-components/api/v1/networking';
+
+import { useTranslation } from '../../../../hooks/useTranslation';
+import { formatInstanceTypeOptionLabel } from '../../utils';
+import type { ComputeInstanceWizardValues } from '../values';
+
+export const VmReview = () => {
+  const { t } = useTranslation();
+  const { values } = useFormikContext<ComputeInstanceWizardValues>();
+
+  const { data: instanceType, isLoading: instanceTypeLoading } = useInstanceType(
+    values.spec.instanceType,
+  );
+
+  const { data: virtualNetwork, isLoading: virtualNetworkLoading } = useVirtualNetwork(
+    values.spec.networking.virtualNetwork,
+  );
+
+  const { data: subnet, isLoading: subnetLoading } = useSubnet(values.spec.networking.subnet);
+
+  const { data: securityGroups = [], isLoading: scLoading } = useSecurityGroupsByIds(
+    values.spec.networking.securityGroups,
+  );
+
+  if (instanceTypeLoading || virtualNetworkLoading || subnetLoading || scLoading) {
+    return <Spinner />;
+  }
+
+  const sections = [
+    {
+      title: t('General'),
+      rows: [
+        { label: t('Name'), value: values.metadata.name },
+        { label: t('SSH public key'), value: values.spec.sshPublicKey || '-' },
+      ],
+    },
+    {
+      title: t('Configuration'),
+      rows: [
+        { label: t('VM image'), value: values.spec.image.sourceRef || '-' },
+        {
+          label: t('Instance type'),
+          value: instanceType
+            ? formatInstanceTypeOptionLabel(instanceType)
+            : values.spec.instanceType,
+        },
+        {
+          label: t('Run strategy'),
+          value: values.spec.runStrategy || '-',
+        },
+        { label: t('Boot disk size (GiB)'), value: values.spec.bootDisk.sizeGib },
+        { label: t('User data'), value: values.spec.userData || '-' },
+      ],
+    },
+    {
+      title: t('Networking'),
+      rows: [
+        {
+          label: t('Virtual network'),
+          value: resourceDisplayName(virtualNetwork?.metadata, virtualNetwork?.id),
+        },
+        {
+          label: t('Subnet'),
+          value: resourceDisplayName(subnet?.metadata, subnet?.id),
+        },
+        {
+          label: t('Security groups'),
+          value:
+            securityGroups.map((sc) => resourceDisplayName(sc.metadata, sc.id)).join(', ') || '-',
+        },
+      ],
+    },
+  ];
+
+  const rows = sections.flatMap((section) => section.rows);
+
+  return (
+    <DescriptionList isHorizontal isCompact aria-label={t('Review')}>
+      <DescriptionListGroup>
+        <DescriptionListTerm>{t('Catalog item')}</DescriptionListTerm>
+        <DescriptionListDescription>{values.catalogItem?.title ?? '—'}</DescriptionListDescription>
+      </DescriptionListGroup>
+      {rows.map((row) => (
+        <DescriptionListGroup key={row.label}>
+          <DescriptionListTerm>{row.label}</DescriptionListTerm>
+          <DescriptionListDescription>{row.value}</DescriptionListDescription>
+        </DescriptionListGroup>
+      ))}
+    </DescriptionList>
+  );
+};
diff --git a/libs/ui-components/src/components/vm/CreateWizard/values.ts b/libs/ui-components/src/components/vm/CreateWizard/values.ts
new file mode 100644
index 00000000..b08aa343
--- /dev/null
+++ b/libs/ui-components/src/components/vm/CreateWizard/values.ts
@@ -0,0 +1,94 @@
+import { type ComputeInstanceCatalogItem } from '@osac/types';
+
+import { getNumberDefaultValue, getStringDefaultValue } from '../../catalogProvision/utils';
+import { clearSchemaCache } from '../../catalogProvision/validation';
+
+export interface ComputeInstanceWizardValues {
+  catalogItem: ComputeInstanceCatalogItem | undefined;
+  metadata: {
+    name: string;
+  };
+  spec: {
+    sshPublicKey: string;
+    image: {
+      sourceRef: string;
+    };
+    instanceType: string;
+    runStrategy: string;
+    userData: string;
+    bootDisk: {
+      sizeGib: number;
+    };
+    networking: {
+      virtualNetwork: string;
+      subnet: string;
+      securityGroups: string[];
+    };
+  };
+}
+
+const emptyComputeInstanceValues = (
+  catalogItem: ComputeInstanceCatalogItem | undefined,
+): ComputeInstanceWizardValues => ({
+  catalogItem,
+  metadata: {
+    name: '',
+  },
+  spec: {
+    bootDisk: {
+      sizeGib: 0,
+    },
+    image: {
+      sourceRef: '',
+    },
+    instanceType: '',
+    runStrategy: '',
+    networking: {
+      securityGroups: [],
+      subnet: '',
+      virtualNetwork: '',
+    },
+    sshPublicKey: '',
+    userData: '',
+  },
+});
+
+export const buildVmInitialValues = (
+  catalogItem: ComputeInstanceCatalogItem | undefined,
+): ComputeInstanceWizardValues => {
+  clearSchemaCache();
+  const base = emptyComputeInstanceValues(catalogItem);
+  const fds = catalogItem?.fieldDefinitions || [];
+
+  const defaultSourceRef = getStringDefaultValue('image.source_ref', fds);
+  if (defaultSourceRef) {
+    base.spec.image.sourceRef = defaultSourceRef;
+  }
+
+  const defaultUserData = getStringDefaultValue('user_data', fds);
+  if (defaultUserData) {
+    base.spec.userData = defaultUserData;
+  }
+
+  const defaultBootDisk = getNumberDefaultValue('boot_disk.size_gib', fds);
+  if (defaultBootDisk !== undefined) {
+    base.spec.bootDisk.sizeGib = defaultBootDisk;
+  }
+
+  const defaultSshKey = getStringDefaultValue('ssh_public_key', fds);
+  if (defaultSshKey) {
+    base.spec.sshPublicKey = defaultSshKey;
+  }
+
+  const defaultInstanceType = getStringDefaultValue('instance_type', fds);
+  if (defaultInstanceType) {
+    base.spec.instanceType = defaultInstanceType;
+  }
+
+  const defaultRunStrategy = getStringDefaultValue('run_strategy', fds);
+  if (defaultRunStrategy) {
+    base.spec.runStrategy = defaultRunStrategy;
+  }
+
+  return base;
+};
diff --git a/libs/ui-components/src/components/vm/DetailsPage/VmDetailsActionButtons.tsx b/libs/ui-components/src/components/vm/DetailsPage/VmDetailsActionButtons.tsx
index 8f19c434..0e301ff6 100644
--- a/libs/ui-components/src/components/vm/DetailsPage/VmDetailsActionButtons.tsx
+++ b/libs/ui-components/src/components/vm/DetailsPage/VmDetailsActionButtons.tsx
@@ -33,7 +33,7 @@ const VmDetailsActionButtons = ({ vm }: VmDetailsActionButtonsProps) => {
     state === ComputeInstanceState.RUNNING || state === ComputeInstanceState.PAUSED;
   const canDelete =
     state !== ComputeInstanceState.DELETING && state !== ComputeInstanceState.STARTING;
-  const canAttachPublicIp = state === ComputeInstanceState.RUNNING && !vm.status?.publicIpAddress;
+  const canAttachPublicIp = state === ComputeInstanceState.RUNNING && !vm.status?.externalIpAddress;
 
   return (
     <>
diff --git a/libs/ui-components/src/components/vm/DetailsPage/VmDetailsCard.test.tsx b/libs/ui-components/src/components/vm/DetailsPage/VmDetailsCard.test.tsx
index 5dcb691f..7c36c3c6 100644
--- a/libs/ui-components/src/components/vm/DetailsPage/VmDetailsCard.test.tsx
+++ b/libs/ui-components/src/components/vm/DetailsPage/VmDetailsCard.test.tsx
@@ -37,7 +37,7 @@ const catalogVm: ComputeInstance = {
   spec: {
     $typeName: 'osac.public.v1.ComputeInstanceSpec',
     catalogItem: 'catalog-rhel-9',
-    sshKey: 'ssh-rsa AAAA...',
+    sshPublicKey: 'ssh-rsa AAAA...',
     image: {
       $typeName: 'osac.public.v1.ComputeInstanceImage',
       sourceRef: 'quay.io/example/rhel9',
@@ -63,7 +63,6 @@ describe('VmDetailsCard', () => {
   it('shows catalog fields with full SSH key', () => {
     vi.mocked(useVmDetailsDisplay).mockReturnValue({
       catalogItemId: 'catalog-rhel-9',
-      hasCatalogItem: true,
       isCatalogItemLoading: false,
       instanceType: {
         $typeName: 'osac.public.v1.InstanceType',
@@ -88,54 +87,33 @@ describe('VmDetailsCard', () => {
       },
       instanceTypeId: 'standard-4-8',
       isInstanceTypeLoading: false,
-      fieldLabels: {
-        sshKey: 'SSH public key',
-        image: 'VM image',
-        bootDisk: 'Boot disk',
-        userData: 'User Data',
-      },
       networkingRows: [],
       catalogItem: undefined,
-    });
+    } as ReturnType<typeof useVmDetailsDisplay>);
 
     renderCard();
 
     expect(screen.getByText('Details')).toBeInTheDocument();
     expect(screen.getByText('web-01')).toBeInTheDocument();
     expect(screen.getByText('ssh-rsa AAAA...')).toBeInTheDocument();
-    expect(screen.getByText('40 GB')).toBeInTheDocument();
+    expect(screen.getByText('40')).toBeInTheDocument();
     expect(screen.getByText('alice')).toBeInTheDocument();
-    expect(screen.queryByText('User Data')).not.toBeInTheDocument();
-    expect(screen.queryByText('Run strategy')).not.toBeInTheDocument();
-    expect(screen.queryByText('Tenants')).not.toBeInTheDocument();
-    expect(screen.queryByText('Version')).not.toBeInTheDocument();
-    expect(screen.queryByText('Creators')).not.toBeInTheDocument();
     expect(screen.getByText('Creator')).toBeInTheDocument();
   });
 
-  it('shows degraded message when catalog item is missing', () => {
+  it('shows details with fallback values when catalog item is missing', () => {
     vi.mocked(useVmDetailsDisplay).mockReturnValue({
       catalogItemId: undefined,
-      hasCatalogItem: false,
       isCatalogItemLoading: false,
       instanceType: undefined,
       instanceTypeId: undefined,
       isInstanceTypeLoading: false,
-      fieldLabels: {
-        sshKey: 'SSH public key',
-        image: 'VM image',
-        bootDisk: 'Boot disk',
-        userData: 'User Data',
-      },
       networkingRows: [],
       catalogItem: undefined,
-    });
+    } as ReturnType<typeof useVmDetailsDisplay>);
 
     renderCard({ id: 'vm-2', metadata: { name: 'legacy-vm' } } as ComputeInstance);
-    expect(
-      screen.getByText('Catalog configuration is unavailable for this virtual machine.'),
-    ).toBeInTheDocument();
+    expect(screen.getByText('Details')).toBeInTheDocument();
     expect(screen.getByText('legacy-vm')).toBeInTheDocument();
-    expect(screen.queryByText('SSH public key')).not.toBeInTheDocument();
   });
 });
diff --git a/libs/ui-components/src/components/vm/DetailsPage/VmDetailsCard.tsx b/libs/ui-components/src/components/vm/DetailsPage/VmDetailsCard.tsx
index 3d85e121..1121db94 100644
--- a/libs/ui-components/src/components/vm/DetailsPage/VmDetailsCard.tsx
+++ b/libs/ui-components/src/components/vm/DetailsPage/VmDetailsCard.tsx
@@ -15,9 +15,7 @@ import { useVmDetailsDisplay } from './useVmDetailsDisplay';
 import VmDetailsCatalogValue from './VmDetailsCatalogValue';
 import { useTranslation } from '../../../hooks/useTranslation';
 import { displayValue } from '../../../utils/detailFormatters';
-import { formatBootDiskSizeForReview } from '../../catalogProvision/wizard/catalogOverlay';
 import { Timestamp } from '../../Primitives/Timestamp';
-import { SubtleContent } from '../../SubtleContent/SubtleContent';
 import { formatInstanceTypeReviewLabelFromType } from '../utils';
 
 interface Props {
@@ -28,80 +26,65 @@ const VmDetailsCard = ({ vm }: Props) => {
   const { t } = useTranslation();
   const {
     catalogItemId,
-    hasCatalogItem,
     isCatalogItemLoading,
     instanceType,
     instanceTypeId,
     isInstanceTypeLoading,
-    fieldLabels,
   } = useVmDetailsDisplay(vm);
 
   return (
     <Card isFullHeight>
       <CardTitle>{t('Details')}</CardTitle>
       <CardBody>
-        {!hasCatalogItem ? (
-          <SubtleContent component="p">
-            {t('Catalog configuration is unavailable for this virtual machine.')}
-          </SubtleContent>
-        ) : null}
         <DescriptionList isCompact>
-          {hasCatalogItem ? (
-            <DescriptionListGroup>
-              <DescriptionListTerm>{t('Catalog item')}</DescriptionListTerm>
-              <DescriptionListDescription>
-                {isCatalogItemLoading ? (
-                  <Skeleton width="150px" />
-                ) : (
-                  <VmDetailsCatalogValue catalogItemId={catalogItemId} />
-                )}
-              </DescriptionListDescription>
-            </DescriptionListGroup>
-          ) : null}
           <DescriptionListGroup>
-            <DescriptionListTerm>{t('catalogProvision.vm.fields.name')}</DescriptionListTerm>
+            <DescriptionListTerm>{t('Catalog item')}</DescriptionListTerm>
+            <DescriptionListDescription>
+              {isCatalogItemLoading ? (
+                <Skeleton width="150px" />
+              ) : (
+                <VmDetailsCatalogValue catalogItemId={catalogItemId} />
+              )}
+            </DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>{t('Name')}</DescriptionListTerm>
             <DescriptionListDescription>
               {displayValue(vm.metadata?.name)}
             </DescriptionListDescription>
           </DescriptionListGroup>
-          {hasCatalogItem ? (
-            <>
-              <DescriptionListGroup>
-                <DescriptionListTerm>{fieldLabels.sshKey}</DescriptionListTerm>
-                <DescriptionListDescription>
-                  {displayValue(vm.spec?.sshKey)}
-                </DescriptionListDescription>
-              </DescriptionListGroup>
-              <DescriptionListGroup>
-                <DescriptionListTerm>{fieldLabels.image}</DescriptionListTerm>
-                <DescriptionListDescription>
-                  {displayValue(vm.spec?.image?.sourceRef)}
-                </DescriptionListDescription>
-              </DescriptionListGroup>
-              <DescriptionListGroup>
-                <DescriptionListTerm>
-                  {t('catalogProvision.vm.fields.instanceType')}
-                </DescriptionListTerm>
-                <DescriptionListDescription>
-                  {isInstanceTypeLoading && instanceTypeId?.trim() ? (
-                    <Skeleton width="150px" />
-                  ) : (
-                    formatInstanceTypeReviewLabelFromType(
-                      instanceType,
-                      t('catalogProvision.instanceTypes.deprecatedSuffix'),
-                      instanceTypeId,
-                    )
-                  )}
-                </DescriptionListDescription>
-              </DescriptionListGroup>
-              <DescriptionListGroup>
-                <DescriptionListTerm>{fieldLabels.bootDisk}</DescriptionListTerm>
-                <DescriptionListDescription>
-                  {formatBootDiskSizeForReview(vm.spec?.bootDisk?.sizeGib)}
-                </DescriptionListDescription>
-              </DescriptionListGroup>
-            </>
-          ) : null}
+          <DescriptionListGroup>
+            <DescriptionListTerm>{t('SSH public key')}</DescriptionListTerm>
+            <DescriptionListDescription>
+              {displayValue(vm.spec?.sshPublicKey)}
+            </DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>{t('VM image')}</DescriptionListTerm>
+            <DescriptionListDescription>
+              {displayValue(vm.spec?.image?.sourceRef)}
+            </DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>{t('Instance type')}</DescriptionListTerm>
+            <DescriptionListDescription>
+              {isInstanceTypeLoading && instanceTypeId?.trim() ? (
+                <Skeleton width="150px" />
+              ) : (
+                formatInstanceTypeReviewLabelFromType(
+                  instanceType,
+                  t(' (deprecated)'),
+                  instanceTypeId,
+                )
+              )}
+            </DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>{t('Boot disk size')}</DescriptionListTerm>
+            <DescriptionListDescription>
+              {vm.spec?.bootDisk?.sizeGib || '-'}
+            </DescriptionListDescription>
+          </DescriptionListGroup>
           <DescriptionListGroup>
             <DescriptionListTerm>{t('Created')}</DescriptionListTerm>
             <DescriptionListDescription>
diff --git a/libs/ui-components/src/components/vm/DetailsPage/VmDetailsSummary.test.tsx b/libs/ui-components/src/components/vm/DetailsPage/VmDetailsSummary.test.tsx
index 73a5f857..912baaca 100644
--- a/libs/ui-components/src/components/vm/DetailsPage/VmDetailsSummary.test.tsx
+++ b/libs/ui-components/src/components/vm/DetailsPage/VmDetailsSummary.test.tsx
@@ -19,7 +19,7 @@ vi.mock('../VmInstanceTypeLabel', () => ({
 const vm = {
   id: 'vm-1',
   spec: { instanceType: 'standard-4-8' },
-  status: { publicIpAddress: '203.0.113.1', internalIpAddress: '10.0.0.5' },
+  status: { externalIpAddress: '203.0.113.1', internalIpAddress: '10.0.0.5' },
 } as ComputeInstance;
 
 const standardInstanceType = {
diff --git a/libs/ui-components/src/components/vm/DetailsPage/VmDetailsSummary.tsx b/libs/ui-components/src/components/vm/DetailsPage/VmDetailsSummary.tsx
index 62cc69d3..83cae40d 100644
--- a/libs/ui-components/src/components/vm/DetailsPage/VmDetailsSummary.tsx
+++ b/libs/ui-components/src/components/vm/DetailsPage/VmDetailsSummary.tsx
@@ -55,7 +55,7 @@ const VmDetailsSummary = ({
 }: VmDetailsSummaryProps) => {
   const { t } = useTranslation();
   const instanceTypeId = vm.spec?.instanceType?.trim();
-  const publicIp = vm.status?.publicIpAddress;
+  const publicIp = vm.status?.externalIpAddress;
   const internalIp = vm.status?.internalIpAddress;
 
   return (
diff --git a/libs/ui-components/src/components/vm/DetailsPage/VmNetworkingTab.test.tsx b/libs/ui-components/src/components/vm/DetailsPage/VmNetworkingTab.test.tsx
index 2a8aac14..57f2d4b0 100644
--- a/libs/ui-components/src/components/vm/DetailsPage/VmNetworkingTab.test.tsx
+++ b/libs/ui-components/src/components/vm/DetailsPage/VmNetworkingTab.test.tsx
@@ -25,17 +25,10 @@ describe('VmNetworkingTab', () => {
         },
       ],
       catalogItemId: 'catalog-rhel-9',
-      hasCatalogItem: true,
       isCatalogItemLoading: false,
       instanceType: undefined,
       instanceTypeId: undefined,
       isInstanceTypeLoading: false,
-      fieldLabels: {
-        sshKey: '',
-        image: '',
-        bootDisk: '',
-        userData: '',
-      },
       catalogItem: undefined,
     });
 
@@ -57,17 +50,10 @@ describe('VmNetworkingTab', () => {
     vi.mocked(useVmDetailsDisplay).mockReturnValue({
       networkingRows: [],
       catalogItemId: undefined,
-      hasCatalogItem: false,
       isCatalogItemLoading: false,
       instanceType: undefined,
       instanceTypeId: undefined,
       isInstanceTypeLoading: false,
-      fieldLabels: {
-        sshKey: '',
-        image: '',
-        bootDisk: '',
-        userData: '',
-      },
       catalogItem: undefined,
     });
 
diff --git a/libs/ui-components/src/components/vm/DetailsPage/VmUserDataCard.test.tsx b/libs/ui-components/src/components/vm/DetailsPage/VmUserDataCard.test.tsx
index 401171b0..7a415932 100644
--- a/libs/ui-components/src/components/vm/DetailsPage/VmUserDataCard.test.tsx
+++ b/libs/ui-components/src/components/vm/DetailsPage/VmUserDataCard.test.tsx
@@ -1,17 +1,11 @@
 import { screen } from '@testing-library/react';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { describe, expect, it } from 'vitest';
 
 import type { ComputeInstance } from '@osac/types';
 
 import VmUserDataCard from './VmUserDataCard';
 import { renderWithProviders } from '../../../test-utils/TestProviders';
 
-vi.mock('./useVmDetailsDisplay', () => ({
-  useVmDetailsDisplay: vi.fn(),
-}));
-
-const { useVmDetailsDisplay } = await import('./useVmDetailsDisplay');
-
 const catalogVm = {
   id: 'vm-1',
   spec: {
@@ -24,20 +18,6 @@ const renderCard = (vm: ComputeInstance = catalogVm) =>
   renderWithProviders(<VmUserDataCard vm={vm} />);
 
 describe('VmUserDataCard', () => {
-  beforeEach(() => {
-    vi.mocked(useVmDetailsDisplay).mockReturnValue({
-      hasCatalogItem: true,
-      fieldLabels: { userData: 'User Data', sshKey: '', image: '', bootDisk: '' },
-      catalogItemId: 'catalog-rhel-9',
-      isCatalogItemLoading: false,
-      instanceType: undefined,
-      instanceTypeId: undefined,
-      isInstanceTypeLoading: false,
-      networkingRows: [],
-      catalogItem: undefined,
-    });
-  });
-
   it('renders nothing when user data is empty', () => {
     const { container } = renderCard({
       id: 'vm-1',
@@ -46,21 +26,10 @@ describe('VmUserDataCard', () => {
     expect(container).toBeEmptyDOMElement();
   });
 
-  it('renders nothing when catalog item is missing', () => {
-    vi.mocked(useVmDetailsDisplay).mockReturnValue({
-      hasCatalogItem: false,
-      fieldLabels: { userData: 'User Data', sshKey: '', image: '', bootDisk: '' },
-      catalogItemId: undefined,
-      isCatalogItemLoading: false,
-      instanceType: undefined,
-      instanceTypeId: undefined,
-      isInstanceTypeLoading: false,
-      networkingRows: [],
-      catalogItem: undefined,
-    });
+  it('renders nothing when user data is absent', () => {
     const { container } = renderCard({
       id: 'vm-1',
-      spec: { userData: '#cloud-config' },
+      spec: {},
     } as ComputeInstance);
     expect(container).toBeEmptyDOMElement();
   });
diff --git a/libs/ui-components/src/components/vm/DetailsPage/VmUserDataCard.tsx b/libs/ui-components/src/components/vm/DetailsPage/VmUserDataCard.tsx
index 44163393..5db0896e 100644
--- a/libs/ui-components/src/components/vm/DetailsPage/VmUserDataCard.tsx
+++ b/libs/ui-components/src/components/vm/DetailsPage/VmUserDataCard.tsx
@@ -9,7 +9,6 @@ import {
 
 import type { ComputeInstance } from '@osac/types';
 
-import { useVmDetailsDisplay } from './useVmDetailsDisplay';
 import { useTranslation } from '../../../hooks/useTranslation';
 
 interface VmUserDataCardProps {
@@ -18,11 +17,10 @@ interface VmUserDataCardProps {
 
 const VmUserDataCard = ({ vm }: VmUserDataCardProps) => {
   const { t } = useTranslation();
-  const { hasCatalogItem } = useVmDetailsDisplay(vm);
   const [isExpanded, setIsExpanded] = useState(false);
   const userData = vm.spec?.userData?.trim();
 
-  if (!hasCatalogItem || !userData) {
+  if (!userData) {
     return null;
   }
 
diff --git a/libs/ui-components/src/components/vm/DetailsPage/useVmDetailsDisplay.ts b/libs/ui-components/src/components/vm/DetailsPage/useVmDetailsDisplay.ts
index 74769d4d..e2b1018e 100644
--- a/libs/ui-components/src/components/vm/DetailsPage/useVmDetailsDisplay.ts
+++ b/libs/ui-components/src/components/vm/DetailsPage/useVmDetailsDisplay.ts
@@ -11,11 +11,6 @@ import {
   useSubnets,
   useVirtualNetworks,
 } from '../../../api/v1/networking';
-import { useTranslation } from '../../../hooks/useTranslation';
-import {
-  getCatalogFieldOverlay,
-  readCatalogFieldDefinitions,
-} from '../../catalogProvision/wizard/catalogOverlay';
 
 export type VmNetworkingRow = {
   virtualNetwork: string;
@@ -24,7 +19,6 @@ export type VmNetworkingRow = {
 };
 
 export const useVmDetailsDisplay = (vm: ComputeInstance) => {
-  const { t } = useTranslation();
   const catalogItemId = vm.spec?.catalogItem;
   const instanceTypeId = vm.spec?.instanceType;
 
@@ -35,37 +29,6 @@ export const useVmDetailsDisplay = (vm: ComputeInstance) => {
   const { data: subnets = [] } = useSubnets();
   const { data: securityGroups = [] } = useSecurityGroups();
 
-  const fieldLabels = useMemo(() => {
-    const definitions = catalogItem ? readCatalogFieldDefinitions(catalogItem) : [];
-    const imageOverlay = getCatalogFieldOverlay(
-      'spec.image.source_ref',
-      definitions,
-      t('catalogProvision.vm.fields.image'),
-    );
-    const userDataOverlay = getCatalogFieldOverlay(
-      'spec.user_data',
-      definitions,
-      t('catalogProvision.vm.fields.userData'),
-    );
-    const bootDiskOverlay = getCatalogFieldOverlay(
-      'spec.boot_disk.size_gib',
-      definitions,
-      t('catalogProvision.vm.fields.bootDisk'),
-    );
-    const sshKeyOverlay = getCatalogFieldOverlay(
-      'ssh_key',
-      definitions,
-      t('catalogProvision.vm.fields.sshKey'),
-    );
-
-    return {
-      image: imageOverlay.label,
-      userData: userDataOverlay.label,
-      bootDisk: bootDiskOverlay.label,
-      sshKey: sshKeyOverlay.label,
-    };
-  }, [catalogItem, t]);
-
   const networkingRows = useMemo((): VmNetworkingRow[] => {
     const attachments = vm.spec?.networkAttachments ?? [];
     return attachments.map((attachment) => {
@@ -86,8 +49,6 @@ export const useVmDetailsDisplay = (vm: ComputeInstance) => {
     instanceType,
     instanceTypeId,
     isInstanceTypeLoading,
-    fieldLabels,
     networkingRows,
-    hasCatalogItem: Boolean(catalogItemId?.trim()),
   };
 };
diff --git a/libs/ui-components/src/components/vm/VmTable.test.tsx b/libs/ui-components/src/components/vm/VmTable.test.tsx
index 5669156e..07203ce2 100644
--- a/libs/ui-components/src/components/vm/VmTable.test.tsx
+++ b/libs/ui-components/src/components/vm/VmTable.test.tsx
@@ -59,7 +59,7 @@ const runningVm: ComputeInstance = {
     conditions: [],
     state: ComputeInstanceState.RUNNING,
     internalIpAddress: '10.0.0.5',
-    publicIpAddress: '203.0.113.1',
+    externalIpAddress: '203.0.113.1',
   },
 };
 
diff --git a/libs/ui-components/src/components/vm/VmTable.tsx b/libs/ui-components/src/components/vm/VmTable.tsx
index 931170e9..0ec497cf 100644
--- a/libs/ui-components/src/components/vm/VmTable.tsx
+++ b/libs/ui-components/src/components/vm/VmTable.tsx
@@ -50,7 +50,7 @@ export const VmTable = ({
           const instanceTypeId = vm.spec?.instanceType?.trim();
           const instanceType = instanceTypeId ? instanceTypeById.get(instanceTypeId) : undefined;
           const internalIp = vm.status?.internalIpAddress;
-          const externalIp = vm.status?.publicIpAddress;
+          const externalIp = vm.status?.externalIpAddress;
 
           return (
             <Tr key={vm.id}>
diff --git a/libs/ui-components/src/pages/admin/BareMetalInstanceCatalogManagementPanel.tsx b/libs/ui-components/src/pages/admin/BareMetalInstanceCatalogManagementPanel.tsx
index b2b2edee..0dbc5882 100644
--- a/libs/ui-components/src/pages/admin/BareMetalInstanceCatalogManagementPanel.tsx
+++ b/libs/ui-components/src/pages/admin/BareMetalInstanceCatalogManagementPanel.tsx
@@ -19,6 +19,7 @@ import { useBareMetalInstanceCatalogItems } from '@osac/ui-components/api/v1/bar
 import { usePrivateBareMetalInstanceCatalogItems } from '@osac/ui-components/api/v1/private/baremetal-instance-catalog-item';
 import CatalogItemCard from '@osac/ui-components/components/catalog/CatalogItemCard';
 import {
+  CatalogItem,
   type PublicationFilter,
   catalogItemScope,
   filterCatalogItemsBySearch,
@@ -55,7 +56,9 @@ const BareMetalInstanceCatalogManagementPanel = ({
     undefined,
     isActive && isProviderAdmin,
   );
-  const { data = [], isLoading, error, isSuccess } = isProviderAdmin ? privateResult : publicResult;
+  const result = isProviderAdmin ? privateResult : publicResult;
+  const { isLoading, error, isSuccess } = result;
+  const data: CatalogItem[] = result.data ?? [];
 
   const filteredItems = filterCatalogItemsBySearch(data, search).filter((item) =>
     matchesPublicationFilter(item, publicationFilter),
diff --git a/libs/ui-components/src/pages/admin/ClusterCatalogManagementPanel.tsx b/libs/ui-components/src/pages/admin/ClusterCatalogManagementPanel.tsx
index 30212044..c63fce80 100644
--- a/libs/ui-components/src/pages/admin/ClusterCatalogManagementPanel.tsx
+++ b/libs/ui-components/src/pages/admin/ClusterCatalogManagementPanel.tsx
@@ -19,6 +19,7 @@ import { useClusterCatalogItems } from '@osac/ui-components/api/v1/cluster-catal
 import { usePrivateClusterCatalogItems } from '@osac/ui-components/api/v1/private/cluster-catalog-item';
 import CatalogItemCard from '@osac/ui-components/components/catalog/CatalogItemCard';
 import {
+  CatalogItem,
   type PublicationFilter,
   catalogItemScope,
   filterCatalogItemsBySearch,
@@ -52,7 +53,10 @@ const ClusterCatalogManagementPanel = ({
   const isProviderAdmin = role === 'providerAdmin';
   const publicResult = useClusterCatalogItems(undefined, isActive && !isProviderAdmin);
   const privateResult = usePrivateClusterCatalogItems(undefined, isActive && isProviderAdmin);
-  const { data = [], isLoading, error, isSuccess } = isProviderAdmin ? privateResult : publicResult;
+
+  const result = isProviderAdmin ? privateResult : publicResult;
+  const { isLoading, error, isSuccess } = result;
+  const data: CatalogItem[] = result.data ?? [];
 
   const filteredItems = filterCatalogItemsBySearch(data, search).filter((item) =>
     matchesPublicationFilter(item, publicationFilter),
diff --git a/libs/ui-components/src/pages/admin/ComputeInstanceCatalogManagementPanel.tsx b/libs/ui-components/src/pages/admin/ComputeInstanceCatalogManagementPanel.tsx
index 16d2e9b4..5755fe39 100644
--- a/libs/ui-components/src/pages/admin/ComputeInstanceCatalogManagementPanel.tsx
+++ b/libs/ui-components/src/pages/admin/ComputeInstanceCatalogManagementPanel.tsx
@@ -19,6 +19,7 @@ import { useComputeInstanceCatalogItems } from '@osac/ui-components/api/v1/compu
 import { usePrivateComputeInstanceCatalogItems } from '@osac/ui-components/api/v1/private/compute-instance-catalog-item';
 import CatalogItemCard from '@osac/ui-components/components/catalog/CatalogItemCard';
 import {
+  type CatalogItem,
   type PublicationFilter,
   catalogItemScope,
   filterCatalogItemsBySearch,
@@ -55,7 +56,9 @@ const ComputeInstanceCatalogManagementPanel = ({
     undefined,
     isActive && isProviderAdmin,
   );
-  const { data = [], isLoading, error, isSuccess } = isProviderAdmin ? privateResult : publicResult;
+  const result = isProviderAdmin ? privateResult : publicResult;
+  const { isLoading, error, isSuccess } = result;
+  const data: CatalogItem[] = result.data ?? [];
 
   const filteredItems = filterCatalogItemsBySearch(data, search).filter((item) =>
     matchesPublicationFilter(item, publicationFilter),
diff --git a/libs/ui-components/src/pages/tenant/BareMetalCreatePage.tsx b/libs/ui-components/src/pages/tenant/BareMetalCreatePage.tsx
deleted file mode 100644
index 3167b3ef..00000000
--- a/libs/ui-components/src/pages/tenant/BareMetalCreatePage.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import { useCallback, useState } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
-import type { MessageInitShape } from '@bufbuild/protobuf';
-import {
-  Breadcrumb,
-  BreadcrumbItem,
-  Button,
-  Content,
-  PageSection,
-  Stack,
-  Title,
-} from '@patternfly/react-core';
-
-import { BareMetalInstanceSchema } from '@osac/types';
-import { useCreateBareMetalInstance } from '@osac/ui-components/api/v1/baremetal-instance';
-import {
-  CatalogProvisionPayload,
-  CatalogProvisionWizard,
-  type CatalogProvisionWizardCloseHandler,
-} from '@osac/ui-components/components/catalogProvision/CatalogProvisionWizard';
-import { useTranslation } from '@osac/ui-components/hooks/useTranslation';
-
-export const BareMetalCreatePage = () => {
-  const { t } = useTranslation();
-  const navigate = useNavigate();
-  const { catalogItemId } = useParams<{ catalogItemId?: string }>();
-  const createBareMetalInstance = useCreateBareMetalInstance();
-  const [closeHandler, setCloseHandler] = useState<CatalogProvisionWizardCloseHandler | null>(null);
-
-  const handleCloseHandlerChange = useCallback((handler: CatalogProvisionWizardCloseHandler) => {
-    setCloseHandler(handler);
-  }, []);
-
-  const handleWizardClosed = useCallback(() => {
-    navigate('/bare-metal');
-  }, [navigate]);
-
-  const handleWizardProvision = useCallback(
-    async (payload: CatalogProvisionPayload) => {
-      const instance = await createBareMetalInstance.mutateAsync(
-        payload as MessageInitShape<typeof BareMetalInstanceSchema>,
-      );
-      if (!instance) {
-        throw new Error('Create response missing instance');
-      }
-      navigate(`/bare-metal/${instance.id}`);
-    },
-    [createBareMetalInstance, navigate],
-  );
-
-  return (
-    <>
-      <PageSection hasBodyWrapper={false}>
-        <Stack hasGutter>
-          <Breadcrumb>
-            <BreadcrumbItem>
-              <Button
-                variant="link"
-                isInline
-                onClick={() => closeHandler?.requestClose()}
-                isDisabled={closeHandler?.pending}
-              >
-                {t('Bare Metal')}
-              </Button>
-            </BreadcrumbItem>
-            <BreadcrumbItem isActive>{t('Provision bare metal')}</BreadcrumbItem>
-          </Breadcrumb>
-          <Title headingLevel="h1" size="3xl">
-            {t('Provision bare metal')}
-          </Title>
-          <Content component="p">
-            {t('Provision a bare metal instance from a catalog item.')}
-          </Content>
-        </Stack>
-      </PageSection>
-      <CatalogProvisionWizard
-        kind="bare_metal_instance"
-        initialCatalogItemId={catalogItemId}
-        onProvision={handleWizardProvision}
-        onClosed={handleWizardClosed}
-        onCloseHandlerChange={handleCloseHandlerChange}
-      />
-    </>
-  );
-};
diff --git a/libs/ui-components/src/pages/tenant/BareMetalRoutes.tsx b/libs/ui-components/src/pages/tenant/BareMetalRoutes.tsx
index f16fb08b..6caaaa66 100644
--- a/libs/ui-components/src/pages/tenant/BareMetalRoutes.tsx
+++ b/libs/ui-components/src/pages/tenant/BareMetalRoutes.tsx
@@ -1,14 +1,14 @@
 import { Route, Routes } from 'react-router-dom';
 
-import { BareMetalCreatePage } from './BareMetalCreatePage';
 import { BareMetalDetailsPage } from './BareMetalDetailsPage';
 import { BareMetalListPage } from './BareMetalListPage';
+import BareMetalInstanceCreateWizard from '../../components/BareMetalInstance/CreateWizard/BareMetalInstanceCreateWizard';
 
 export const BareMetalRoutes = () => (
   <Routes>
     <Route index element={<BareMetalListPage />} />
-    <Route path="create" element={<BareMetalCreatePage />} />
-    <Route path="create/:catalogItemId" element={<BareMetalCreatePage />} />
+    <Route path="create" element={<BareMetalInstanceCreateWizard />} />
+    <Route path="create/:catalogItemId" element={<BareMetalInstanceCreateWizard />} />
     <Route path=":id" element={<BareMetalDetailsPage />} />
   </Routes>
 );
diff --git a/libs/ui-components/src/pages/tenant/CatalogPage.tsx b/libs/ui-components/src/pages/tenant/CatalogPage.tsx
index de610e71..d53fcfb4 100644
--- a/libs/ui-components/src/pages/tenant/CatalogPage.tsx
+++ b/libs/ui-components/src/pages/tenant/CatalogPage.tsx
@@ -78,7 +78,10 @@ const CatalogPage = () => {
 
   const { data = [], isLoading, error } = useCatalogItems(typeFilter);
 
-  const filteredItems = useMemo(() => filterCatalogItemsBySearch(data, search), [search, data]);
+  const filteredItems = useMemo(
+    () => filterCatalogItemsBySearch<CatalogItem>(data, search),
+    [search, data],
+  );
 
   const searchTerm = search.trim();
   const showEmptyState = !isLoading && !error && filteredItems.length === 0;
diff --git a/libs/ui-components/src/pages/tenant/ClusterCreatePage.tsx b/libs/ui-components/src/pages/tenant/ClusterCreatePage.tsx
deleted file mode 100644
index 9bff66dd..00000000
--- a/libs/ui-components/src/pages/tenant/ClusterCreatePage.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import { useCallback, useState } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
-import { type MessageInitShape } from '@bufbuild/protobuf';
-import {
-  Breadcrumb,
-  BreadcrumbItem,
-  Button,
-  Content,
-  PageSection,
-  Stack,
-  Title,
-} from '@patternfly/react-core';
-
-import { ClusterSchema } from '@osac/types';
-import { apiQueryKey } from '@osac/ui-components/api/types';
-import { useApiQueryClient } from '@osac/ui-components/api/use-api-query';
-import { useProvisionCluster } from '@osac/ui-components/api/v1/cluster';
-import {
-  type CatalogProvisionPayload,
-  CatalogProvisionWizard,
-  type CatalogProvisionWizardCloseHandler,
-} from '@osac/ui-components/components/catalogProvision/CatalogProvisionWizard';
-import { useTranslation } from '@osac/ui-components/hooks/useTranslation';
-
-export const ClusterCreatePage = () => {
-  const { t } = useTranslation();
-  const navigate = useNavigate();
-  const { catalogItemId } = useParams<{ catalogItemId?: string }>();
-  const provisionCluster = useProvisionCluster();
-  const qc = useApiQueryClient();
-  const [closeHandler, setCloseHandler] = useState<CatalogProvisionWizardCloseHandler | null>(null);
-
-  const handleCloseHandlerChange = useCallback((handler: CatalogProvisionWizardCloseHandler) => {
-    setCloseHandler(handler);
-  }, []);
-
-  const handleWizardClosed = useCallback(() => {
-    navigate('/clusters');
-  }, [navigate]);
-
-  const handleWizardProvision = useCallback(
-    async (payload: CatalogProvisionPayload) => {
-      const created = await provisionCluster.mutateAsync(
-        payload as MessageInitShape<typeof ClusterSchema>,
-      );
-      if (!created?.id) {
-        throw new Error('Create response missing id');
-      }
-      qc.setQueryData(apiQueryKey('v1/clusters', [created.id]), created);
-      navigate(`/clusters/${created.id}`);
-    },
-    [navigate, provisionCluster, qc],
-  );
-
-  return (
-    <>
-      <PageSection hasBodyWrapper={false}>
-        <Stack hasGutter>
-          <Breadcrumb>
-            <BreadcrumbItem>
-              <Button
-                variant="link"
-                isInline
-                onClick={() => closeHandler?.requestClose()}
-                isDisabled={closeHandler?.pending}
-              >
-                {t('Clusters')}
-              </Button>
-            </BreadcrumbItem>
-            <BreadcrumbItem isActive>{t('Create')}</BreadcrumbItem>
-          </Breadcrumb>
-          <Title headingLevel="h1" size="3xl">
-            {t('Create cluster')}
-          </Title>
-          <Content component="p">
-            {t('Select a catalog item, configure, and provision an OpenShift cluster.')}
-          </Content>
-        </Stack>
-      </PageSection>
-      <CatalogProvisionWizard
-        kind="cluster"
-        initialCatalogItemId={catalogItemId}
-        onProvision={handleWizardProvision}
-        onClosed={handleWizardClosed}
-        onCloseHandlerChange={handleCloseHandlerChange}
-      />
-    </>
-  );
-};
diff --git a/libs/ui-components/src/pages/tenant/ClusterRoutes.tsx b/libs/ui-components/src/pages/tenant/ClusterRoutes.tsx
index 8f96e885..ef0e96bc 100644
--- a/libs/ui-components/src/pages/tenant/ClusterRoutes.tsx
+++ b/libs/ui-components/src/pages/tenant/ClusterRoutes.tsx
@@ -2,14 +2,14 @@ import { Route, Routes } from 'react-router-dom';
 
 import { ClusterDetailsPage } from '@osac/ui-components/components/Cluster/ClusterDetailsPage';
 import { ClustersPage } from '@osac/ui-components/components/Cluster/ClustersPage';
-
-import { ClusterCreatePage } from './ClusterCreatePage';
+import ClusterCreateWizard from '@osac/ui-components/components/Cluster/CreateWizard/ClusterCreateWizard';
 
 export const ClusterRoutes = () => {
   return (
     <Routes>
       <Route index element={<ClustersPage />} />
-      <Route path="create/:catalogItemId?" element={<ClusterCreatePage />} />
+      <Route path="create/:catalogItemId" element={<ClusterCreateWizard />} />
+      <Route path="create" element={<ClusterCreateWizard />} />
       <Route path=":clusterId" element={<ClusterDetailsPage />} />
     </Routes>
   );
diff --git a/libs/ui-components/src/pages/tenant/VmCreatePage.tsx b/libs/ui-components/src/pages/tenant/VmCreatePage.tsx
deleted file mode 100644
index c2326310..00000000
--- a/libs/ui-components/src/pages/tenant/VmCreatePage.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import { useCallback, useState } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
-import { type MessageInitShape } from '@bufbuild/protobuf';
-import {
-  Breadcrumb,
-  BreadcrumbItem,
-  Button,
-  Content,
-  PageSection,
-  Stack,
-  Title,
-} from '@patternfly/react-core';
-
-import { ComputeInstanceSchema } from '@osac/types';
-import { apiQueryKey } from '@osac/ui-components/api/types';
-import { useApiQueryClient } from '@osac/ui-components/api/use-api-query';
-import { useProvisionComputeInstance } from '@osac/ui-components/api/v1/compute-instance';
-import {
-  type CatalogProvisionPayload,
-  CatalogProvisionWizard,
-  type CatalogProvisionWizardCloseHandler,
-} from '@osac/ui-components/components/catalogProvision/CatalogProvisionWizard';
-import { useTranslation } from '@osac/ui-components/hooks/useTranslation';
-
-export const VmCreatePage = () => {
-  const { t } = useTranslation();
-  const navigate = useNavigate();
-  const { catalogItemId } = useParams<{ catalogItemId?: string }>();
-  const provisionVm = useProvisionComputeInstance();
-  const qc = useApiQueryClient();
-  const [closeHandler, setCloseHandler] = useState<CatalogProvisionWizardCloseHandler | null>(null);
-
-  const handleCloseHandlerChange = useCallback((handler: CatalogProvisionWizardCloseHandler) => {
-    setCloseHandler(handler);
-  }, []);
-
-  const handleWizardClosed = useCallback(() => {
-    navigate('/vms');
-  }, [navigate]);
-
-  const handleWizardProvision = useCallback(
-    async (payload: CatalogProvisionPayload) => {
-      const instance = await provisionVm.mutateAsync(
-        payload as MessageInitShape<typeof ComputeInstanceSchema>,
-      );
-      if (!instance?.id) {
-        throw new Error('Create response missing id');
-      }
-      qc.setQueryData(apiQueryKey('v1/compute_instances', [instance.id]), instance);
-      navigate(`/vms/${instance.id}`);
-    },
-    [navigate, provisionVm, qc],
-  );
-
-  return (
-    <>
-      <PageSection hasBodyWrapper={false}>
-        <Stack hasGutter>
-          <Breadcrumb>
-            <BreadcrumbItem>
-              <Button
-                variant="link"
-                isInline
-                onClick={() => closeHandler?.requestClose()}
-                isDisabled={closeHandler?.pending}
-              >
-                {t('Virtual Machines')}
-              </Button>
-            </BreadcrumbItem>
-            <BreadcrumbItem isActive>{t('catalogProvision.vm.breadcrumbCreate')}</BreadcrumbItem>
-          </Breadcrumb>
-          <Title headingLevel="h1" size="3xl">
-            {t('catalogProvision.vm.wizardTitle')}
-          </Title>
-          <Content component="p">{t('catalogProvision.vm.wizardDescription')}</Content>
-        </Stack>
-      </PageSection>
-      <CatalogProvisionWizard
-        kind="compute_instance"
-        initialCatalogItemId={catalogItemId}
-        onProvision={handleWizardProvision}
-        onClosed={handleWizardClosed}
-        onCloseHandlerChange={handleCloseHandlerChange}
-      />
-    </>
-  );
-};
diff --git a/libs/ui-components/src/pages/tenant/VmListPage.test.tsx b/libs/ui-components/src/pages/tenant/VmListPage.test.tsx
index 6b4d6830..19d9c266 100644
--- a/libs/ui-components/src/pages/tenant/VmListPage.test.tsx
+++ b/libs/ui-components/src/pages/tenant/VmListPage.test.tsx
@@ -37,16 +37,36 @@ vi.mock('../../components/vm/VmInstanceTypeLabel', () => ({
 const { useComputeInstances } = await import('@osac/ui-components/api/v1/compute-instance');
 const { useInstanceTypes } = await import('@osac/ui-components/api/v1/instance-types');
 
-const vm = {
+const vm: ComputeInstance = {
+  $typeName: 'osac.public.v1.ComputeInstance',
   id: 'vm-1',
-  metadata: { name: 'web-01' },
-  spec: { instanceType: 'standard-4-8' },
+  metadata: {
+    $typeName: 'osac.public.v1.Metadata',
+    name: 'web-01',
+    annotations: {},
+    creator: 'foo',
+    labels: {},
+    project: 'foo',
+    tenant: 'foo',
+    version: 1,
+  },
+  spec: {
+    $typeName: 'osac.public.v1.ComputeInstanceSpec',
+    instanceType: 'standard-4-8',
+    additionalDisks: [],
+    catalogItem: 'foo',
+    networkAttachments: [],
+    template: 'foo',
+    templateParameters: {},
+  },
   status: {
+    $typeName: 'osac.public.v1.ComputeInstanceStatus',
     state: ComputeInstanceState.RUNNING,
     internalIpAddress: '10.0.0.5',
-    publicIpAddress: '203.0.113.1',
+    externalIpAddress: '203.0.113.1',
+    conditions: [],
   },
-} as ComputeInstance;
+};
 
 const renderPage = () => renderWithProviders(<VmListPage />);
 
diff --git a/libs/ui-components/src/test-utils/createMockConnectTransport.ts b/libs/ui-components/src/test-utils/createMockConnectTransport.ts
index d3a8ff02..1809e609 100644
--- a/libs/ui-components/src/test-utils/createMockConnectTransport.ts
+++ b/libs/ui-components/src/test-utils/createMockConnectTransport.ts
@@ -124,6 +124,7 @@ export const createMockConnectTransport = (
       });
 
       router.service(ClusterTemplates, {
+        list: () => ({ items: clusterTemplates }),
         get: (req) => {
           const template = clusterTemplates.find((i) => i.id === req.id);
           if (!template) {
diff --git a/libs/ui-components/src/utils/snakeCase.ts b/libs/ui-components/src/utils/snakeCase.ts
index 9ddfe3af..ee9ef69a 100644
--- a/libs/ui-components/src/utils/snakeCase.ts
+++ b/libs/ui-components/src/utils/snakeCase.ts
@@ -1,4 +1,4 @@
-const toSnakeCase = (str: string): string =>
+export const toSnakeCase = (str: string): string =>
   str.replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`);
 
 export const camelKeysToSnake = <T = unknown>(obj: T): T => {
@@ -15,5 +15,3 @@ export const camelKeysToSnake = <T = unknown>(obj: T): T => {
   }
   return obj;
 };
-
-export { toSnakeCase };
diff --git a/libs/ui-components/src/components/catalogProvision/wizard/metadataNameSchema.ts b/libs/ui-components/src/validation/name.ts
similarity index 82%
rename from libs/ui-components/src/components/catalogProvision/wizard/metadataNameSchema.ts
rename to libs/ui-components/src/validation/name.ts
index 6bfeff51..eae52ac5 100644
--- a/libs/ui-components/src/components/catalogProvision/wizard/metadataNameSchema.ts
+++ b/libs/ui-components/src/validation/name.ts
@@ -1,14 +1,13 @@
 import type { TFunction } from 'i18next';
-import * as yup from 'yup';
+import * as Yup from 'yup';
 
 const DNS_LABEL_PATTERN = /^[a-z0-9-]+$/;
 
 /** Yup schema for metadata.name — aligned with fulfillment-service validateName (RFC 1035 DNS labels). */
-export const buildMetadataNameSchema = (t: TFunction): yup.StringSchema =>
-  yup
-    .string()
+export const buildMetadataNameSchema = (t: TFunction): Yup.StringSchema =>
+  Yup.string()
     .trim()
-    .required(t('catalogProvision.validation.nameRequired'))
+    .required(t('Name is required'))
     .max(63, t('Name must be at most 63 characters long'))
     .test(
       'dns-label-charset',
diff --git a/libs/ui-components/src/validation/ssh-public-key.ts b/libs/ui-components/src/validation/ssh-public-key.ts
new file mode 100644
index 00000000..bd466773
--- /dev/null
+++ b/libs/ui-components/src/validation/ssh-public-key.ts
@@ -0,0 +1,12 @@
+import { type TFunction } from 'i18next';
+import * as Yup from 'yup';
+
+export const SSH_PUBLIC_KEY_REGEX =
+  /^(ssh-(rsa|dss|ed25519)|ecdsa-sha2-\S+|sk-(ssh-ed25519|ecdsa-sha2-\S+))\s+\S+(\s+\S+)?$/;
+
+export const sshPublicKeySchema = (t: TFunction) =>
+  Yup.string().test(
+    'ssh-public-key',
+    t('Must be a valid SSH public key (ssh-rsa, ssh-ed25519, ecdsa-sha2-*, or sk-* prefixed).'),
+    (value) => !value?.trim() || SSH_PUBLIC_KEY_REGEX.test(value.trim()),
+  );
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 53ad77ed..ad06b478 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -196,6 +196,9 @@ importers:
       '@xterm/xterm':
         specifier: ^5.5.0
         version: 5.5.0
+      ajv:
+        specifier: ^8.20.0
+        version: 8.20.0
       formik:
         specifier: ^2.4.9
         version: 2.4.9(@types/react@19.2.14)(react@19.2.5)
@@ -1358,6 +1361,9 @@ packages:
   ajv@6.14.0:
     resolution: {integrity: sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==}
 
+  ajv@8.20.0:
+    resolution: {integrity: sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==}
+
   ansi-regex@5.0.1:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
@@ -1871,6 +1877,9 @@ packages:
   fast-string-width@3.0.2:
     resolution: {integrity: sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==}
 
+  fast-uri@3.1.4:
+    resolution: {integrity: sha512-8JnbkQ4juDyvYs4mgFGQqg4yCYtFDtUtmp2QIQq11ZZe5CFQ5wcqm1rqDgAh/QdMySuBnPzMUiJUNZG5N/AiQw==}
+
   fast-wrap-ansi@0.2.2:
     resolution: {integrity: sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q==}
 
@@ -2312,6 +2321,9 @@ packages:
   json-schema-traverse@0.4.1:
     resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
 
+  json-schema-traverse@1.0.0:
+    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
+
   json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
 
@@ -2786,6 +2798,10 @@ packages:
     resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==}
     engines: {node: '>= 0.4'}
 
+  require-from-string@2.0.2:
+    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+    engines: {node: '>=0.10.0'}
+
   resolve-from@4.0.0:
     resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
     engines: {node: '>=4'}
@@ -4525,6 +4541,13 @@ snapshots:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
+  ajv@8.20.0:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      fast-uri: 3.1.4
+      json-schema-traverse: 1.0.0
+      require-from-string: 2.0.2
+
   ansi-regex@5.0.1: {}
 
   ansi-regex@6.2.2: {}
@@ -5201,6 +5224,8 @@ snapshots:
     dependencies:
       fast-string-truncated-width: 3.0.3
 
+  fast-uri@3.1.4: {}
+
   fast-wrap-ansi@0.2.2:
     dependencies:
       fast-string-width: 3.0.2
@@ -5682,6 +5707,8 @@ snapshots:
 
   json-schema-traverse@0.4.1: {}
 
+  json-schema-traverse@1.0.0: {}
+
   json-stable-stringify-without-jsonify@1.0.1: {}
 
   json-stringify-safe@5.0.1: {}
@@ -6107,6 +6134,8 @@ snapshots:
       gopd: 1.2.0
       set-function-name: 2.0.2
 
+  require-from-string@2.0.2: {}
+
   resolve-from@4.0.0: {}
 
   resolve-pkg-maps@1.0.0:
diff --git a/proxy/bridge/connectjson.go b/proxy/bridge/connectjson.go
index 09e3eab7..9b86f9e0 100644
--- a/proxy/bridge/connectjson.go
+++ b/proxy/bridge/connectjson.go
@@ -37,7 +37,9 @@ import (
 	// "any JSON value"). Without these imports, a response containing one of the unlinked types
 	// fails to marshal with e.g. "unable to resolve type.googleapis.com/google.protobuf.Value:
 	// not found" (or .StringValue, .BoolValue, ... — whichever type wasn't yet linked).
+	_ "google.golang.org/protobuf/types/known/durationpb"
 	_ "google.golang.org/protobuf/types/known/structpb"
+	_ "google.golang.org/protobuf/types/known/timestamppb"
 	_ "google.golang.org/protobuf/types/known/wrapperspb"
 
 	"connectrpc.com/vanguard"