diff --git a/frontend/src/__tests__/cypress/cypress/pages/connectionTypes.ts b/frontend/src/__tests__/cypress/cypress/pages/connectionTypes.ts
new file mode 100644
index 0000000000..f5244eb18c
--- /dev/null
+++ b/frontend/src/__tests__/cypress/cypress/pages/connectionTypes.ts
@@ -0,0 +1,67 @@
+import { TableRow } from './components/table';
+
+class CreateConnectionTypeTableRow extends TableRow {
+  findSectionHeading() {
+    return this.find().findByTestId(['section-heading']);
+  }
+
+  findType() {
+    return this.find().findByTestId(['field-type']);
+  }
+
+  findDefault() {
+    return this.find().findByTestId(['field-default']);
+  }
+
+  findEnvVar() {
+    return this.find().findByTestId(['field-env']);
+  }
+
+  findRequired() {
+    return this.find().findByTestId(['field-required']);
+  }
+}
+
+class CreateConnectionTypePage {
+  visitCreatePage() {
+    cy.visitWithLogin('/connectionTypes/create');
+    cy.findAllByText('Create connection type').should('exist');
+  }
+
+  visitDuplicatePage(name = 'existing') {
+    cy.visitWithLogin(`/connectionTypes/duplicate/${name}`);
+    cy.findAllByText('Create connection type').should('exist');
+  }
+
+  connectionTypeName() {
+    return cy.findByTestId('connection-type-name');
+  }
+
+  connectionTypeDesc() {
+    return cy.findByTestId('connection-type-description');
+  }
+
+  connectionTypeEnable() {
+    return cy.findByTestId('connection-type-enable');
+  }
+
+  findFieldsTable() {
+    return cy.findByTestId('connection-type-fields-table');
+  }
+
+  getFieldsTableRow(name = '') {
+    return new CreateConnectionTypeTableRow(() =>
+      this.findFieldsTable().findByText(name).parents('tr'),
+    );
+  }
+
+  findAllFieldsTableRows() {
+    return this.findFieldsTable().findAllByTestId(['row']);
+  }
+
+  findSubmitButton() {
+    return cy.findByTestId('submit-button');
+  }
+}
+
+export const createConnectionTypePage = new CreateConnectionTypePage();
diff --git a/frontend/src/__tests__/cypress/cypress/pages/modelRegistry.ts b/frontend/src/__tests__/cypress/cypress/pages/modelRegistry.ts
index 88688563d9..4c96700e9e 100644
--- a/frontend/src/__tests__/cypress/cypress/pages/modelRegistry.ts
+++ b/frontend/src/__tests__/cypress/cypress/pages/modelRegistry.ts
@@ -167,10 +167,6 @@ class ModelRegistry {
   findModelVersionsTableFilter() {
     return cy.findByTestId('model-versions-table-filter');
   }
-
-  findRegisterModelButton() {
-    return cy.findByRole('button', { name: 'Register model' });
-  }
 }
 
 export const modelRegistry = new ModelRegistry();
diff --git a/frontend/src/__tests__/cypress/cypress/pages/modelRegistry/registerModelPage.ts b/frontend/src/__tests__/cypress/cypress/pages/modelRegistry/registerModelPage.ts
deleted file mode 100644
index d420cdff09..0000000000
--- a/frontend/src/__tests__/cypress/cypress/pages/modelRegistry/registerModelPage.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-export enum FormFieldSelector {
-  MODEL_NAME = '#model-name',
-  MODEL_DESCRIPTION = '#model-description',
-  VERSION_NAME = '#version-name',
-  VERSION_DESCRIPTION = '#version-description',
-  SOURCE_MODEL_FORMAT = '#source-model-format',
-  SOURCE_MODEL_FORMAT_VERSION = '#source-model-format-version',
-  LOCATION_TYPE_OBJECT_STORAGE = '#location-type-object-storage',
-  LOCATION_ENDPOINT = '#location-endpoint',
-  LOCATION_BUCKET = '#location-bucket',
-  LOCATION_REGION = '#location-region',
-  LOCATION_PATH = '#location-path',
-  LOCATION_TYPE_URI = '#location-type-uri',
-  LOCATION_URI = '#location-uri',
-}
-
-class RegisterModelPage {
-  visit() {
-    const preferredModelRegistry = 'modelregistry-sample';
-    cy.visitWithLogin(`/modelRegistry/${preferredModelRegistry}/registerModel`);
-    this.wait();
-  }
-
-  private wait() {
-    const preferredModelRegistry = 'modelregistry-sample';
-    cy.findByTestId('app-page-title').should('exist');
-    cy.findByTestId('app-page-title').contains('Register model');
-    cy.findByText(`Model registry - ${preferredModelRegistry}`).should('exist');
-    cy.testA11y();
-  }
-
-  findFormField(selector: FormFieldSelector) {
-    return cy.get(selector);
-  }
-
-  findSubmitButton() {
-    return cy.findByTestId('create-button');
-  }
-}
-
-export const registerModelPage = new RegisterModelPage();
diff --git a/frontend/src/__tests__/cypress/cypress/support/commands/odh.ts b/frontend/src/__tests__/cypress/cypress/support/commands/odh.ts
index 51838eb9a3..3deaccdf8b 100644
--- a/frontend/src/__tests__/cypress/cypress/support/commands/odh.ts
+++ b/frontend/src/__tests__/cypress/cypress/support/commands/odh.ts
@@ -2,7 +2,6 @@ import type { K8sResourceListResult } from '@openshift/dynamic-plugin-sdk-utils'
 import type { GenericStaticResponse, RouteHandlerController } from 'cypress/types/net-stubbing';
 import type { BaseMetricCreationResponse, BaseMetricListResponse } from '~/api';
 import type {
-  ModelArtifact,
   ModelArtifactList,
   ModelVersion,
   ModelVersionList,
@@ -50,6 +49,7 @@ import type {
 } from '~/concepts/pipelines/kfTypes';
 import type { GrpcResponse } from '~/__mocks__/mlmd/utils';
 import type { BuildMockPipelinveVersionsType } from '~/__mocks__';
+import type { ConnectionTypeConfigMap } from '~/concepts/connectionTypes/types';
 
 type SuccessErrorResponse = {
   success: boolean;
@@ -295,21 +295,11 @@ declare global {
           options: { path: { serviceName: string; apiVersion: string } },
           response: OdhResponse<RegisteredModelList>,
         ) => Cypress.Chainable<null>) &
-        ((
-          type: 'POST /api/service/modelregistry/:serviceName/api/model_registry/:apiVersion/registered_models',
-          options: { path: { serviceName: string; apiVersion: string } },
-          response: OdhResponse<RegisteredModel>,
-        ) => Cypress.Chainable<null>) &
         ((
           type: 'GET /api/service/modelregistry/:serviceName/api/model_registry/:apiVersion/registered_models/:registeredModelId/versions',
           options: { path: { serviceName: string; apiVersion: string; registeredModelId: number } },
           response: OdhResponse<ModelVersionList>,
         ) => Cypress.Chainable<null>) &
-        ((
-          type: 'POST /api/service/modelregistry/:serviceName/api/model_registry/:apiVersion/registered_models/:registeredModelId/versions',
-          options: { path: { serviceName: string; apiVersion: string; registeredModelId: number } },
-          response: OdhResponse<ModelVersion>,
-        ) => Cypress.Chainable<null>) &
         ((
           type: 'GET /api/service/modelregistry/:serviceName/api/model_registry/:apiVersion/registered_models/:registeredModelId',
           options: { path: { serviceName: string; apiVersion: string; registeredModelId: number } },
@@ -332,11 +322,6 @@ declare global {
           options: { path: { serviceName: string; apiVersion: string; modelVersionId: number } },
           response: OdhResponse<ModelArtifactList>,
         ) => Cypress.Chainable<null>) &
-        ((
-          type: 'POST /api/service/modelregistry/:serviceName/api/model_registry/:apiVersion/model_versions/:modelVersionId/artifacts',
-          options: { path: { serviceName: string; apiVersion: string; modelVersionId: number } },
-          response: OdhResponse<ModelArtifact>,
-        ) => Cypress.Chainable<null>) &
         ((
           type: 'PATCH /api/service/modelregistry/:serviceName/api/model_registry/:apiVersion/model_versions/:modelVersionId',
           options: { path: { serviceName: string; apiVersion: string; modelVersionId: number } },
@@ -581,6 +566,24 @@ declare global {
             path: { namespace: string };
           },
           response: OdhResponse<number>,
+        ) => Cypress.Chainable<null>) &
+        ((
+          type: 'GET /api/connection-types',
+          response: ConnectionTypeConfigMap[],
+        ) => Cypress.Chainable<null>) &
+        ((
+          type: 'PATCH /api/connection-types/:name',
+          options: {
+            path: { name: string };
+          },
+          response: { success: boolean; error: string },
+        ) => Cypress.Chainable<null>) &
+        ((
+          type: 'GET /api/connection-types/:name',
+          options: {
+            path: { name: string };
+          },
+          response: ConnectionTypeConfigMap,
         ) => Cypress.Chainable<null>);
     }
   }
diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/connectionTypes/createConnectionType.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/connectionTypes/createConnectionType.cy.ts
new file mode 100644
index 0000000000..dd319713b3
--- /dev/null
+++ b/frontend/src/__tests__/cypress/cypress/tests/mocked/connectionTypes/createConnectionType.cy.ts
@@ -0,0 +1,85 @@
+import {
+  mockConnectionTypeConfigMap,
+  mockConnectionTypeConfigMapObj,
+} from '~/__mocks__/mockConnectionType';
+import { createConnectionTypePage } from '~/__tests__/cypress/cypress/pages/connectionTypes';
+import { asClusterAdminUser } from '~/__tests__/cypress/cypress/utils/mockUsers';
+import type { SectionField, ShortTextField } from '~/concepts/connectionTypes/types';
+
+describe('create', () => {
+  it('Display base page', () => {
+    asClusterAdminUser();
+    createConnectionTypePage.visitCreatePage();
+
+    createConnectionTypePage.connectionTypeName().should('exist');
+    createConnectionTypePage.connectionTypeDesc().should('exist');
+    createConnectionTypePage.connectionTypeEnable().should('exist');
+    createConnectionTypePage.findFieldsTable().should('exist');
+  });
+
+  it('Allows create button with valid name', () => {
+    asClusterAdminUser();
+    createConnectionTypePage.visitCreatePage();
+
+    createConnectionTypePage.connectionTypeName().should('have.value', '');
+    createConnectionTypePage.findSubmitButton().should('be.disabled');
+
+    createConnectionTypePage.connectionTypeName().type('hello');
+    createConnectionTypePage.findSubmitButton().should('be.enabled');
+  });
+});
+
+describe('duplicate', () => {
+  const existing = mockConnectionTypeConfigMapObj({ name: 'existing' });
+
+  beforeEach(() => {
+    asClusterAdminUser();
+    cy.interceptOdh(
+      'GET /api/connection-types/:name',
+      { path: { name: 'existing' } },
+      mockConnectionTypeConfigMap({ name: 'existing' }),
+    );
+  });
+
+  it('Prefill details from existing connection', () => {
+    createConnectionTypePage.visitDuplicatePage('existing');
+
+    createConnectionTypePage
+      .connectionTypeName()
+      .should(
+        'have.value',
+        `Duplicate of ${existing.metadata.annotations['openshift.io/display-name']}`,
+      );
+    createConnectionTypePage
+      .connectionTypeDesc()
+      .should('have.value', existing.metadata.annotations['openshift.io/description']);
+    createConnectionTypePage.connectionTypeEnable().should('be.checked');
+  });
+
+  it('Prefill fields table from existing connection', () => {
+    createConnectionTypePage.visitDuplicatePage('existing');
+
+    createConnectionTypePage
+      .findAllFieldsTableRows()
+      .should('have.length', existing.data?.fields?.length);
+
+    // Row 0 - Section
+    const dataField0 = existing.data?.fields?.[0] as SectionField;
+    const row0 = createConnectionTypePage.getFieldsTableRow(dataField0.name);
+    row0.findSectionHeading().should('exist');
+
+    // Row 1 - Short text field
+    const dataField1 = existing.data?.fields?.[1] as ShortTextField;
+    const row1 = createConnectionTypePage.getFieldsTableRow(dataField1.name);
+    row1.findType().should('have.text', dataField1.type);
+    row1.findDefault().should('have.text', '-');
+    row1.findRequired().not('be.checked');
+
+    // Row 2 - Short text field
+    const dataField2 = existing.data?.fields?.[2] as ShortTextField;
+    const row2 = createConnectionTypePage.getFieldsTableRow(dataField2.name);
+    row2.findType().should('have.text', dataField2.type);
+    row2.findDefault().should('have.text', dataField2.properties.defaultValue);
+    row2.findRequired().should('be.checked');
+  });
+});
diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelRegistry.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelRegistry.cy.ts
index 24c8dd0a70..1e110dff25 100644
--- a/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelRegistry.cy.ts
+++ b/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelRegistry.cy.ts
@@ -101,7 +101,7 @@ const initIntercepts = ({
   );
 };
 
-describe('Model Registry core', () => {
+describe('Model Registry', () => {
   it('Model Registry Disabled in the cluster', () => {
     initIntercepts({
       disableModelRegistryFeature: true,
@@ -134,81 +134,57 @@ describe('Model Registry core', () => {
     modelRegistry.shouldregisteredModelsEmpty();
   });
 
-  describe('Registered model table', () => {
-    beforeEach(() => {
-      initIntercepts({ disableModelRegistryFeature: false });
-      modelRegistry.visit();
-    });
-
-    it('Renders row contents', () => {
-      const registeredModelRow = modelRegistry.getRow('Fraud detection model');
-      registeredModelRow.findName().contains('Fraud detection model');
-      registeredModelRow
-        .findDescription()
-        .contains(
-          'A machine learning model trained to detect fraudulent transactions in financial data',
-        );
-      registeredModelRow.findOwner().contains('Author 1');
-
-      // Label popover
-      registeredModelRow.findLabelPopoverText().contains('2 more');
-      registeredModelRow.findLabelPopoverText().click();
-      registeredModelRow.shouldContainsPopoverLabels([
-        'Machine learning',
-        'Next data to be overflow',
-      ]);
-    });
-
-    it('Renders labels in modal', () => {
-      const registeredModelRow2 = modelRegistry.getRow('Label modal');
-      registeredModelRow2.findLabelModalText().contains('6 more');
-      registeredModelRow2.findLabelModalText().click();
-      labelModal.shouldContainsModalLabels([
-        'Testing label',
-        'Financial',
-        'Financial data',
-        'Fraud detection',
-        'Machine learning',
-        'Next data to be overflow',
-        'Label x',
-        'Label y',
-        'Label z',
-      ]);
-      labelModal.findModalSearchInput().type('Financial');
-      labelModal.shouldContainsModalLabels(['Financial', 'Financial data']);
-      labelModal.findCloseModal().click();
-    });
-
-    it('Sorts by model name', () => {
-      modelRegistry.findRegisteredModelTableHeaderButton('Model name').should(be.sortAscending);
-      modelRegistry.findRegisteredModelTableHeaderButton('Model name').click();
-      modelRegistry.findRegisteredModelTableHeaderButton('Model name').should(be.sortDescending);
-    });
-
-    it('Filters by keyword', () => {
-      modelRegistry.findTableSearch().type('Fraud detection model');
-      modelRegistry.findTableRows().should('have.length', 1);
-      modelRegistry.findTableRows().contains('Fraud detection model');
+  it('Registered model table', () => {
+    initIntercepts({
+      disableModelRegistryFeature: false,
     });
-  });
-});
 
-describe('Register Model button', () => {
-  it('Navigates to register page from empty state', () => {
-    initIntercepts({ disableModelRegistryFeature: false, registeredModels: [] });
     modelRegistry.visit();
-    modelRegistry.findRegisterModelButton().click();
-    cy.findByTestId('app-page-title').should('exist');
-    cy.findByTestId('app-page-title').contains('Register model');
-    cy.findByText('Model registry - modelregistry-sample').should('exist');
-  });
 
-  it('Navigates to register page from table toolbar', () => {
-    initIntercepts({ disableModelRegistryFeature: false });
-    modelRegistry.visit();
-    modelRegistry.findRegisterModelButton().click();
-    cy.findByTestId('app-page-title').should('exist');
-    cy.findByTestId('app-page-title').contains('Register model');
-    cy.findByText('Model registry - modelregistry-sample').should('exist');
+    const registeredModelRow = modelRegistry.getRow('Fraud detection model');
+    registeredModelRow.findName().contains('Fraud detection model');
+    registeredModelRow
+      .findDescription()
+      .contains(
+        'A machine learning model trained to detect fraudulent transactions in financial data',
+      );
+    registeredModelRow.findOwner().contains('Author 1');
+
+    // Label popover
+    registeredModelRow.findLabelPopoverText().contains('2 more');
+    registeredModelRow.findLabelPopoverText().click();
+    registeredModelRow.shouldContainsPopoverLabels([
+      'Machine learning',
+      'Next data to be overflow',
+    ]);
+
+    // Label modal
+    const registeredModelRow2 = modelRegistry.getRow('Label modal');
+    registeredModelRow2.findLabelModalText().contains('6 more');
+    registeredModelRow2.findLabelModalText().click();
+    labelModal.shouldContainsModalLabels([
+      'Testing label',
+      'Financial',
+      'Financial data',
+      'Fraud detection',
+      'Machine learning',
+      'Next data to be overflow',
+      'Label x',
+      'Label y',
+      'Label z',
+    ]);
+    labelModal.findModalSearchInput().type('Financial');
+    labelModal.shouldContainsModalLabels(['Financial', 'Financial data']);
+    labelModal.findCloseModal().click();
+
+    // sort by modelName
+    modelRegistry.findRegisteredModelTableHeaderButton('Model name').should(be.sortAscending);
+    modelRegistry.findRegisteredModelTableHeaderButton('Model name').click();
+    modelRegistry.findRegisteredModelTableHeaderButton('Model name').should(be.sortDescending);
+
+    // filtering by keyword
+    modelRegistry.findTableSearch().type('Fraud detection model');
+    modelRegistry.findTableRows().should('have.length', 1);
+    modelRegistry.findTableRows().contains('Fraud detection model');
   });
 });
diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/registerModel.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/registerModel.cy.ts
deleted file mode 100644
index e108df61f0..0000000000
--- a/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/registerModel.cy.ts
+++ /dev/null
@@ -1,235 +0,0 @@
-import { mockDashboardConfig, mockDscStatus, mockK8sResourceList } from '~/__mocks__';
-import { mockDsciStatus } from '~/__mocks__/mockDsciStatus';
-import { StackCapability, StackComponent } from '~/concepts/areas/types';
-import { ModelRegistryModel } from '~/__tests__/cypress/cypress/utils/models';
-import {
-  FormFieldSelector,
-  registerModelPage,
-} from '~/__tests__/cypress/cypress/pages/modelRegistry/registerModelPage';
-import { mockModelRegistry } from '~/__mocks__/mockModelRegistry';
-import { mockRegisteredModel } from '~/__mocks__/mockRegisteredModel';
-import { mockModelVersion } from '~/__mocks__/mockModelVersion';
-import { mockModelArtifact } from '~/__mocks__/mockModelArtifact';
-import {
-  ModelArtifactState,
-  ModelState,
-  type RegisteredModel,
-  type ModelVersion,
-  type ModelArtifact,
-} from '~/concepts/modelRegistry/types';
-
-const MODEL_REGISTRY_API_VERSION = 'v1alpha3';
-
-const initIntercepts = () => {
-  cy.interceptOdh(
-    'GET /api/config',
-    mockDashboardConfig({
-      disableModelRegistry: false,
-    }),
-  );
-  cy.interceptOdh(
-    'GET /api/dsc/status',
-    mockDscStatus({
-      installedComponents: {
-        [StackComponent.MODEL_REGISTRY]: true,
-        [StackComponent.MODEL_MESH]: true,
-      },
-    }),
-  );
-  cy.interceptOdh(
-    'GET /api/dsci/status',
-    mockDsciStatus({
-      requiredCapabilities: [StackCapability.SERVICE_MESH, StackCapability.SERVICE_MESH_AUTHZ],
-    }),
-  );
-
-  // TODO replace these with a mock list of services when https://github.com/opendatahub-io/odh-dashboard/pull/3034 is merged
-  cy.interceptK8sList(
-    ModelRegistryModel,
-    mockK8sResourceList([mockModelRegistry({ name: 'modelregistry-sample' })]),
-  );
-  cy.interceptK8s(ModelRegistryModel, mockModelRegistry({ name: 'modelregistry-sample' }));
-
-  cy.interceptOdh(
-    'POST /api/service/modelregistry/:serviceName/api/model_registry/:apiVersion/registered_models',
-    {
-      path: {
-        serviceName: 'modelregistry-sample',
-        apiVersion: MODEL_REGISTRY_API_VERSION,
-      },
-    },
-    mockRegisteredModel({ id: '1', name: 'Test model name' }),
-  ).as('createRegisteredModel');
-
-  cy.interceptOdh(
-    'POST /api/service/modelregistry/:serviceName/api/model_registry/:apiVersion/registered_models/:registeredModelId/versions',
-    {
-      path: {
-        serviceName: 'modelregistry-sample',
-        apiVersion: MODEL_REGISTRY_API_VERSION,
-        registeredModelId: 1,
-      },
-    },
-    mockModelVersion({ id: '2', name: 'Test version name' }),
-  ).as('createModelVersion');
-
-  cy.interceptOdh(
-    'POST /api/service/modelregistry/:serviceName/api/model_registry/:apiVersion/model_versions/:modelVersionId/artifacts',
-    {
-      path: {
-        serviceName: 'modelregistry-sample',
-        apiVersion: MODEL_REGISTRY_API_VERSION,
-        modelVersionId: 2,
-      },
-    },
-    mockModelArtifact(),
-  ).as('createModelArtifact');
-};
-
-describe('Register model page', () => {
-  beforeEach(() => {
-    initIntercepts();
-    registerModelPage.visit();
-  });
-
-  it('Disables submit until required fields are filled in object storage mode', () => {
-    registerModelPage.findSubmitButton().should('be.disabled');
-    registerModelPage.findFormField(FormFieldSelector.MODEL_NAME).type('Test model name');
-    registerModelPage.findFormField(FormFieldSelector.VERSION_NAME).type('Test version name');
-    registerModelPage.findFormField(FormFieldSelector.LOCATION_TYPE_OBJECT_STORAGE).click();
-    registerModelPage
-      .findFormField(FormFieldSelector.LOCATION_ENDPOINT)
-      .type('http://s3.amazonaws.com/');
-    registerModelPage.findFormField(FormFieldSelector.LOCATION_BUCKET).type('test-bucket');
-    registerModelPage
-      .findFormField(FormFieldSelector.LOCATION_PATH)
-      .type('demo-models/flan-t5-small-caikit');
-    registerModelPage.findSubmitButton().should('be.enabled');
-  });
-
-  it('Creates expected resources on submit in object storage mode', () => {
-    registerModelPage.findFormField(FormFieldSelector.MODEL_NAME).type('Test model name');
-    registerModelPage
-      .findFormField(FormFieldSelector.MODEL_DESCRIPTION)
-      .type('Test model description');
-    registerModelPage.findFormField(FormFieldSelector.VERSION_NAME).type('Test version name');
-    registerModelPage
-      .findFormField(FormFieldSelector.VERSION_DESCRIPTION)
-      .type('Test version description');
-    registerModelPage.findFormField(FormFieldSelector.SOURCE_MODEL_FORMAT).type('caikit');
-    registerModelPage.findFormField(FormFieldSelector.SOURCE_MODEL_FORMAT_VERSION).type('1');
-    registerModelPage.findFormField(FormFieldSelector.LOCATION_TYPE_OBJECT_STORAGE).click();
-    registerModelPage
-      .findFormField(FormFieldSelector.LOCATION_ENDPOINT)
-      .type('http://s3.amazonaws.com/');
-    registerModelPage.findFormField(FormFieldSelector.LOCATION_BUCKET).type('test-bucket');
-    registerModelPage.findFormField(FormFieldSelector.LOCATION_REGION).type('us-east-1');
-    registerModelPage
-      .findFormField(FormFieldSelector.LOCATION_PATH)
-      .type('demo-models/flan-t5-small-caikit');
-
-    registerModelPage.findSubmitButton().click();
-
-    cy.wait('@createRegisteredModel').then((interception) => {
-      expect(interception.request.body).to.containSubset({
-        name: 'Test model name',
-        description: 'Test model description',
-        customProperties: {},
-        state: ModelState.LIVE,
-      } satisfies Partial<RegisteredModel>);
-    });
-    cy.wait('@createModelVersion').then((interception) => {
-      expect(interception.request.body).to.containSubset({
-        name: 'Test version name',
-        description: 'Test version description',
-        customProperties: {},
-        state: ModelState.LIVE,
-        author: 'test-user',
-        registeredModelId: '1',
-      } satisfies Partial<ModelVersion>);
-    });
-    cy.wait('@createModelArtifact').then((interception) => {
-      expect(interception.request.body).to.containSubset({
-        name: 'Test model name-Test version name-artifact',
-        description: 'Test version description',
-        customProperties: {},
-        state: ModelArtifactState.LIVE,
-        author: 'test-user',
-        modelFormatName: 'caikit',
-        modelFormatVersion: '1',
-        uri: 's3://test-bucket/demo-models/flan-t5-small-caikit?endpoint=http%3A%2F%2Fs3.amazonaws.com%2F&defaultRegion=us-east-1',
-        artifactType: 'model-artifact',
-      } satisfies Partial<ModelArtifact>);
-    });
-
-    cy.url().should('include', '/modelRegistry/modelregistry-sample/registeredModels/1');
-  });
-
-  it('Disables submit until required fields are filled in URI mode', () => {
-    registerModelPage.findSubmitButton().should('be.disabled');
-    registerModelPage.findFormField(FormFieldSelector.MODEL_NAME).type('Test model name');
-    registerModelPage.findFormField(FormFieldSelector.VERSION_NAME).type('Test version name');
-    registerModelPage.findFormField(FormFieldSelector.LOCATION_TYPE_URI).click();
-    registerModelPage
-      .findFormField(FormFieldSelector.LOCATION_URI)
-      .type(
-        's3://test-bucket/demo-models/flan-t5-small-caikit?endpoint=http%3A%2F%2Fs3.amazonaws.com%2F&defaultRegion=us-east-1',
-      );
-    registerModelPage.findSubmitButton().should('be.enabled');
-  });
-
-  it('Creates expected resources on submit in URI mode', () => {
-    registerModelPage.findFormField(FormFieldSelector.MODEL_NAME).type('Test model name');
-    registerModelPage
-      .findFormField(FormFieldSelector.MODEL_DESCRIPTION)
-      .type('Test model description');
-    registerModelPage.findFormField(FormFieldSelector.VERSION_NAME).type('Test version name');
-    registerModelPage
-      .findFormField(FormFieldSelector.VERSION_DESCRIPTION)
-      .type('Test version description');
-    registerModelPage.findFormField(FormFieldSelector.SOURCE_MODEL_FORMAT).type('caikit');
-    registerModelPage.findFormField(FormFieldSelector.SOURCE_MODEL_FORMAT_VERSION).type('1');
-    registerModelPage.findFormField(FormFieldSelector.LOCATION_TYPE_URI).click();
-    registerModelPage
-      .findFormField(FormFieldSelector.LOCATION_URI)
-      .type(
-        's3://test-bucket/demo-models/flan-t5-small-caikit?endpoint=http%3A%2F%2Fs3.amazonaws.com%2F&defaultRegion=us-east-1',
-      );
-
-    registerModelPage.findSubmitButton().click();
-
-    cy.wait('@createRegisteredModel').then((interception) => {
-      expect(interception.request.body).to.containSubset({
-        name: 'Test model name',
-        description: 'Test model description',
-        customProperties: {},
-        state: ModelState.LIVE,
-      } satisfies Partial<RegisteredModel>);
-    });
-    cy.wait('@createModelVersion').then((interception) => {
-      expect(interception.request.body).to.containSubset({
-        name: 'Test version name',
-        description: 'Test version description',
-        customProperties: {},
-        state: ModelState.LIVE,
-        author: 'test-user',
-        registeredModelId: '1',
-      } satisfies Partial<ModelVersion>);
-    });
-    cy.wait('@createModelArtifact').then((interception) => {
-      expect(interception.request.body).to.containSubset({
-        name: 'Test model name-Test version name-artifact',
-        description: 'Test version description',
-        customProperties: {},
-        state: ModelArtifactState.LIVE,
-        author: 'test-user',
-        modelFormatName: 'caikit',
-        modelFormatVersion: '1',
-        uri: 's3://test-bucket/demo-models/flan-t5-small-caikit?endpoint=http%3A%2F%2Fs3.amazonaws.com%2F&defaultRegion=us-east-1',
-        artifactType: 'model-artifact',
-      } satisfies Partial<ModelArtifact>);
-    });
-
-    cy.url().should('include', '/modelRegistry/modelregistry-sample/registeredModels/1');
-  });
-});
diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/pipelines/pipelineCreateRuns.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/pipelines/pipelineCreateRuns.cy.ts
index 106b8c804d..d00bce64a9 100644
--- a/frontend/src/__tests__/cypress/cypress/tests/mocked/pipelines/pipelineCreateRuns.cy.ts
+++ b/frontend/src/__tests__/cypress/cypress/tests/mocked/pipelines/pipelineCreateRuns.cy.ts
@@ -549,47 +549,56 @@ describe('Pipeline create runs', () => {
     });
 
     it('creates a schedule', () => {
-      createScheduleRunCommonTest();
-      createSchedulePage.findExperimentSelect().should('contain.text', 'Default');
-      createSchedulePage.findExperimentSelect().should('not.be.disabled').click();
-      createSchedulePage.selectExperimentByName('Test experiment 1');
-      createSchedulePage
-        .mockCreateRecurringRun(projectName, mockPipelineVersion, createRecurringRunParams)
-        .as('createSchedule');
-      createSchedulePage.submit();
+      visitLegacyRunsPage();
+      pipelineRunsGlobal.findSchedulesTab().click();
 
-      cy.wait('@createSchedule').then((interception) => {
-        expect(interception.request.body).to.eql({
-          display_name: 'New recurring run',
-          description: 'New recurring run description',
-          pipeline_version_reference: {
-            pipeline_id: 'test-pipeline',
-            pipeline_version_id: 'test-pipeline-version',
-          },
-          runtime_config: {
-            parameters: { min_max_scaler: false, neighbors: 1, standard_scaler: 'no' },
+      const createRecurringRunParams: Partial<PipelineRecurringRunKFv2> = {
+        display_name: 'New recurring run',
+        description: 'New recurring run description',
+        recurring_run_id: 'new-recurring-run-id',
+        runtime_config: {
+          parameters: {
+            min_max_scaler: false,
+            neighbors: 1,
+            standard_scaler: 'no',
           },
-          trigger: { periodic_schedule: { interval_second: '604800' } },
-          max_concurrency: '10',
-          mode: 'ENABLE',
-          no_catchup: false,
-          service_account: '',
-          experiment_id: 'experiment-1',
-        });
-      });
+        },
+      };
 
-      // Navigate to the 'Create run' page
+      // Mock experiments, pipelines & versions for form select dropdowns
+      createSchedulePage.mockGetExperiments(projectName, mockExperiments);
+      createSchedulePage.mockGetExperiments(projectName, mockExperiments);
+      createSchedulePage.mockGetPipelines(projectName, [mockPipeline]);
+      createSchedulePage.mockGetPipelineVersions(
+        projectName,
+        [mockPipelineVersion],
+        mockPipelineVersion.pipeline_id,
+      );
 
+      // Navigate to the 'Create run' page
+      pipelineRunsGlobal.findScheduleRunButton().click();
       verifyRelativeURL(
-        `/pipelines/${projectName}/${mockPipelineVersion.pipeline_id}/${mockPipelineVersion.pipeline_version_id}/schedules/${createRecurringRunParams.recurring_run_id}`,
+        `/pipelines/${projectName}/${mockPipelineVersion.pipeline_id}/${mockPipelineVersion.pipeline_version_id}/schedules/create`,
       );
-    });
+      createSchedulePage.find();
 
-    it('creates a schedule with trigger type cron without whitespace', () => {
       // Fill out the form with a schedule and submit
-      createScheduleRunCommonTest();
-      createSchedulePage.findScheduledRunTypeSelector().findDropdownItem('Cron').click();
-      createSchedulePage.findScheduledRunCron().fill('@every 5m');
+      createRunPage.fillName(initialMockRecurringRuns[0].display_name);
+      cy.findByTestId('duplicate-name-help-text').should('be.visible');
+      createSchedulePage.fillName('New recurring run');
+      createSchedulePage.fillDescription('New recurring run description');
+      createSchedulePage.findExperimentSelect().should('contain.text', 'Default');
+      createSchedulePage.findExperimentSelect().should('not.be.disabled').click();
+      createSchedulePage.selectExperimentByName('Test experiment 1');
+      createSchedulePage.findPipelineSelect().should('not.be.disabled').click();
+      createSchedulePage.selectPipelineByName('Test pipeline');
+      createSchedulePage.findPipelineVersionSelect().should('not.be.disabled');
+
+      const parameters = createRecurringRunParams.runtime_config?.parameters || {};
+      const paramsSection = createRunPage.getParamsSection();
+      paramsSection.findParamById('radio-min_max_scaler-false').click();
+      paramsSection.fillParamInputById('neighbors', String(parameters.neighbors));
+      paramsSection.fillParamInputById('standard_scaler', String(parameters.standard_scaler));
       createSchedulePage
         .mockCreateRecurringRun(projectName, mockPipelineVersion, createRecurringRunParams)
         .as('createSchedule');
@@ -606,12 +615,12 @@ describe('Pipeline create runs', () => {
           runtime_config: {
             parameters: { min_max_scaler: false, neighbors: 1, standard_scaler: 'no' },
           },
-          trigger: { cron_schedule: { cron: '@every 5m' } },
+          trigger: { periodic_schedule: { interval_second: '604800' } },
           max_concurrency: '10',
-          mode: 'DISABLE',
+          mode: 'ENABLE',
           no_catchup: false,
           service_account: '',
-          experiment_id: 'default',
+          experiment_id: 'experiment-1',
         });
       });
 
@@ -621,36 +630,6 @@ describe('Pipeline create runs', () => {
       );
     });
 
-    it('creates a schedule with trigger type cron with whitespace', () => {
-      createScheduleRunCommonTest();
-      createSchedulePage.findScheduledRunTypeSelector().findDropdownItem('Cron').click();
-      createSchedulePage.findScheduledRunCron().fill('@every 5m ');
-      createSchedulePage
-        .mockCreateRecurringRun(projectName, mockPipelineVersion, createRecurringRunParams)
-        .as('createSchedule');
-      createSchedulePage.submit();
-
-      cy.wait('@createSchedule').then((interception) => {
-        expect(interception.request.body).to.eql({
-          display_name: 'New recurring run',
-          description: 'New recurring run description',
-          pipeline_version_reference: {
-            pipeline_id: 'test-pipeline',
-            pipeline_version_id: 'test-pipeline-version',
-          },
-          runtime_config: {
-            parameters: { min_max_scaler: false, neighbors: 1, standard_scaler: 'no' },
-          },
-          trigger: { cron_schedule: { cron: '@every 5m' } },
-          max_concurrency: '10',
-          mode: 'DISABLE',
-          no_catchup: false,
-          service_account: '',
-          experiment_id: 'default',
-        });
-      });
-    });
-
     it('duplicates a schedule', () => {
       const [mockRecurringRun] = initialMockRecurringRuns;
       const mockExperiment = mockExperiments[0];
@@ -878,48 +857,3 @@ const initIntercepts = () => {
     );
   });
 };
-
-const createRecurringRunParams: Partial<PipelineRecurringRunKFv2> = {
-  display_name: 'New recurring run',
-  description: 'New recurring run description',
-  recurring_run_id: 'new-recurring-run-id',
-  runtime_config: {
-    parameters: {
-      min_max_scaler: false,
-      neighbors: 1,
-      standard_scaler: 'no',
-    },
-  },
-};
-
-const createScheduleRunCommonTest = () => {
-  visitLegacyRunsPage();
-  pipelineRunsGlobal.findSchedulesTab().click();
-  // Mock experiments, pipelines & versions for form select dropdowns
-  createSchedulePage.mockGetExperiments(projectName, mockExperiments);
-  createSchedulePage.mockGetPipelines(projectName, [mockPipeline]);
-  createSchedulePage.mockGetPipelineVersions(
-    projectName,
-    [mockPipelineVersion],
-    mockPipelineVersion.pipeline_id,
-  );
-
-  // Navigate to the 'Create run' page
-  pipelineRunsGlobal.findScheduleRunButton().click();
-  verifyRelativeURL(
-    `/pipelines/${projectName}/${mockPipelineVersion.pipeline_id}/${mockPipelineVersion.pipeline_version_id}/schedules/create`,
-  );
-  createSchedulePage.find();
-  createRunPage.fillName(initialMockRecurringRuns[0].display_name);
-  cy.findByTestId('duplicate-name-help-text').should('be.visible');
-  createSchedulePage.fillName('New recurring run');
-  createSchedulePage.fillDescription('New recurring run description');
-  createSchedulePage.findPipelineSelect().should('not.be.disabled').click();
-  createSchedulePage.selectPipelineByName('Test pipeline');
-  createSchedulePage.findPipelineVersionSelect().should('not.be.disabled');
-  const parameters = createRecurringRunParams.runtime_config?.parameters || {};
-  const paramsSection = createRunPage.getParamsSection();
-  paramsSection.findParamById('radio-min_max_scaler-false').click();
-  paramsSection.fillParamInputById('neighbors', String(parameters.neighbors));
-  paramsSection.fillParamInputById('standard_scaler', String(parameters.standard_scaler));
-};
diff --git a/frontend/src/api/modelRegistry/__tests__/custom.spec.ts b/frontend/src/api/modelRegistry/__tests__/custom.spec.ts
index 200a6f1ba5..5efcfcce41 100644
--- a/frontend/src/api/modelRegistry/__tests__/custom.spec.ts
+++ b/frontend/src/api/modelRegistry/__tests__/custom.spec.ts
@@ -16,8 +16,6 @@ import {
   patchModelVersion,
   patchRegisteredModel,
   getModelArtifactsByModelVersion,
-  createModelVersionForRegisteredModel,
-  createModelArtifactForModelVersion,
 } from '~/api/modelRegistry/custom';
 import { MODEL_REGISTRY_API_VERSION } from '~/concepts/modelRegistry/const';
 
@@ -106,40 +104,6 @@ describe('createModelVersion', () => {
   });
 });
 
-describe('createModelVersionForRegisteredModel', () => {
-  it('should call proxyCREATE and handleModelRegistryFailures to create model version for a model', () => {
-    expect(
-      createModelVersionForRegisteredModel('hostPath')(K8sAPIOptionsMock, '1', {
-        description: 'test',
-        externalID: '1',
-        author: 'test author',
-        registeredModelId: '1',
-        name: 'test new model version',
-        state: ModelState.LIVE,
-        customProperties: {},
-      }),
-    ).toBe(mockResultPromise);
-    expect(proxyCREATEMock).toHaveBeenCalledTimes(1);
-    expect(proxyCREATEMock).toHaveBeenCalledWith(
-      'hostPath',
-      `/api/model_registry/${MODEL_REGISTRY_API_VERSION}/registered_models/1/versions`,
-      {
-        description: 'test',
-        externalID: '1',
-        author: 'test author',
-        registeredModelId: '1',
-        name: 'test new model version',
-        state: ModelState.LIVE,
-        customProperties: {},
-      },
-      {},
-      K8sAPIOptionsMock,
-    );
-    expect(handleModelRegistryFailuresMock).toHaveBeenCalledTimes(1);
-    expect(handleModelRegistryFailuresMock).toHaveBeenCalledWith(mockProxyPromise);
-  });
-});
-
 describe('createModelArtifact', () => {
   it('should call proxyCREATE and handleModelRegistryFailures to create model artifact', () => {
     expect(
@@ -155,7 +119,6 @@ describe('createModelArtifact', () => {
         modelFormatVersion: 'testmodelFormatVersion',
         serviceAccountName: 'testserviceAccountname',
         customProperties: {},
-        artifactType: 'model-artifact',
       }),
     ).toBe(mockResultPromise);
     expect(proxyCREATEMock).toHaveBeenCalledTimes(1);
@@ -174,51 +137,6 @@ describe('createModelArtifact', () => {
         modelFormatVersion: 'testmodelFormatVersion',
         serviceAccountName: 'testserviceAccountname',
         customProperties: {},
-        artifactType: 'model-artifact',
-      },
-      {},
-      K8sAPIOptionsMock,
-    );
-    expect(handleModelRegistryFailuresMock).toHaveBeenCalledTimes(1);
-    expect(handleModelRegistryFailuresMock).toHaveBeenCalledWith(mockProxyPromise);
-  });
-});
-
-describe('createModelArtifactForModelVersion', () => {
-  it('should call proxyCREATE and handleModelRegistryFailures to create model artifact for version', () => {
-    expect(
-      createModelArtifactForModelVersion('hostPath')(K8sAPIOptionsMock, '2', {
-        description: 'test',
-        externalID: 'test',
-        uri: 'test-uri',
-        state: ModelArtifactState.LIVE,
-        name: 'test-name',
-        modelFormatName: 'test-modelformatname',
-        storageKey: 'teststoragekey',
-        storagePath: 'teststoragePath',
-        modelFormatVersion: 'testmodelFormatVersion',
-        serviceAccountName: 'testserviceAccountname',
-        customProperties: {},
-        artifactType: 'model-artifact',
-      }),
-    ).toBe(mockResultPromise);
-    expect(proxyCREATEMock).toHaveBeenCalledTimes(1);
-    expect(proxyCREATEMock).toHaveBeenCalledWith(
-      'hostPath',
-      `/api/model_registry/${MODEL_REGISTRY_API_VERSION}/model_versions/2/artifacts`,
-      {
-        description: 'test',
-        externalID: 'test',
-        uri: 'test-uri',
-        state: ModelArtifactState.LIVE,
-        name: 'test-name',
-        modelFormatName: 'test-modelformatname',
-        storageKey: 'teststoragekey',
-        storagePath: 'teststoragePath',
-        modelFormatVersion: 'testmodelFormatVersion',
-        serviceAccountName: 'testserviceAccountname',
-        customProperties: {},
-        artifactType: 'model-artifact',
       },
       {},
       K8sAPIOptionsMock,
diff --git a/frontend/src/api/modelRegistry/custom.ts b/frontend/src/api/modelRegistry/custom.ts
index 3604ed6357..8282cc51ff 100644
--- a/frontend/src/api/modelRegistry/custom.ts
+++ b/frontend/src/api/modelRegistry/custom.ts
@@ -39,22 +39,6 @@ export const createModelVersion =
         opts,
       ),
     );
-export const createModelVersionForRegisteredModel =
-  (hostpath: string) =>
-  (
-    opts: K8sAPIOptions,
-    registeredModelId: string,
-    data: CreateModelVersionData,
-  ): Promise<ModelVersion> =>
-    handleModelRegistryFailures(
-      proxyCREATE(
-        hostpath,
-        `/api/model_registry/${MODEL_REGISTRY_API_VERSION}/registered_models/${registeredModelId}/versions`,
-        data,
-        {},
-        opts,
-      ),
-    );
 
 export const createModelArtifact =
   (hostPath: string) =>
@@ -69,23 +53,6 @@ export const createModelArtifact =
       ),
     );
 
-export const createModelArtifactForModelVersion =
-  (hostPath: string) =>
-  (
-    opts: K8sAPIOptions,
-    modelVersionId: string,
-    data: CreateModelArtifactData,
-  ): Promise<ModelArtifact> =>
-    handleModelRegistryFailures(
-      proxyCREATE(
-        hostPath,
-        `/api/model_registry/${MODEL_REGISTRY_API_VERSION}/model_versions/${modelVersionId}/artifacts`,
-        data,
-        {},
-        opts,
-      ),
-    );
-
 export const getRegisteredModel =
   (hostPath: string) =>
   (opts: K8sAPIOptions, registeredModelId: string): Promise<RegisteredModel> =>
diff --git a/frontend/src/app/AppRoutes.tsx b/frontend/src/app/AppRoutes.tsx
index cc6ee4516d..bd227c0b21 100644
--- a/frontend/src/app/AppRoutes.tsx
+++ b/frontend/src/app/AppRoutes.tsx
@@ -14,6 +14,7 @@ import { useCheckJupyterEnabled } from '~/utilities/notebookControllerUtils';
 import { SupportedArea } from '~/concepts/areas';
 import useIsAreaAvailable from '~/concepts/areas/useIsAreaAvailable';
 import ModelRegistrySettingsRoutes from '~/pages/modelRegistrySettings/ModelRegistrySettingsRoutes';
+import ConnectionTypeRoutes from '~/pages/connectionTypes/ConnectionTypeRoutes';
 
 const HomePage = React.lazy(() => import('../pages/home/Home'));
 
@@ -125,6 +126,7 @@ const AppRoutes: React.FC = () => {
             <Route path="/servingRuntimes/*" element={<CustomServingRuntimeRoutes />} />
             <Route path="/modelRegistrySettings/*" element={<ModelRegistrySettingsRoutes />} />
             <Route path="/groupSettings" element={<GroupSettingsPage />} />
+            <Route path="/connectionTypes/*" element={<ConnectionTypeRoutes />} />
           </>
         )}
 
diff --git a/frontend/src/concepts/connectionTypes/useConnectionType.ts b/frontend/src/concepts/connectionTypes/useConnectionType.ts
new file mode 100644
index 0000000000..49462210e6
--- /dev/null
+++ b/frontend/src/concepts/connectionTypes/useConnectionType.ts
@@ -0,0 +1,27 @@
+import * as React from 'react';
+import { ConnectionTypeConfigMapObj } from '~/concepts/connectionTypes/types';
+import { fetchConnectionType } from '~/services/connectionTypesService';
+
+export const useConnectionType = (
+  name?: string,
+): [boolean, Error | undefined, ConnectionTypeConfigMapObj | undefined] => {
+  const [loaded, setLoaded] = React.useState(false);
+  const [error, setError] = React.useState<Error>();
+  const [connectionType, setConnectionType] = React.useState<ConnectionTypeConfigMapObj>();
+
+  React.useEffect(() => {
+    if (name) {
+      fetchConnectionType(name)
+        .then((res) => {
+          setLoaded(true);
+          setConnectionType(res);
+        })
+        .catch((err) => {
+          setLoaded(true);
+          setError(err);
+        });
+    }
+  }, [name]);
+
+  return [loaded, error, connectionType];
+};
diff --git a/frontend/src/concepts/k8s/NameDescriptionField.tsx b/frontend/src/concepts/k8s/NameDescriptionField.tsx
index 3514e74d56..f294edbdcc 100644
--- a/frontend/src/concepts/k8s/NameDescriptionField.tsx
+++ b/frontend/src/concepts/k8s/NameDescriptionField.tsx
@@ -16,10 +16,13 @@ import { isValidK8sName, translateDisplayNameForK8s } from '~/concepts/k8s/utils
 
 type NameDescriptionFieldProps = {
   nameFieldId: string;
+  nameFieldLabel?: string;
   descriptionFieldId: string;
+  descriptionFieldLabel?: string;
   data: NameDescType;
   setData: (data: NameDescType) => void;
   autoFocusName?: boolean;
+  K8sLabelName?: string;
   showK8sName?: boolean;
   disableK8sName?: boolean;
   maxLength?: number;
@@ -29,10 +32,13 @@ type NameDescriptionFieldProps = {
 
 const NameDescriptionField: React.FC<NameDescriptionFieldProps> = ({
   nameFieldId,
+  nameFieldLabel = 'Name',
   descriptionFieldId,
+  descriptionFieldLabel = 'Description',
   data,
   setData,
   autoFocusName,
+  K8sLabelName = 'Resource name',
   showK8sName,
   disableK8sName,
   maxLength,
@@ -58,7 +64,7 @@ const NameDescriptionField: React.FC<NameDescriptionFieldProps> = ({
   return (
     <Stack hasGutter>
       <StackItem>
-        <FormGroup label="Name" isRequired fieldId={nameFieldId}>
+        <FormGroup label={nameFieldLabel} isRequired fieldId={nameFieldId}>
           <TextInput
             isRequired
             ref={autoSelectNameRef}
@@ -85,7 +91,7 @@ const NameDescriptionField: React.FC<NameDescriptionFieldProps> = ({
       {showK8sName && (
         <StackItem>
           <FormGroup
-            label="Resource name"
+            label={K8sLabelName}
             labelIcon={
               <Tooltip
                 position="right"
@@ -135,7 +141,7 @@ const NameDescriptionField: React.FC<NameDescriptionFieldProps> = ({
         </StackItem>
       )}
       <StackItem>
-        <FormGroup label="Description" fieldId={descriptionFieldId}>
+        <FormGroup label={descriptionFieldLabel} fieldId={descriptionFieldId}>
           <TextArea
             resizeOrientation="vertical"
             id={descriptionFieldId}
diff --git a/frontend/src/concepts/modelRegistry/__tests__/utils.spec.ts b/frontend/src/concepts/modelRegistry/__tests__/utils.spec.ts
deleted file mode 100644
index 314277b795..0000000000
--- a/frontend/src/concepts/modelRegistry/__tests__/utils.spec.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import {
-  ObjectStorageFields,
-  objectStorageFieldsToUri,
-  uriToObjectStorageFields,
-} from '~/concepts/modelRegistry/utils';
-
-describe('objectStorageFieldsToUri', () => {
-  it('converts fields to URI with all fields present', () => {
-    const uri = objectStorageFieldsToUri({
-      endpoint: 'http://s3.amazonaws.com/',
-      bucket: 'test-bucket',
-      region: 'us-east-1',
-      path: 'demo-models/flan-t5-small-caikit',
-    });
-    expect(uri).toEqual(
-      's3://test-bucket/demo-models/flan-t5-small-caikit?endpoint=http%3A%2F%2Fs3.amazonaws.com%2F&defaultRegion=us-east-1',
-    );
-  });
-
-  it('converts fields to URI with region missing', () => {
-    const uri = objectStorageFieldsToUri({
-      endpoint: 'http://s3.amazonaws.com/',
-      bucket: 'test-bucket',
-      path: 'demo-models/flan-t5-small-caikit',
-    });
-    expect(uri).toEqual(
-      's3://test-bucket/demo-models/flan-t5-small-caikit?endpoint=http%3A%2F%2Fs3.amazonaws.com%2F',
-    );
-  });
-
-  it('converts fields to URI with region empty', () => {
-    const uri = objectStorageFieldsToUri({
-      endpoint: 'http://s3.amazonaws.com/',
-      bucket: 'test-bucket',
-      region: '',
-      path: 'demo-models/flan-t5-small-caikit',
-    });
-    expect(uri).toEqual(
-      's3://test-bucket/demo-models/flan-t5-small-caikit?endpoint=http%3A%2F%2Fs3.amazonaws.com%2F',
-    );
-  });
-
-  it('falls back to null if endpoint is empty', () => {
-    const uri = objectStorageFieldsToUri({
-      endpoint: '',
-      bucket: 'test-bucket',
-      region: 'us-east-1',
-      path: 'demo-models/flan-t5-small-caikit',
-    });
-    expect(uri).toEqual(null);
-  });
-
-  it('falls back to null if bucket is empty', () => {
-    const uri = objectStorageFieldsToUri({
-      endpoint: 'http://s3.amazonaws.com/',
-      bucket: '',
-      region: 'us-east-1',
-      path: 'demo-models/flan-t5-small-caikit',
-    });
-    expect(uri).toEqual(null);
-  });
-
-  it('falls back to null if path is empty', () => {
-    const uri = objectStorageFieldsToUri({
-      endpoint: 'http://s3.amazonaws.com/',
-      bucket: 'test-bucket',
-      region: 'us-east-1',
-      path: '',
-    });
-    expect(uri).toEqual(null);
-  });
-});
-
-describe('uriToObjectStorageFields', () => {
-  it('converts URI to fields with all params present', () => {
-    const fields = uriToObjectStorageFields(
-      's3://test-bucket/demo-models/flan-t5-small-caikit?endpoint=http%3A%2F%2Fs3.amazonaws.com%2F&defaultRegion=us-east-1',
-    );
-    expect(fields).toEqual({
-      endpoint: 'http://s3.amazonaws.com/',
-      bucket: 'test-bucket',
-      region: 'us-east-1',
-      path: 'demo-models/flan-t5-small-caikit',
-    } satisfies ObjectStorageFields);
-  });
-
-  it('converts URI to fields with region missing', () => {
-    const fields = uriToObjectStorageFields(
-      's3://test-bucket/demo-models/flan-t5-small-caikit?endpoint=http%3A%2F%2Fs3.amazonaws.com%2F',
-    );
-    expect(fields).toEqual({
-      endpoint: 'http://s3.amazonaws.com/',
-      bucket: 'test-bucket',
-      path: 'demo-models/flan-t5-small-caikit',
-      region: undefined,
-    } satisfies ObjectStorageFields);
-  });
-
-  it('falls back to null if endpoint is missing', () => {
-    const fields = uriToObjectStorageFields('s3://test-bucket/demo-models/flan-t5-small-caikit');
-    expect(fields).toBeNull();
-  });
-
-  it('falls back to null if path is missing', () => {
-    const fields = uriToObjectStorageFields(
-      's3://test-bucket/?endpoint=http%3A%2F%2Fs3.amazonaws.com%2F&defaultRegion=us-east-1',
-    );
-    expect(fields).toBeNull();
-  });
-
-  it('falls back to null if bucket is missing', () => {
-    const fields = uriToObjectStorageFields(
-      's3://?endpoint=http%3A%2F%2Fs3.amazonaws.com%2F&defaultRegion=us-east-1',
-    );
-    expect(fields).toBeNull();
-  });
-
-  it('falls back to null if the URI is malformed', () => {
-    const fields = uriToObjectStorageFields('test-bucket/demo-models/flan-t5-small-caikit');
-    expect(fields).toBeNull();
-  });
-});
diff --git a/frontend/src/concepts/modelRegistry/context/useModelRegistryAPIState.tsx b/frontend/src/concepts/modelRegistry/context/useModelRegistryAPIState.tsx
index 64c09c29ad..ee5e5627ac 100644
--- a/frontend/src/concepts/modelRegistry/context/useModelRegistryAPIState.tsx
+++ b/frontend/src/concepts/modelRegistry/context/useModelRegistryAPIState.tsx
@@ -3,9 +3,7 @@ import { APIState } from '~/concepts/proxy/types';
 import { ModelRegistryAPIs } from '~/concepts/modelRegistry/types';
 import {
   createModelArtifact,
-  createModelArtifactForModelVersion,
   createModelVersion,
-  createModelVersionForRegisteredModel,
   createRegisteredModel,
   getListModelArtifacts,
   getListModelVersions,
@@ -30,9 +28,7 @@ const useModelRegistryAPIState = (
     (path: string) => ({
       createRegisteredModel: createRegisteredModel(path),
       createModelVersion: createModelVersion(path),
-      createModelVersionForRegisteredModel: createModelVersionForRegisteredModel(path),
       createModelArtifact: createModelArtifact(path),
-      createModelArtifactForModelVersion: createModelArtifactForModelVersion(path),
       getRegisteredModel: getRegisteredModel(path),
       getModelVersion: getModelVersion(path),
       getModelArtifact: getModelArtifact(path),
diff --git a/frontend/src/concepts/modelRegistry/types.ts b/frontend/src/concepts/modelRegistry/types.ts
index d601a97409..e93a9d8f72 100644
--- a/frontend/src/concepts/modelRegistry/types.ts
+++ b/frontend/src/concepts/modelRegistry/types.ts
@@ -145,7 +145,7 @@ export type CreateModelVersionData = Omit<
 
 export type CreateModelArtifactData = Omit<
   ModelArtifact,
-  'lastUpdateTimeSinceEpoch' | 'createTimeSinceEpoch' | 'id'
+  'lastUpdateTimeSinceEpoch' | 'createTimeSinceEpoch' | 'id' | 'artifactType'
 >;
 
 export type ModelRegistryListParams = {
@@ -170,23 +170,11 @@ export type CreateModelVersion = (
   data: CreateModelVersionData,
 ) => Promise<ModelVersion>;
 
-export type CreateModelVersionForRegisteredModel = (
-  opts: K8sAPIOptions,
-  registeredModelId: string,
-  data: CreateModelVersionData,
-) => Promise<ModelVersion>;
-
 export type CreateModelArtifact = (
   opts: K8sAPIOptions,
   data: CreateModelArtifactData,
 ) => Promise<ModelArtifact>;
 
-export type CreateModelArtifactForModelVersion = (
-  opts: K8sAPIOptions,
-  modelVersionId: string,
-  data: CreateModelArtifactData,
-) => Promise<ModelArtifact>;
-
 export type GetRegisteredModel = (
   opts: K8sAPIOptions,
   registeredModelId: string,
@@ -239,9 +227,7 @@ export type PatchModelArtifact = (
 export type ModelRegistryAPIs = {
   createRegisteredModel: CreateRegisteredModel;
   createModelVersion: CreateModelVersion;
-  createModelVersionForRegisteredModel: CreateModelVersionForRegisteredModel;
   createModelArtifact: CreateModelArtifact;
-  createModelArtifactForModelVersion: CreateModelArtifactForModelVersion;
   getRegisteredModel: GetRegisteredModel;
   getModelVersion: GetModelVersion;
   getModelArtifact: GetModelArtifact;
diff --git a/frontend/src/concepts/modelRegistry/utils.ts b/frontend/src/concepts/modelRegistry/utils.ts
deleted file mode 100644
index b9d39754d4..0000000000
--- a/frontend/src/concepts/modelRegistry/utils.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-export type ObjectStorageFields = {
-  endpoint: string;
-  bucket: string;
-  region?: string;
-  path: string;
-};
-
-export const objectStorageFieldsToUri = (fields: ObjectStorageFields): string | null => {
-  const { endpoint, bucket, region, path } = fields;
-  if (!endpoint || !bucket || !path) {
-    return null;
-  }
-  const searchParams = new URLSearchParams();
-  searchParams.set('endpoint', endpoint);
-  if (region) {
-    searchParams.set('defaultRegion', region);
-  }
-  return `s3://${bucket}/${path}?${searchParams.toString()}`;
-};
-
-export const uriToObjectStorageFields = (uri: string): ObjectStorageFields | null => {
-  try {
-    const urlObj = new URL(uri);
-    // Some environments include the first token after the protocol (our bucket) in the pathname and some have it as the hostname
-    const [bucket, ...pathSplit] = `${urlObj.hostname}/${urlObj.pathname}`
-      .split('/')
-      .filter(Boolean);
-    const path = pathSplit.join('/');
-    const searchParams = new URLSearchParams(urlObj.search);
-    const endpoint = searchParams.get('endpoint');
-    const region = searchParams.get('defaultRegion');
-    if (endpoint && bucket && path) {
-      return { endpoint, bucket, region: region || undefined, path };
-    }
-    return null;
-  } catch {
-    return null;
-  }
-};
diff --git a/frontend/src/concepts/pipelines/content/createRun/contentSections/TriggerTypeField.tsx b/frontend/src/concepts/pipelines/content/createRun/contentSections/TriggerTypeField.tsx
index ffcdaaf817..4078328a03 100644
--- a/frontend/src/concepts/pipelines/content/createRun/contentSections/TriggerTypeField.tsx
+++ b/frontend/src/concepts/pipelines/content/createRun/contentSections/TriggerTypeField.tsx
@@ -36,7 +36,7 @@ const TriggerTypeField: React.FC<TriggerTypeFieldProps> = ({ data, onChange }) =
             clickTip="Copied"
             onChange={(e, value) => {
               if (typeof value === 'string') {
-                onChange({ ...data, value: value.trim() });
+                onChange({ ...data, value });
               }
             }}
           >
diff --git a/frontend/src/concepts/pipelines/content/pipelineSelector/PipelineSelector.tsx b/frontend/src/concepts/pipelines/content/pipelineSelector/PipelineSelector.tsx
index fd8a4126cf..38bc4d08b3 100644
--- a/frontend/src/concepts/pipelines/content/pipelineSelector/PipelineSelector.tsx
+++ b/frontend/src/concepts/pipelines/content/pipelineSelector/PipelineSelector.tsx
@@ -13,7 +13,6 @@ import {
   MenuToggle,
   SearchInput,
   Spinner,
-  Truncate,
 } from '@patternfly/react-core';
 import { TableVariant } from '@patternfly/react-table';
 import PipelineSelectorTableRow from '~/concepts/pipelines/content/pipelineSelector/PipelineSelectorTableRow';
@@ -128,14 +127,9 @@ const PipelineSelector: React.FC<PipelineSelectorProps> = ({ selection, onSelect
           isFullWidth
           data-testid="pipeline-toggle-button"
         >
-          <Truncate
-            content={
-              initialLoaded
-                ? selection || (totalSize === 0 ? 'No pipelines available' : 'Select a pipeline')
-                : 'Loading pipelines'
-            }
-            className="truncate-no-min-width"
-          />
+          {initialLoaded
+            ? selection || (totalSize === 0 ? 'No pipelines available' : 'Select a pipeline')
+            : 'Loading pipelines'}
         </MenuToggle>
       }
       menu={menu}
diff --git a/frontend/src/concepts/pipelines/content/pipelineSelector/useCreateSelectors.ts b/frontend/src/concepts/pipelines/content/pipelineSelector/useCreateSelectors.ts
index 7843ed6aac..1b44d6f898 100644
--- a/frontend/src/concepts/pipelines/content/pipelineSelector/useCreateSelectors.ts
+++ b/frontend/src/concepts/pipelines/content/pipelineSelector/useCreateSelectors.ts
@@ -18,8 +18,6 @@ import {
   ExperimentKFv2,
   PipelineCoreResourceKFv2,
   PipelineKFv2,
-  PipelinesFilterOp,
-  StorageStateKF,
 } from '~/concepts/pipelines/kfTypes';
 import { PipelineListPaged } from '~/concepts/pipelines/types';
 import { FetchState } from '~/utilities/useFetchState';
@@ -40,39 +38,18 @@ type UsePipelineSelectorData<DataType> = {
 };
 
 export const getExperimentSelector =
-  (useTable: typeof useExperimentTable, storageState?: StorageStateKF) =>
-  (): UsePipelineSelectorData<ExperimentKFv2> => {
+  (useTable: typeof useExperimentTable) => (): UsePipelineSelectorData<ExperimentKFv2> => {
     const experimentsTable = useTable();
     const [[{ items: initialData, nextPageToken: initialPageToken }, loaded]] = experimentsTable;
-
-    return useCreateSelector<ExperimentKFv2>(experimentsTable, () =>
-      useExperimentLoadMore({
-        initialData,
-        initialPageToken,
-        loaded,
-      })({
-        ...(storageState && {
-          filter: {
-            predicates: [
-              {
-                key: 'storage_state',
-                operation: PipelinesFilterOp.EQUALS,
-                // eslint-disable-next-line camelcase
-                string_value: storageState,
-              },
-            ],
-          },
-        }),
-      }),
+    return useCreateSelector<ExperimentKFv2>(
+      experimentsTable,
+      useExperimentLoadMore({ initialData, initialPageToken, loaded }),
     );
   };
 
 export const useAllExperimentSelector = getExperimentSelector(useExperimentTable);
 
-export const useActiveExperimentSelector = getExperimentSelector(
-  useActiveExperimentTable,
-  StorageStateKF.AVAILABLE,
-);
+export const useActiveExperimentSelector = getExperimentSelector(useActiveExperimentTable);
 
 export const usePipelineSelector = (): UsePipelineSelectorData<PipelineKFv2> => {
   const pipelinesTable = usePipelinesTable();
diff --git a/frontend/src/concepts/topology/PipelineTaskEdge.tsx b/frontend/src/concepts/topology/PipelineTaskEdge.tsx
index 8dcd4db24a..9cad5449a1 100644
--- a/frontend/src/concepts/topology/PipelineTaskEdge.tsx
+++ b/frontend/src/concepts/topology/PipelineTaskEdge.tsx
@@ -5,11 +5,10 @@ import {
   EdgeTerminalType,
   observer,
   TaskEdge,
-  WithSelectionProps,
   isEdge,
 } from '@patternfly/react-topology';
 
-interface PipelineTaskEdgeProps extends WithSelectionProps {
+interface PipelineTaskEdgeProps {
   element: GraphElement;
 }
 
diff --git a/frontend/src/concepts/topology/factories.ts b/frontend/src/concepts/topology/factories.ts
index 4e7aad9eea..bfe89022f4 100644
--- a/frontend/src/concepts/topology/factories.ts
+++ b/frontend/src/concepts/topology/factories.ts
@@ -28,7 +28,7 @@ export const pipelineComponentFactory: ComponentFactory = (kind, type) => {
     case DEFAULT_SPACER_NODE_TYPE:
       return SpacerNode;
     case DEFAULT_EDGE_TYPE:
-      return withSelection()(PipelineTaskEdge);
+      return PipelineTaskEdge;
     case EXECUTION_TASK_NODE_TYPE:
       return withSelection()(PipelineDefaultTaskGroup);
     default:
diff --git a/frontend/src/pages/connectionTypes/ConnectionTypeRoutes.tsx b/frontend/src/pages/connectionTypes/ConnectionTypeRoutes.tsx
new file mode 100644
index 0000000000..175c3eeec5
--- /dev/null
+++ b/frontend/src/pages/connectionTypes/ConnectionTypeRoutes.tsx
@@ -0,0 +1,18 @@
+import * as React from 'react';
+import { Navigate, Routes, Route } from 'react-router-dom';
+import { CreateConnectionTypePage } from './CreateConnectionType/CreateConnectionTypePage';
+import { DuplicateConnectionTypePage } from './CreateConnectionType/DuplicateConnectionTypePage';
+import { EditConnectionTypePage } from './CreateConnectionType/EditConnectionTypePage';
+
+const ConnectionTypeRoutes: React.FC = () => (
+  <Routes>
+    <Route path="/">
+      <Route path="create" element={<CreateConnectionTypePage />} />
+      <Route path="duplicate/:name" element={<DuplicateConnectionTypePage />} />
+      <Route path="edit/:name" element={<EditConnectionTypePage />} />
+      <Route path="*" element={<Navigate to="." />} />
+    </Route>
+  </Routes>
+);
+
+export default ConnectionTypeRoutes;
diff --git a/frontend/src/pages/connectionTypes/CreateConnectionType/CreateConnectionTypeBreadcrumbs.tsx b/frontend/src/pages/connectionTypes/CreateConnectionType/CreateConnectionTypeBreadcrumbs.tsx
new file mode 100644
index 0000000000..c13b7de2ca
--- /dev/null
+++ b/frontend/src/pages/connectionTypes/CreateConnectionType/CreateConnectionTypeBreadcrumbs.tsx
@@ -0,0 +1,11 @@
+import * as React from 'react';
+import { Breadcrumb, BreadcrumbItem } from '@patternfly/react-core';
+
+export const CreateConnectionTypeBreadcrumbs: React.FunctionComponent = () => (
+  <Breadcrumb ouiaId="BasicBreadcrumb">
+    <BreadcrumbItem to="/connectionTypes">Connection types</BreadcrumbItem>
+    <BreadcrumbItem to="#" isActive>
+      Create connection type
+    </BreadcrumbItem>
+  </Breadcrumb>
+);
diff --git a/frontend/src/pages/connectionTypes/CreateConnectionType/CreateConnectionTypeFieldsTable.tsx b/frontend/src/pages/connectionTypes/CreateConnectionType/CreateConnectionTypeFieldsTable.tsx
new file mode 100644
index 0000000000..acb8e82d89
--- /dev/null
+++ b/frontend/src/pages/connectionTypes/CreateConnectionType/CreateConnectionTypeFieldsTable.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import { Table, Thead, Tbody, Tr, Th } from '@patternfly/react-table';
+import { ConnectionTypeField } from '~/concepts/connectionTypes/types';
+import { CreateConnectionTypeFieldsTableRow } from './CreateConnectionTypeFieldsTableRow';
+
+type CreateConnectionTypeFieldsTableProps = {
+  fields: ConnectionTypeField[];
+};
+
+export const CreateConnectionTypeFieldsTable: React.FC<CreateConnectionTypeFieldsTableProps> = ({
+  fields,
+}) => {
+  const columns = [
+    'Section heading/field name',
+    'Type',
+    'Default value',
+    'Environment variable',
+    'Required',
+  ];
+
+  return (
+    <Table data-testid="connection-type-fields-table">
+      <Thead>
+        <Tr>
+          {columns.map((column, columnIndex) => (
+            <Th key={columnIndex}>{column}</Th>
+          ))}
+        </Tr>
+      </Thead>
+      <Tbody>
+        {fields.map((row, index) => (
+          <CreateConnectionTypeFieldsTableRow key={index} row={row} />
+        ))}
+      </Tbody>
+    </Table>
+  );
+};
diff --git a/frontend/src/pages/connectionTypes/CreateConnectionType/CreateConnectionTypeFieldsTableRow.tsx b/frontend/src/pages/connectionTypes/CreateConnectionType/CreateConnectionTypeFieldsTableRow.tsx
new file mode 100644
index 0000000000..e668657ec3
--- /dev/null
+++ b/frontend/src/pages/connectionTypes/CreateConnectionType/CreateConnectionTypeFieldsTableRow.tsx
@@ -0,0 +1,51 @@
+import * as React from 'react';
+import { Td, Tr } from '@patternfly/react-table';
+import { Label, Switch } from '@patternfly/react-core';
+import { ConnectionTypeField, ConnectionTypeFieldType } from '~/concepts/connectionTypes/types';
+
+type CreateConnectionTypeFieldsTableRowProps = {
+  row: ConnectionTypeField;
+};
+
+export const CreateConnectionTypeFieldsTableRow: React.FC<
+  CreateConnectionTypeFieldsTableRowProps
+> = ({ row }) => {
+  if (row.type === ConnectionTypeFieldType.Section) {
+    return (
+      <Tr id={row.name} isStriped data-testid="row section-row">
+        <Td>
+          {row.name}{' '}
+          <Label color="blue" data-testid="section-heading">
+            Section heading
+          </Label>
+          <br />
+          <small>{row.description}</small>
+        </Td>
+        <Td />
+        <Td />
+        <Td />
+        <Td />
+      </Tr>
+    );
+  }
+  return (
+    <Tr id={row.name} data-testid="row field-row">
+      <Td>
+        {row.name}
+        <br />
+        <small>{row.description}</small>
+      </Td>
+      <Td data-testid="field-type">{row.type}</Td>
+      <Td data-testid="field-default">{row.properties.defaultValue || '-'}</Td>
+      <Td data-testid="field-env">{row.envVar || '-'}</Td>
+      <Td>
+        <Switch
+          aria-label="switch"
+          isChecked={row.required}
+          isDisabled
+          data-testid="field-required"
+        />
+      </Td>
+    </Tr>
+  );
+};
diff --git a/frontend/src/pages/connectionTypes/CreateConnectionType/CreateConnectionTypeFooter.tsx b/frontend/src/pages/connectionTypes/CreateConnectionType/CreateConnectionTypeFooter.tsx
new file mode 100644
index 0000000000..724558bdd3
--- /dev/null
+++ b/frontend/src/pages/connectionTypes/CreateConnectionType/CreateConnectionTypeFooter.tsx
@@ -0,0 +1,74 @@
+import * as React from 'react';
+import { ActionList, ActionListItem, Button, Stack, StackItem } from '@patternfly/react-core';
+import { useNavigate } from 'react-router';
+import { NameDescType } from '~/pages/projects/types';
+import { createConnectionType } from '~/services/connectionTypesService';
+import { ConnectionTypeField } from '~/concepts/connectionTypes/types';
+import { translateDisplayNameForK8s } from '~/concepts/k8s/utils';
+import { createConnectionTypeObj } from './CreateConnectionTypeUtils';
+
+type CreateConnectionTypeFooterProps = {
+  nameDesc: NameDescType;
+  enabled: boolean;
+  fields: ConnectionTypeField[];
+};
+
+export const CreateConnectionTypeFooter: React.FC<CreateConnectionTypeFooterProps> = ({
+  nameDesc,
+  enabled,
+  fields,
+}) => {
+  const navigate = useNavigate();
+
+  const isValid = React.useMemo(() => Boolean(nameDesc.name), [nameDesc.name]);
+
+  const onSave = async () => {
+    if (isValid) {
+      const connection = createConnectionTypeObj(
+        {
+          k8sName: translateDisplayNameForK8s(nameDesc.name),
+          displayName: nameDesc.name,
+          description: nameDesc.description,
+          enabled,
+          username: '',
+        },
+        fields,
+      );
+      try {
+        await createConnectionType(connection);
+        navigate('/connectionTypes');
+      } catch (e) {
+        alert(`Could not create connect type: ${e}`);
+      }
+    }
+  };
+
+  const onCancel = () => {
+    navigate('/connectionTypes');
+  };
+
+  return (
+    <Stack>
+      <StackItem>
+        <ActionList>
+          <ActionListItem>
+            <Button
+              isDisabled={!isValid}
+              variant="primary"
+              data-testid="submit-button"
+              id="create-button"
+              onClick={onSave}
+            >
+              Create
+            </Button>
+          </ActionListItem>
+          <ActionListItem>
+            <Button variant="link" id="cancel-button" onClick={onCancel}>
+              Cancel
+            </Button>
+          </ActionListItem>
+        </ActionList>
+      </StackItem>
+    </Stack>
+  );
+};
diff --git a/frontend/src/pages/connectionTypes/CreateConnectionType/CreateConnectionTypePage.tsx b/frontend/src/pages/connectionTypes/CreateConnectionType/CreateConnectionTypePage.tsx
new file mode 100644
index 0000000000..4dc51a1cd1
--- /dev/null
+++ b/frontend/src/pages/connectionTypes/CreateConnectionType/CreateConnectionTypePage.tsx
@@ -0,0 +1,81 @@
+import * as React from 'react';
+import { Checkbox, Form, FormGroup, FormSection, PageSection } from '@patternfly/react-core';
+import ApplicationsPage from '~/pages/ApplicationsPage';
+import { ConnectionTypeField } from '~/concepts/connectionTypes/types';
+import NameDescriptionField from '~/concepts/k8s/NameDescriptionField';
+import { NameDescType } from '~/pages/projects/types';
+import { CreateConnectionTypeFooter } from './CreateConnectionTypeFooter';
+import { CreateConnectionTypeFieldsTable } from './CreateConnectionTypeFieldsTable';
+import { CreateConnectionTypeBreadcrumbs } from './CreateConnectionTypeBreadcrumbs';
+
+type CreateConnectionTypePageProps = {
+  prefillNameDesc?: NameDescType;
+  prefillEnabled?: boolean;
+  prefillFields?: ConnectionTypeField[];
+};
+
+export const CreateConnectionTypePage: React.FC<CreateConnectionTypePageProps> = ({
+  prefillNameDesc,
+  prefillEnabled,
+  prefillFields,
+}) => {
+  const [connectionNameDesc, setConnectionNameDesc] = React.useState<NameDescType>(
+    prefillNameDesc || {
+      name: '',
+      k8sName: undefined,
+      description: '',
+    },
+  );
+  const [connectionEnabled, setConnectionEnabled] = React.useState<boolean>(
+    prefillEnabled || false,
+  );
+  const [connectionFields] = React.useState<ConnectionTypeField[]>(prefillFields || []);
+
+  return (
+    <ApplicationsPage
+      title="Create connection type"
+      loaded
+      empty={false}
+      errorMessage="Unable load to connection types"
+      breadcrumb={<CreateConnectionTypeBreadcrumbs />}
+    >
+      <PageSection isFilled variant="light">
+        <Form>
+          <FormSection title="Type details" style={{ maxWidth: 625 }}>
+            <NameDescriptionField
+              nameFieldId="connection-type-name"
+              nameFieldLabel="Connection type name"
+              descriptionFieldId="connection-type-description"
+              descriptionFieldLabel="Connection type description"
+              data={connectionNameDesc}
+              setData={setConnectionNameDesc}
+              autoFocusName
+            />
+            <FormGroup label="Enable">
+              <Checkbox
+                label="Connection is enabled and therefore available to use by users in your org"
+                id="connection-type-enable"
+                name="connection-type-enable"
+                data-testid="connection-type-enable"
+                isChecked={connectionEnabled}
+                onChange={(_e, value) => setConnectionEnabled(value)}
+              />
+            </FormGroup>
+          </FormSection>
+          <FormSection title="Fields">
+            <FormGroup>
+              <CreateConnectionTypeFieldsTable fields={connectionFields} />
+            </FormGroup>
+          </FormSection>
+        </Form>
+      </PageSection>
+      <PageSection stickyOnBreakpoint={{ default: 'bottom' }} variant="light">
+        <CreateConnectionTypeFooter
+          nameDesc={connectionNameDesc}
+          enabled={connectionEnabled}
+          fields={connectionFields}
+        />
+      </PageSection>
+    </ApplicationsPage>
+  );
+};
diff --git a/frontend/src/pages/connectionTypes/CreateConnectionType/CreateConnectionTypeUtils.ts b/frontend/src/pages/connectionTypes/CreateConnectionType/CreateConnectionTypeUtils.ts
new file mode 100644
index 0000000000..bcd162f32d
--- /dev/null
+++ b/frontend/src/pages/connectionTypes/CreateConnectionType/CreateConnectionTypeUtils.ts
@@ -0,0 +1,41 @@
+import { ConnectionTypeConfigMapObj, ConnectionTypeField } from '~/concepts/connectionTypes/types';
+import { NameDescType } from '~/pages/projects/types';
+
+export const extractConnectionTypeFromMap = (
+  configMap?: ConnectionTypeConfigMapObj,
+): [nameDesc: NameDescType, enabled: boolean, fields: ConnectionTypeField[]] => [
+  {
+    k8sName: configMap?.metadata.name ?? '',
+    name: configMap?.metadata.annotations['openshift.io/display-name'] ?? '',
+    description: configMap?.metadata.annotations['openshift.io/description'] ?? '',
+  },
+  configMap?.metadata.annotations['opendatahub.io/enabled'] === 'true',
+  configMap?.data?.fields ?? [],
+];
+
+export const createConnectionTypeObj = (
+  metadata: {
+    k8sName: string;
+    displayName: string;
+    description: string;
+    enabled: boolean;
+    username: string;
+  },
+  fields: ConnectionTypeField[],
+): ConnectionTypeConfigMapObj => ({
+  kind: 'ConfigMap',
+  apiVersion: 'v1',
+  metadata: {
+    name: metadata.k8sName,
+    annotations: {
+      'openshift.io/display-name': metadata.displayName,
+      'openshift.io/description': metadata.description,
+      'opendatahub.io/enabled': metadata.enabled ? 'true' : 'false',
+      'opendatahub.io/username': metadata.username,
+    },
+    labels: { 'opendatahub.io/dashboard': 'true', 'opendatahub.io/connection-type': 'true' },
+  },
+  data: {
+    fields,
+  },
+});
diff --git a/frontend/src/pages/connectionTypes/CreateConnectionType/DuplicateConnectionTypePage.tsx b/frontend/src/pages/connectionTypes/CreateConnectionType/DuplicateConnectionTypePage.tsx
new file mode 100644
index 0000000000..628bac24a3
--- /dev/null
+++ b/frontend/src/pages/connectionTypes/CreateConnectionType/DuplicateConnectionTypePage.tsx
@@ -0,0 +1,31 @@
+import * as React from 'react';
+import { useParams } from 'react-router';
+import ApplicationsPage from '~/pages/ApplicationsPage';
+import { useConnectionType } from '~/concepts/connectionTypes/useConnectionType';
+import { CreateConnectionTypePage } from './CreateConnectionTypePage';
+import { extractConnectionTypeFromMap } from './CreateConnectionTypeUtils';
+
+export const DuplicateConnectionTypePage: React.FC = () => {
+  const { name } = useParams();
+
+  const [loaded, error, existingConnectionType] = useConnectionType(name);
+  const [nameDesc, enabled, fields] = React.useMemo(
+    () => extractConnectionTypeFromMap(existingConnectionType),
+    [existingConnectionType],
+  );
+
+  if (existingConnectionType) {
+    return (
+      <CreateConnectionTypePage
+        prefillNameDesc={{
+          k8sName: undefined,
+          name: `Duplicate of ${nameDesc.name}`,
+          description: nameDesc.description,
+        }}
+        prefillEnabled={enabled}
+        prefillFields={fields}
+      />
+    );
+  }
+  return <ApplicationsPage loaded={loaded} loadError={error} empty />;
+};
diff --git a/frontend/src/pages/connectionTypes/CreateConnectionType/EditConnectionTypePage.tsx b/frontend/src/pages/connectionTypes/CreateConnectionType/EditConnectionTypePage.tsx
new file mode 100644
index 0000000000..ba27369fd0
--- /dev/null
+++ b/frontend/src/pages/connectionTypes/CreateConnectionType/EditConnectionTypePage.tsx
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import { CreateConnectionTypePage } from './CreateConnectionTypePage';
+
+export const EditConnectionTypePage: React.FC = () => <CreateConnectionTypePage />;
diff --git a/frontend/src/pages/modelRegistry/screens/RegisterModel/RegisterModel.tsx b/frontend/src/pages/modelRegistry/screens/RegisterModel/RegisterModel.tsx
index bfb563fb95..f3724e6707 100644
--- a/frontend/src/pages/modelRegistry/screens/RegisterModel/RegisterModel.tsx
+++ b/frontend/src/pages/modelRegistry/screens/RegisterModel/RegisterModel.tsx
@@ -13,7 +13,6 @@ import {
   HelperTextItem,
   InputGroupItem,
   InputGroupText,
-  PageSection,
   Radio,
   Split,
   SplitItem,
@@ -24,40 +23,41 @@ import {
   TextInput,
   Title,
 } from '@patternfly/react-core';
-import spacing from '@patternfly/react-styles/css/utilities/Spacing/spacing';
-import { useParams, useNavigate } from 'react-router';
+import { useParams } from 'react-router';
 import { Link } from 'react-router-dom';
 import ApplicationsPage from '~/pages/ApplicationsPage';
-import { ModelRegistryContext } from '~/concepts/modelRegistry/context/ModelRegistryContext';
-import { useAppSelector } from '~/redux/hooks';
-import { useRegisterModelData, ModelLocationType } from './useRegisterModelData';
-import { registerModel } from './utils';
+import useRegisterModelData from './useRegisterModelData';
 
 const RegisterModel: React.FC = () => {
   const { modelRegistry: mrName } = useParams();
-  const navigate = useNavigate();
-  const [formData, setData] = useRegisterModelData();
-  const {
-    modelName,
-    modelDescription,
-    versionName,
-    versionDescription,
-    sourceModelFormat,
-    sourceModelFormatVersion,
-    modelLocationType,
-    modelLocationEndpoint,
-    modelLocationBucket,
-    modelLocationRegion,
-    modelLocationPath,
-    modelLocationURI,
-  } = formData;
+  const [
+    {
+      modelRegistryName,
+      modelName,
+      modelDescription,
+      versionName,
+      versionDescription,
+      sourceModelFormat,
+      modelLocationType,
+      modelLocationEndpoint,
+      modelLocationBucket,
+      modelLocationRegion,
+      modelLocationPath,
+      modelLocationURI,
+    },
+    setData,
+    resetData,
+  ] = useRegisterModelData(mrName);
   const [loading, setIsLoading] = React.useState(false);
   const [error, setError] = React.useState<Error | undefined>(undefined);
 
-  const { apiState } = React.useContext(ModelRegistryContext);
-  const author = useAppSelector((state) => state.user || '');
+  enum ModelLocationType {
+    ObjectStorage = 'Object storage',
+    URI = 'URI',
+  }
 
   const isSubmitDisabled =
+    !modelRegistryName ||
     !modelName ||
     !versionName ||
     loading ||
@@ -68,15 +68,23 @@ const RegisterModel: React.FC = () => {
   const handleSubmit = () => {
     setIsLoading(true);
     setError(undefined);
-
-    registerModel(apiState, formData, author)
-      .then(({ registeredModel }) => {
-        navigate(`/modelRegistry/${mrName}/registeredModels/${registeredModel.id}`);
-      })
-      .catch((e: Error) => {
-        setIsLoading(false);
-        setError(e);
-      });
+    //TODO: implement submit calls/logic. remove console log and alert
+    alert('This functionality is not yet implemented');
+    /* eslint-disable-next-line no-console */
+    console.log({
+      modelRegistryName,
+      modelName,
+      modelDescription,
+      versionName,
+      versionDescription,
+      sourceModelFormat,
+      modelLocationType,
+      modelLocationEndpoint,
+      modelLocationBucket,
+      modelLocationRegion,
+      modelLocationPath,
+      modelLocationURI,
+    });
   };
 
   return (
@@ -85,233 +93,206 @@ const RegisterModel: React.FC = () => {
       description="Create a new model and register a first version of the new model."
       breadcrumb={
         <Breadcrumb>
+          <BreadcrumbItem render={() => <Link to="/modelRegistry">Model registry</Link>} />
           <BreadcrumbItem
-            render={() => <Link to={`/modelRegistry/${mrName}`}>Model registry - {mrName}</Link>}
+            render={() => (
+              <Link to={`/modelRegistry/${modelRegistryName}`}>{modelRegistryName}</Link>
+            )}
           />
           <BreadcrumbItem>Register model</BreadcrumbItem>
         </Breadcrumb>
       }
       loaded
       empty={false}
+      provideChildrenPadding
     >
-      <PageSection variant="light" isFilled>
-        <Form isWidthLimited>
-          <Stack hasGutter>
-            <StackItem>
-              <FormGroup
-                label="Model registry"
+      <Form>
+        <Stack hasGutter>
+          <StackItem>
+            <FormGroup label="Model registry" isRequired fieldId="mr-name">
+              <TextInput
+                isDisabled
                 isRequired
-                fieldId="mr-name"
-                className={spacing.mbLg}
-              >
+                type="text"
+                id="mr-name"
+                name="mr-name"
+                value={modelRegistryName}
+              />
+            </FormGroup>
+          </StackItem>
+          <StackItem>
+            <FormSection
+              title={
+                <>
+                  <Title headingLevel="h2">Model info</Title>
+                  <Text component="p" className="form-subtitle-text">
+                    Configure the model info you want to create.
+                  </Text>
+                </>
+              }
+            >
+              <FormGroup label="Model name" isRequired fieldId="model-name">
                 <TextInput
-                  isDisabled
                   isRequired
                   type="text"
-                  id="mr-name"
-                  name="mr-name"
-                  value={mrName}
+                  id="model-name"
+                  name="model-name"
+                  value={modelName}
+                  onChange={(_e, value) => setData('modelName', value)}
                 />
               </FormGroup>
-            </StackItem>
-            <StackItem>
-              <FormSection
-                title={
-                  <>
-                    <Title headingLevel="h2" size="md">
-                      Model details
-                    </Title>
-                    <Text component="p" className="form-subtitle-text">
-                      Provide general details that apply to all versions of this model.
-                    </Text>
-                  </>
-                }
-              >
-                <FormGroup label="Model name" isRequired fieldId="model-name">
-                  <TextInput
-                    isRequired
-                    type="text"
-                    id="model-name"
-                    name="model-name"
-                    value={modelName}
-                    onChange={(_e, value) => setData('modelName', value)}
-                  />
-                </FormGroup>
-                <FormGroup label="Model description" fieldId="model-description">
-                  <TextArea
-                    type="text"
-                    id="model-description"
-                    name="model-description"
-                    value={modelDescription}
-                    onChange={(_e, value) => setData('modelDescription', value)}
-                  />
-                </FormGroup>
-              </FormSection>
-              <FormSection
-                title={
-                  <>
-                    <Title headingLevel="h2">Version details</Title>
-                    <Text component="p" className="form-subtitle-text">
-                      Configure details for the first version of this model.
-                    </Text>
-                  </>
-                }
-              >
-                <FormGroup label="Version name" isRequired fieldId="version-name">
-                  <TextInput
-                    isRequired
-                    type="text"
-                    id="version-name"
-                    name="version-name"
-                    value={versionName}
-                    onChange={(_e, value) => setData('versionName', value)}
-                  />
-                </FormGroup>
-                <FormGroup label="Version description" fieldId="version-description">
-                  <TextArea
-                    type="text"
-                    id="version-description"
-                    name="version-description"
-                    value={versionDescription}
-                    onChange={(_e, value) => setData('versionDescription', value)}
-                  />
-                </FormGroup>
-                <FormGroup label="Source model format" fieldId="source-model-format">
-                  <TextInput
-                    type="text"
-                    placeholder="Example, tensorflow"
-                    id="source-model-format"
-                    name="source-model-format"
-                    value={sourceModelFormat}
-                    onChange={(_e, value) => setData('sourceModelFormat', value)}
-                  />
-                </FormGroup>
-                <FormGroup
-                  label="Source model format version"
-                  fieldId="source-model-format-version"
-                >
-                  <TextInput
-                    type="text"
-                    placeholder="Example, 1"
-                    id="source-model-format-version"
-                    name="source-model-format-version"
-                    value={sourceModelFormatVersion}
-                    onChange={(_e, value) => setData('sourceModelFormatVersion', value)}
-                  />
-                </FormGroup>
-              </FormSection>
-              <FormSection
-                title={
-                  <>
-                    <Title headingLevel="h2">Model location</Title>
-                    <Text component="p" className="form-subtitle-text">
-                      Specify the model location by providing either the object storage details or
-                      the URI.
-                    </Text>
-                  </>
-                }
-              >
-                <Radio
-                  isChecked={modelLocationType === ModelLocationType.ObjectStorage}
-                  name="location-type-object-storage"
-                  onChange={() => {
-                    setData('modelLocationType', ModelLocationType.ObjectStorage);
-                  }}
-                  label="Object storage"
-                  id="location-type-object-storage"
-                  body={
-                    modelLocationType === ModelLocationType.ObjectStorage && (
-                      <Form>
-                        <FormGroup label="Endpoint" isRequired fieldId="location-endpoint">
-                          <TextInput
-                            isRequired
-                            type="text"
-                            id="location-endpoint"
-                            name="location-endpoint"
-                            value={modelLocationEndpoint}
-                            onChange={(_e, value) => setData('modelLocationEndpoint', value)}
-                          />
-                        </FormGroup>
-                        <FormGroup label="Bucket" isRequired fieldId="location-bucket">
-                          <TextInput
-                            isRequired
-                            type="text"
-                            id="location-bucket"
-                            name="location-bucket"
-                            value={modelLocationBucket}
-                            onChange={(_e, value) => setData('modelLocationBucket', value)}
-                          />
-                        </FormGroup>
-                        <FormGroup label="Region" fieldId="location-region">
-                          <TextInput
-                            type="text"
-                            id="location-region"
-                            name="location-region"
-                            value={modelLocationRegion}
-                            onChange={(_e, value) => setData('modelLocationRegion', value)}
-                          />
-                        </FormGroup>
-                        <FormGroup label="Path" isRequired fieldId="location-path">
-                          <Split hasGutter>
-                            <SplitItem>
-                              <InputGroupText isPlain>/</InputGroupText>
-                            </SplitItem>
-                            <SplitItem isFilled>
-                              <InputGroupItem>
-                                <TextInput
-                                  isRequired
-                                  type="text"
-                                  id="location-path"
-                                  name="location-path"
-                                  value={modelLocationPath}
-                                  onChange={(_e, value) => setData('modelLocationPath', value)}
-                                />
-                              </InputGroupItem>
-                            </SplitItem>
-                          </Split>
-                          <HelperText>
-                            <HelperTextItem>
-                              Enter a path to a model or folder. This path cannot point to a root
-                              folder.
-                            </HelperTextItem>
-                          </HelperText>
-                        </FormGroup>
-                      </Form>
-                    )
-                  }
+              <FormGroup label="Model description" fieldId="model-description">
+                <TextArea
+                  type="text"
+                  id="model-description"
+                  name="model-description"
+                  value={modelDescription}
+                  onChange={(_e, value) => setData('modelDescription', value)}
+                />
+              </FormGroup>
+            </FormSection>
+            <FormSection
+              title={
+                <>
+                  <Title headingLevel="h2">Version info</Title>
+                  <Text component="p" className="form-subtitle-text">
+                    Configure the version info for the run that you want to register.
+                  </Text>
+                </>
+              }
+            >
+              <FormGroup label="Version name" isRequired fieldId="version-name">
+                <TextInput
+                  isRequired
+                  type="text"
+                  id="version-name"
+                  name="version-name"
+                  value={versionName}
+                  onChange={(_e, value) => setData('versionName', value)}
+                />
+              </FormGroup>
+              <FormGroup label="Version description" fieldId="version-description">
+                <TextArea
+                  type="text"
+                  id="version-description"
+                  name="version-description"
+                  value={versionDescription}
+                  onChange={(_e, value) => setData('versionDescription', value)}
+                />
+              </FormGroup>
+              <FormGroup label="Source model format" fieldId="source-model-format">
+                <TextInput
+                  type="text"
+                  placeholder="Example, tensorflow"
+                  id="source-model-format"
+                  name="source-model-format"
+                  value={sourceModelFormat}
+                  onChange={(_e, value) => setData('sourceModelFormat', value)}
                 />
-                <Radio
-                  isChecked={modelLocationType === ModelLocationType.URI}
-                  name="location-type-uri"
-                  onChange={() => {
-                    setData('modelLocationType', ModelLocationType.URI);
-                  }}
-                  label="URI"
-                  id="location-type-uri"
-                  body={
-                    modelLocationType === ModelLocationType.URI && (
-                      <Form>
-                        <FormGroup label="URI" isRequired fieldId="location-uri">
+              </FormGroup>
+            </FormSection>
+            <FormSection
+              title={
+                <>
+                  <Title headingLevel="h2">Model location</Title>
+                  <Text component="p" className="form-subtitle-text">
+                    Specify the model location by providing either the object storage details or the
+                    URI.
+                  </Text>
+                </>
+              }
+            >
+              <Radio
+                isChecked={modelLocationType === ModelLocationType.ObjectStorage}
+                name="location-type-object-storage"
+                onChange={() => {
+                  setData('modelLocationType', ModelLocationType.ObjectStorage);
+                }}
+                label="Object storage"
+                id="location-type-object-storage"
+              />
+              {modelLocationType === ModelLocationType.ObjectStorage && (
+                <>
+                  <FormGroup label="Endpoint" isRequired fieldId="location-endpoint">
+                    <TextInput
+                      isRequired
+                      type="text"
+                      id="location-endpoint"
+                      name="location-endpoint"
+                      value={modelLocationEndpoint}
+                      onChange={(_e, value) => setData('modelLocationEndpoint', value)}
+                    />
+                  </FormGroup>
+                  <FormGroup label="Bucket" isRequired fieldId="location-bucket">
+                    <TextInput
+                      isRequired
+                      type="text"
+                      id="location-bucket"
+                      name="location-bucket"
+                      value={modelLocationBucket}
+                      onChange={(_e, value) => setData('modelLocationBucket', value)}
+                    />
+                  </FormGroup>
+                  <FormGroup label="Region" fieldId="location-region">
+                    <TextInput
+                      type="text"
+                      id="location-region"
+                      name="location-region"
+                      value={modelLocationRegion}
+                      onChange={(_e, value) => setData('modelLocationRegion', value)}
+                    />
+                  </FormGroup>
+                  <FormGroup label="Path" isRequired fieldId="location-path">
+                    <Split hasGutter>
+                      <SplitItem>
+                        <InputGroupText isPlain>/</InputGroupText>
+                      </SplitItem>
+                      <SplitItem isFilled>
+                        <InputGroupItem>
                           <TextInput
                             isRequired
                             type="text"
-                            id="location-uri"
-                            name="location-uri"
-                            value={modelLocationURI}
-                            onChange={(_e, value) => setData('modelLocationURI', value)}
+                            id="location-path"
+                            name="location-path"
+                            value={modelLocationPath}
+                            onChange={(_e, value) => setData('modelLocationPath', value)}
                           />
-                        </FormGroup>
-                      </Form>
-                    )
-                  }
-                />
-              </FormSection>
-            </StackItem>
-          </Stack>
-        </Form>
-      </PageSection>
-      <PageSection stickyOnBreakpoint={{ default: 'bottom' }} variant="light">
-        <Stack hasGutter>
+                        </InputGroupItem>
+                      </SplitItem>
+                    </Split>
+                    <HelperText>
+                      <HelperTextItem>
+                        Enter a path to a model or folder. This path cannot point to a root folder.
+                      </HelperTextItem>
+                    </HelperText>
+                  </FormGroup>
+                </>
+              )}
+              <Radio
+                isChecked={modelLocationType === ModelLocationType.URI}
+                name="location-type-uri"
+                onChange={() => {
+                  setData('modelLocationType', ModelLocationType.URI);
+                }}
+                label="URI"
+                id="location-type-uri"
+              />
+              {modelLocationType === ModelLocationType.URI && (
+                <>
+                  <FormGroup label="URI" isRequired fieldId="location-uri">
+                    <TextInput
+                      isRequired
+                      type="text"
+                      id="location-uri"
+                      name="location-uri"
+                      value={modelLocationURI}
+                      onChange={(_e, value) => setData('modelLocationURI', value)}
+                    />
+                  </FormGroup>
+                </>
+              )}
+            </FormSection>
+          </StackItem>
           {error && (
             <StackItem>
               <Alert
@@ -340,14 +321,14 @@ const RegisterModel: React.FC = () => {
                 isDisabled={loading}
                 variant="link"
                 id="cancel-button"
-                onClick={() => navigate(`/modelRegistry/${mrName}`)}
+                onClick={() => resetData()}
               >
                 Cancel
               </Button>
             </ActionGroup>
           </StackItem>
         </Stack>
-      </PageSection>
+      </Form>
     </ApplicationsPage>
   );
 };
diff --git a/frontend/src/pages/modelRegistry/screens/RegisterModel/useRegisterModelData.ts b/frontend/src/pages/modelRegistry/screens/RegisterModel/useRegisterModelData.ts
index f35c69527b..d1e59e301f 100644
--- a/frontend/src/pages/modelRegistry/screens/RegisterModel/useRegisterModelData.ts
+++ b/frontend/src/pages/modelRegistry/screens/RegisterModel/useRegisterModelData.ts
@@ -1,21 +1,13 @@
 import useGenericObjectState, { GenericObjectState } from '~/utilities/useGenericObjectState';
 
-export enum ModelLocationType {
-  ObjectStorage = 'Object storage',
-  URI = 'URI',
-}
-
-export type RegisterModelFormData = RegisterVersionFormData & {
+export type RegisterModelData = {
+  modelRegistryName: string;
   modelName: string;
   modelDescription: string;
-};
-
-export type RegisterVersionFormData = {
   versionName: string;
   versionDescription: string;
   sourceModelFormat: string;
-  sourceModelFormatVersion: string;
-  modelLocationType: ModelLocationType;
+  modelLocationType: string;
   modelLocationEndpoint: string;
   modelLocationBucket: string;
   modelLocationRegion: string;
@@ -23,26 +15,20 @@ export type RegisterVersionFormData = {
   modelLocationURI: string;
 };
 
-const registerVersionFormDataDefaults: RegisterVersionFormData = {
-  versionName: '',
-  versionDescription: '',
-  sourceModelFormat: '',
-  sourceModelFormatVersion: '',
-  modelLocationType: ModelLocationType.ObjectStorage,
-  modelLocationEndpoint: '',
-  modelLocationBucket: '',
-  modelLocationRegion: '',
-  modelLocationPath: '',
-  modelLocationURI: '',
-};
-const registerModelFormDataDefaults: RegisterModelFormData = {
-  ...registerVersionFormDataDefaults,
-  modelName: '',
-  modelDescription: '',
-};
-
-export const useRegisterModelData = (): GenericObjectState<RegisterModelFormData> =>
-  useGenericObjectState<RegisterModelFormData>(registerModelFormDataDefaults);
+const useRegisterModelData = (mrName?: string): GenericObjectState<RegisterModelData> =>
+  useGenericObjectState<RegisterModelData>({
+    modelRegistryName: mrName || '',
+    modelName: '',
+    modelDescription: '',
+    versionName: '',
+    versionDescription: '',
+    sourceModelFormat: '',
+    modelLocationType: 'Object storage',
+    modelLocationEndpoint: '',
+    modelLocationBucket: '',
+    modelLocationRegion: '',
+    modelLocationPath: '',
+    modelLocationURI: '',
+  });
 
-export const useRegisterVersionData = (): GenericObjectState<RegisterVersionFormData> =>
-  useGenericObjectState<RegisterVersionFormData>(registerVersionFormDataDefaults);
+export default useRegisterModelData;
diff --git a/frontend/src/pages/modelRegistry/screens/RegisterModel/utils.ts b/frontend/src/pages/modelRegistry/screens/RegisterModel/utils.ts
deleted file mode 100644
index aec7c75c53..0000000000
--- a/frontend/src/pages/modelRegistry/screens/RegisterModel/utils.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import {
-  ModelArtifact,
-  ModelArtifactState,
-  ModelState,
-  ModelVersion,
-  RegisteredModel,
-} from '~/concepts/modelRegistry/types';
-import { ModelRegistryAPIState } from '~/concepts/modelRegistry/context/useModelRegistryAPIState';
-import { objectStorageFieldsToUri } from '~/concepts/modelRegistry/utils';
-import {
-  ModelLocationType,
-  RegisterModelFormData,
-  RegisterVersionFormData,
-} from './useRegisterModelData';
-
-export type RegisterModelCreatedResources = RegisterVersionCreatedResources & {
-  registeredModel: RegisteredModel;
-};
-
-export type RegisterVersionCreatedResources = {
-  modelVersion: ModelVersion;
-  modelArtifact: ModelArtifact;
-};
-
-export const registerModel = async (
-  apiState: ModelRegistryAPIState,
-  formData: RegisterModelFormData,
-  author: string,
-): Promise<RegisterModelCreatedResources> => {
-  const registeredModel = await apiState.api.createRegisteredModel(
-    {},
-    {
-      name: formData.modelName,
-      description: formData.modelDescription,
-      customProperties: {},
-      state: ModelState.LIVE,
-    },
-  );
-  const { modelVersion, modelArtifact } = await registerVersion(
-    apiState,
-    registeredModel,
-    formData,
-    author,
-  );
-  return { registeredModel, modelVersion, modelArtifact };
-};
-
-export const registerVersion = async (
-  apiState: ModelRegistryAPIState,
-  registeredModel: RegisteredModel,
-  formData: RegisterVersionFormData,
-  author: string,
-): Promise<RegisterVersionCreatedResources> => {
-  const modelVersion = await apiState.api.createModelVersionForRegisteredModel(
-    {},
-    registeredModel.id,
-    {
-      name: formData.versionName,
-      description: formData.versionDescription,
-      customProperties: {},
-      state: ModelState.LIVE,
-      author,
-      registeredModelId: registeredModel.id,
-    },
-  );
-  const modelArtifact = await apiState.api.createModelArtifactForModelVersion({}, modelVersion.id, {
-    name: `${registeredModel.name}-${formData.versionName}-artifact`,
-    description: formData.versionDescription,
-    customProperties: {},
-    state: ModelArtifactState.LIVE,
-    author,
-    modelFormatName: formData.sourceModelFormat,
-    modelFormatVersion: formData.sourceModelFormatVersion,
-    // TODO fill in the name of the data connection we used to prefill if we used one
-    // TODO this should be done as part of https://issues.redhat.com/browse/RHOAIENG-9914
-    // storageKey: 'TODO',
-    uri:
-      formData.modelLocationType === ModelLocationType.ObjectStorage
-        ? objectStorageFieldsToUri({
-            endpoint: formData.modelLocationEndpoint,
-            bucket: formData.modelLocationBucket,
-            region: formData.modelLocationRegion,
-            path: formData.modelLocationPath,
-          }) || '' // We'll only hit this case if required fields are empty strings, so form validation should catch it.
-        : formData.modelLocationURI,
-    artifactType: 'model-artifact',
-  });
-  return { modelVersion, modelArtifact };
-};