diff --git a/package.json b/package.json
index 305185c67..6b404eb04 100644
--- a/package.json
+++ b/package.json
@@ -93,10 +93,12 @@
     "patternfly-react": "2.x",
     "prettier": "1.x",
     "prop-types": "15.x",
+    "redux": "3.x",
     "react": "16.x",
     "react-cosmos": "4.7.x",
     "react-cosmos-test": "4.7.x",
     "react-dom": "16.x",
+    "react-redux": "5.x",
     "react-router-dom": "4.x",
     "require-all": "3.x",
     "sass-loader": "7.x",
diff --git a/sass/components/Wizard/create-vm-wizard.scss b/sass/components/Wizard/create-vm-wizard.scss
index 01aa5ecb7..54bc48071 100644
--- a/sass/components/Wizard/create-vm-wizard.scss
+++ b/sass/components/Wizard/create-vm-wizard.scss
@@ -23,10 +23,8 @@
   min-height: 100px;
 }
 
-.kubevirt-create-vm-wizard__import-vmware-passwordcheck-button-section {
-  margin-top: 10px; /* More compact, higher-level sections are 15px */
-  display: inline-flex;
-  width: 100%;
+.kubevirt-create-vm-wizard__import-vmware-password {
+  margin-bottom: 10px; /* More compact, higher-level sections are 15px */
 }
 
 .kubevirt-create-vm-wizard__import-vmware-passwordcheck-button {
diff --git a/src/components/Form/Dropdown.js b/src/components/Form/Dropdown.js
index a5f9b6de1..95b591ed0 100644
--- a/src/components/Form/Dropdown.js
+++ b/src/components/Form/Dropdown.js
@@ -1,10 +1,11 @@
 import React from 'react';
+import { isObject } from 'lodash';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { ButtonGroup, DropdownButton, MenuItem, noop, Tooltip, OverlayTrigger } from 'patternfly-react';
 
 export const Dropdown = ({ id, value, disabled, onChange, choices, className, withTooltips }) => {
-  const title = typeof value === 'object' ? value.name || value.id : value;
+  const title = isObject(value) ? value.name || value.id : value;
   return (
     <ButtonGroup justified key={id}>
       <DropdownButton
@@ -16,9 +17,8 @@ export const Dropdown = ({ id, value, disabled, onChange, choices, className, wi
         onSelect={onChange}
       >
         {choices.map(choice => {
-          const isObject = typeof choice === 'object';
-          const key = isObject ? choice.id || choice.name : choice;
-          const val = isObject ? choice.name : choice;
+          const key = isObject(choice) ? choice.id || choice.name : choice;
+          const val = isObject(choice) ? choice.name : choice;
 
           const content = (
             <MenuItem key={key} eventKey={choice}>
diff --git a/src/components/Form/FormRow.js b/src/components/Form/FormRow.js
new file mode 100644
index 000000000..6c74b3049
--- /dev/null
+++ b/src/components/Form/FormRow.js
@@ -0,0 +1,95 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+import { Col, ControlLabel, FormGroup, HelpBlock, FieldLevelHelp } from 'patternfly-react';
+import { get } from 'lodash';
+
+import { VALIDATION_INFO_TYPE } from '../../constants';
+import { prefixedId } from '../../utils';
+
+export const FormControlLabel = ({ isRequired, title, help }) => (
+  <React.Fragment>
+    <ControlLabel className={isRequired ? 'required-pf' : null}>{title}</ControlLabel>
+    {help && <FieldLevelHelp className="kubevirt-form-group__field-help" placement="right" content={help} />}
+  </React.Fragment>
+);
+
+FormControlLabel.defaultProps = {
+  isRequired: false,
+  title: '',
+  help: '',
+};
+
+FormControlLabel.propTypes = {
+  isRequired: PropTypes.bool,
+  title: PropTypes.string,
+  help: PropTypes.string,
+};
+
+export const ValidationFormRow = ({
+  children,
+  id,
+  className,
+  isHidden,
+  validation,
+  controlSize,
+  labelSize,
+  textPosition,
+  ...props
+}) => {
+  if (isHidden) {
+    return null;
+  }
+
+  return (
+    <FormGroup
+      id={prefixedId(id, 'id-form-row')}
+      validationState={validation && validation.type !== VALIDATION_INFO_TYPE ? validation.type : null}
+      className={classNames('kubevirt-form-group', className)}
+    >
+      <Col sm={labelSize} className={textPosition}>
+        <FormControlLabel {...props} />
+      </Col>
+      <Col sm={controlSize}>{children}</Col>
+    </FormGroup>
+  );
+};
+
+ValidationFormRow.defaultProps = {
+  ...FormControlLabel.defaultProps,
+  children: null,
+  id: null,
+  className: null,
+  isHidden: false,
+  validation: {},
+  controlSize: 5,
+  labelSize: 3,
+  textPosition: 'text-right',
+};
+
+ValidationFormRow.propTypes = {
+  ...FormControlLabel.propTypes,
+  children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+  id: PropTypes.string,
+  className: PropTypes.string,
+  isHidden: PropTypes.bool,
+  validation: PropTypes.object,
+  controlSize: PropTypes.number,
+  labelSize: PropTypes.number,
+  textPosition: PropTypes.string,
+};
+
+export const FormRow = ({ children, validation, ...props }) => {
+  const validationMessage = get(validation, 'message', null);
+
+  return (
+    <ValidationFormRow validation={validation} {...props}>
+      {children}
+      {validationMessage && <HelpBlock>{validationMessage}</HelpBlock>}
+    </ValidationFormRow>
+  );
+};
+
+FormRow.defaultProps = ValidationFormRow.defaultProps;
+
+FormRow.propTypes = ValidationFormRow.propTypes;
diff --git a/src/components/Form/fixtures/FormRow.fixture.js b/src/components/Form/fixtures/FormRow.fixture.js
new file mode 100644
index 000000000..d44118051
--- /dev/null
+++ b/src/components/Form/fixtures/FormRow.fixture.js
@@ -0,0 +1,27 @@
+import { FormRow, ValidationFormRow } from '../FormRow';
+import { VALIDATION_ERROR_TYPE } from '../../../constants';
+
+export default [
+  {
+    component: FormRow,
+    name: 'FormRow',
+    props: {
+      id: '1',
+      children: 'text',
+      onChange: () => {},
+    },
+  },
+  {
+    component: ValidationFormRow,
+    name: 'error ValidationFormRow',
+    props: {
+      id: '1',
+      children: 'test',
+      validation: {
+        message: 'error validation',
+        type: VALIDATION_ERROR_TYPE,
+      },
+      onChange: () => {},
+    },
+  },
+];
diff --git a/src/components/Form/tests/FormRow.test.js b/src/components/Form/tests/FormRow.test.js
new file mode 100644
index 000000000..c5e291035
--- /dev/null
+++ b/src/components/Form/tests/FormRow.test.js
@@ -0,0 +1,19 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+
+import { FormRow, ValidationFormRow, FormControlLabel } from '../FormRow';
+
+describe('<FormRow />', () => {
+  it('renders FormRow correctly', () => {
+    const component = shallow(<FormRow>test</FormRow>);
+    expect(component).toMatchSnapshot();
+  });
+  it('renders ValidationFormRow correctly', () => {
+    const component = shallow(<ValidationFormRow>test</ValidationFormRow>);
+    expect(component).toMatchSnapshot();
+  });
+  it('renders FormControlLabel correctly', () => {
+    const component = shallow(<FormControlLabel title="test" />);
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/src/components/Form/tests/__snapshots__/FormRow.test.js.snap b/src/components/Form/tests/__snapshots__/FormRow.test.js.snap
new file mode 100644
index 000000000..d3f201d7e
--- /dev/null
+++ b/src/components/Form/tests/__snapshots__/FormRow.test.js.snap
@@ -0,0 +1,58 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<FormRow /> renders FormControlLabel correctly 1`] = `
+<Fragment>
+  <ControlLabel
+    bsClass="control-label"
+    className={null}
+    srOnly={false}
+  >
+    test
+  </ControlLabel>
+</Fragment>
+`;
+
+exports[`<FormRow /> renders FormRow correctly 1`] = `
+<ValidationFormRow
+  className={null}
+  controlSize={5}
+  help=""
+  id={null}
+  isHidden={false}
+  isRequired={false}
+  labelSize={3}
+  textPosition="text-right"
+  title=""
+  validation={Object {}}
+>
+  test
+</ValidationFormRow>
+`;
+
+exports[`<FormRow /> renders ValidationFormRow correctly 1`] = `
+<FormGroup
+  bsClass="form-group"
+  className="kubevirt-form-group"
+  id={null}
+>
+  <Col
+    bsClass="col"
+    className="text-right"
+    componentClass="div"
+    sm={3}
+  >
+    <FormControlLabel
+      help=""
+      isRequired={false}
+      title=""
+    />
+  </Col>
+  <Col
+    bsClass="col"
+    componentClass="div"
+    sm={5}
+  >
+    test
+  </Col>
+</FormGroup>
+`;
diff --git a/src/components/Wizard/CreateVmWizard/BasicSettingsTab.js b/src/components/Wizard/CreateVmWizard/BasicSettingsTab.js
deleted file mode 100644
index d3b4725bf..000000000
--- a/src/components/Wizard/CreateVmWizard/BasicSettingsTab.js
+++ /dev/null
@@ -1,507 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { get } from 'lodash';
-
-import {
-  FormFactory,
-  validateForm,
-  getFieldValidation,
-  DROPDOWN,
-  CHECKBOX,
-  TEXT_AREA,
-  POSITIVE_NUMBER,
-} from '../../Form';
-import { getName, getMemory, getCpu, getCloudInitUserData } from '../../../selectors';
-import { getTemplate, getTemplateProvisionSource } from '../../../utils/templates';
-import { validateDNS1123SubdomainValue, validateURL, validateContainer } from '../../../utils/validations';
-import {
-  NO_TEMPLATE,
-  HELP_OS,
-  HELP_FLAVOR,
-  HELP_MEMORY,
-  HELP_CPU,
-  HELP_WORKLOAD,
-  getProvisionSourceHelp,
-} from './strings';
-
-import {
-  getFlavors,
-  getOperatingSystems,
-  getWorkloadProfiles,
-  isFlavorType,
-  isImageSourceType,
-  selectVm,
-  getTemplateFlavors,
-  getTemplateWorkloadProfiles,
-  getTemplateOperatingSystems,
-  settingsValue,
-  getV2VVmwareName,
-} from '../../../k8s/selectors';
-
-import {
-  CUSTOM_FLAVOR,
-  PROVISION_SOURCE_PXE,
-  PROVISION_SOURCE_CONTAINER,
-  PROVISION_SOURCE_URL,
-  PROVISION_SOURCE_IMPORT,
-  PROVISION_SOURCE_CLONED_DISK,
-  TEMPLATE_TYPE_VM,
-} from '../../../constants';
-
-import {
-  NAME_KEY,
-  NAMESPACE_KEY,
-  DESCRIPTION_KEY,
-  PROVISION_SOURCE_TYPE_KEY,
-  CONTAINER_IMAGE_KEY,
-  IMAGE_URL_KEY,
-  USER_TEMPLATE_KEY,
-  OPERATING_SYSTEM_KEY,
-  FLAVOR_KEY,
-  MEMORY_KEY,
-  CPU_KEY,
-  WORKLOAD_PROFILE_KEY,
-  START_VM_KEY,
-  CLOUD_INIT_KEY,
-  USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY,
-  CLOUD_INIT_CUSTOM_SCRIPT_KEY,
-  HOST_NAME_KEY,
-  AUTHKEYS_KEY,
-  BATCH_CHANGES_KEY,
-  INTERMEDIARY_NETWORKS_TAB_KEY,
-  INTERMEDIARY_STORAGE_TAB_KEY,
-} from './constants';
-
-import { importProviders } from './providers';
-import { V2VVMwareModel } from '../../../models';
-
-export const getFormFields = (
-  basicSettings,
-  namespaces,
-  templates,
-  selectedNamespace,
-  createTemplate,
-  WithResources,
-  k8sCreate,
-  k8sGet,
-  k8sPatch
-) => {
-  const userTemplate = get(basicSettings[USER_TEMPLATE_KEY], 'value');
-  const workloadProfiles = getWorkloadProfiles(basicSettings, templates, userTemplate);
-  const operatingSystems = getOperatingSystems(basicSettings, templates, userTemplate);
-  const flavors = getFlavors(basicSettings, templates, userTemplate);
-  const imageSources = [
-    PROVISION_SOURCE_PXE,
-    PROVISION_SOURCE_URL,
-    PROVISION_SOURCE_CONTAINER,
-    PROVISION_SOURCE_CLONED_DISK,
-  ];
-  const userTemplateNames = getTemplate(templates, TEMPLATE_TYPE_VM).map(getName);
-  userTemplateNames.push(NO_TEMPLATE);
-
-  let namespaceDropdown;
-  let startVmCheckbox;
-  let userTemplateDropdown;
-  let providersSection = {};
-
-  if (!selectedNamespace) {
-    namespaceDropdown = {
-      id: 'namespace-dropdown',
-      title: 'Namespace',
-      type: DROPDOWN,
-      defaultValue: '--- Select Namespace ---',
-      choices: namespaces.map(getName),
-      required: true,
-    };
-  }
-
-  if (!createTemplate) {
-    startVmCheckbox = {
-      id: 'start-vm',
-      title: 'Start virtual machine on creation',
-      type: CHECKBOX,
-      isVisible: basicVmSettings => !isImageSourceType(basicVmSettings, PROVISION_SOURCE_IMPORT),
-      noBottom: true,
-    };
-    userTemplateDropdown = {
-      id: 'template-dropdown',
-      title: 'Template',
-      type: DROPDOWN,
-      defaultValue: '--- Select Template ---',
-      choices: userTemplateNames,
-    };
-
-    providersSection = importProviders(basicSettings, operatingSystems, WithResources, k8sCreate, k8sGet, k8sPatch);
-    imageSources.push(PROVISION_SOURCE_IMPORT);
-  }
-
-  return {
-    [NAME_KEY]: {
-      id: 'vm-name',
-      title: 'Name',
-      required: true,
-      validate: settings => validateDNS1123SubdomainValue(settingsValue(settings, NAME_KEY)),
-    },
-    [DESCRIPTION_KEY]: {
-      id: 'vm-description',
-      title: 'Description',
-      type: TEXT_AREA,
-    },
-    [NAMESPACE_KEY]: namespaceDropdown,
-    [USER_TEMPLATE_KEY]: userTemplateDropdown,
-    [PROVISION_SOURCE_TYPE_KEY]: {
-      id: 'image-source-type-dropdown',
-      title: 'Provision Source',
-      type: DROPDOWN,
-      defaultValue: '--- Select Provision Source ---',
-      choices: imageSources,
-      required: true,
-      disabled: userTemplate !== undefined,
-      help: getProvisionSourceHelp(settingsValue(basicSettings, PROVISION_SOURCE_TYPE_KEY)),
-    },
-    [CONTAINER_IMAGE_KEY]: {
-      id: 'provision-source-container',
-      title: 'Container Image',
-      required: true,
-      isVisible: basicVmSettings => isImageSourceType(basicVmSettings, PROVISION_SOURCE_CONTAINER),
-      disabled: userTemplate !== undefined,
-      validate: settings => validateContainer(settingsValue(settings, CONTAINER_IMAGE_KEY)),
-    },
-    [IMAGE_URL_KEY]: {
-      id: 'provision-source-url',
-      title: 'URL',
-      required: true,
-      isVisible: basicVmSettings => isImageSourceType(basicVmSettings, PROVISION_SOURCE_URL),
-      disabled: userTemplate !== undefined,
-      validate: settings => validateURL(settingsValue(settings, IMAGE_URL_KEY)),
-    },
-    ...providersSection,
-    [OPERATING_SYSTEM_KEY]: {
-      id: 'operating-system-dropdown',
-      title: 'Operating System',
-      type: DROPDOWN,
-      defaultValue: '--- Select Operating System ---',
-      choices: operatingSystems,
-      required: true,
-      disabled: userTemplate !== undefined,
-      help: HELP_OS,
-    },
-    [FLAVOR_KEY]: {
-      id: 'flavor-dropdown',
-      title: 'Flavor',
-      type: DROPDOWN,
-      defaultValue: '--- Select Flavor ---',
-      choices: flavors,
-      required: true,
-      disabled: userTemplate !== undefined && flavors.length === 1,
-      help: HELP_FLAVOR,
-    },
-    [MEMORY_KEY]: {
-      id: 'resources-memory',
-      title: 'Memory (GB)',
-      type: POSITIVE_NUMBER,
-      required: true,
-      isVisible: basicVmSettings => isFlavorType(basicVmSettings, CUSTOM_FLAVOR),
-      help: HELP_MEMORY,
-    },
-    [CPU_KEY]: {
-      id: 'resources-cpu',
-      title: 'CPUs',
-      type: POSITIVE_NUMBER,
-      required: true,
-      isVisible: basicVmSettings => isFlavorType(basicVmSettings, CUSTOM_FLAVOR),
-      help: HELP_CPU,
-    },
-    [WORKLOAD_PROFILE_KEY]: {
-      id: 'workload-profile-dropdown',
-      title: 'Workload Profile',
-      type: DROPDOWN,
-      defaultValue: '--- Select Workload Profile ---',
-      choices: workloadProfiles,
-      required: true,
-      help: HELP_WORKLOAD,
-      disabled: userTemplate !== undefined,
-    },
-    [START_VM_KEY]: startVmCheckbox,
-    [CLOUD_INIT_KEY]: {
-      id: 'use-cloud-init',
-      title: 'Use cloud-init',
-      type: CHECKBOX,
-    },
-    [USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY]: {
-      id: 'use-cloud-init-custom-script',
-      title: 'Use custom script',
-      type: CHECKBOX,
-      isVisible: basicVmSettings => settingsValue(basicVmSettings, CLOUD_INIT_KEY, false),
-    },
-    [HOST_NAME_KEY]: {
-      id: 'cloud-init-hostname',
-      title: 'Hostname',
-      isVisible: basicVmSettings =>
-        settingsValue(basicVmSettings, CLOUD_INIT_KEY, false) &&
-        !settingsValue(basicVmSettings, USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY, false),
-    },
-    [AUTHKEYS_KEY]: {
-      id: 'cloud-init-ssh',
-      title: 'Authenticated SSH Keys',
-      type: TEXT_AREA,
-      isVisible: basicVmSettings =>
-        settingsValue(basicVmSettings, CLOUD_INIT_KEY, false) &&
-        !settingsValue(basicVmSettings, USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY, false),
-    },
-    [CLOUD_INIT_CUSTOM_SCRIPT_KEY]: {
-      id: 'cloud-init-custom-script',
-      title: 'Custom Script',
-      type: TEXT_AREA,
-      className: 'kubevirt-create-vm-wizard__custom-cloud-script-textarea',
-      isVisible: basicVmSettings =>
-        settingsValue(basicVmSettings, CLOUD_INIT_KEY, false) &&
-        settingsValue(basicVmSettings, USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY, false),
-    },
-  };
-};
-
-const asValueObject = (value, validation) => ({
-  value,
-  validation,
-});
-
-// TODO: To avoid race conditions as the basicSettings tab is bound to the CreateVmWizard state at the render-time, it would
-//  be better to retrieve basicSettings at the time of its actual use - to align behavior with the setState().
-// The onChange() bellow should be called with just the diff, not whole copy of the stepData.
-const publish = ({ basicSettings, templates, onChange, dataVolumes }, value, target, formValid, formFields) => {
-  let newBasicSettings;
-
-  if (target === PROVISION_SOURCE_TYPE_KEY && value.value === PROVISION_SOURCE_IMPORT) {
-    basicSettings = {
-      ...basicSettings,
-      [START_VM_KEY]: asValueObject(false),
-    };
-  }
-
-  if (target === BATCH_CHANGES_KEY) {
-    // the "value" is an array of pairs { value, target }
-    const difference = value.value.reduce((map, obj) => {
-      map[obj.target] = { value: obj.value }; // validation will be set in a next step
-      return map;
-    }, {});
-    newBasicSettings = {
-      ...basicSettings,
-      ...difference,
-    };
-    value.value.forEach(pair => {
-      if (pair.target !== INTERMEDIARY_NETWORKS_TAB_KEY && pair.target !== INTERMEDIARY_STORAGE_TAB_KEY) {
-        // set field validation
-        newBasicSettings[pair.target].validation =
-          pair.validation || getFieldValidation(formFields[pair.target], pair.value, newBasicSettings);
-      }
-    });
-    formValid = validateForm(formFields, newBasicSettings);
-  } else {
-    newBasicSettings = {
-      ...basicSettings,
-      [target]: value,
-    };
-
-    if (target === USER_TEMPLATE_KEY) {
-      if (value.value === NO_TEMPLATE) {
-        newBasicSettings[target] = asValueObject(undefined);
-      } else {
-        const allTemplates = getTemplate(templates, TEMPLATE_TYPE_VM);
-        if (allTemplates.length > 0) {
-          const userTemplate = allTemplates.find(template => template.metadata.name === value.value);
-          updateTemplateData(userTemplate, newBasicSettings, dataVolumes);
-        }
-      }
-      formValid = validateForm(formFields, newBasicSettings);
-    }
-  }
-
-  onChange(newBasicSettings, formValid);
-};
-
-const updateTemplateData = (userTemplate, newBasicSettings, dataVolumes) => {
-  if (userTemplate) {
-    const vm = selectVm(userTemplate.objects);
-
-    // update flavor
-    const [flavor] = getTemplateFlavors([userTemplate]);
-    newBasicSettings[FLAVOR_KEY] = asValueObject(flavor);
-    if (flavor === CUSTOM_FLAVOR) {
-      newBasicSettings.cpu = asValueObject(getCpu(vm));
-      const memory = getMemory(vm);
-      newBasicSettings.memory = memory ? asValueObject(parseInt(memory, 10)) : undefined;
-    }
-
-    // update os
-    const [os] = getTemplateOperatingSystems([userTemplate]);
-    newBasicSettings[OPERATING_SYSTEM_KEY] = asValueObject(os);
-
-    // update workload profile
-    const [workload] = getTemplateWorkloadProfiles([userTemplate]);
-    newBasicSettings[WORKLOAD_PROFILE_KEY] = asValueObject(workload);
-
-    // update cloud-init
-    const cloudInitUserData = getCloudInitUserData(vm);
-    if (cloudInitUserData) {
-      newBasicSettings[CLOUD_INIT_KEY] = asValueObject(true);
-      newBasicSettings[USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY] = asValueObject(true);
-      newBasicSettings[CLOUD_INIT_CUSTOM_SCRIPT_KEY] = asValueObject(cloudInitUserData || '');
-    } else if (get(newBasicSettings[CLOUD_INIT_KEY], 'value')) {
-      newBasicSettings[CLOUD_INIT_KEY] = asValueObject(false);
-      newBasicSettings[USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY] = asValueObject(false);
-    }
-
-    // update provision source
-    const provisionSource = getTemplateProvisionSource(userTemplate, dataVolumes);
-    if (provisionSource) {
-      newBasicSettings[PROVISION_SOURCE_TYPE_KEY] = asValueObject(provisionSource.type);
-      switch (provisionSource.type) {
-        case PROVISION_SOURCE_CONTAINER:
-          newBasicSettings[CONTAINER_IMAGE_KEY] = asValueObject(provisionSource.source);
-          break;
-        case PROVISION_SOURCE_URL:
-          newBasicSettings[IMAGE_URL_KEY] = asValueObject(provisionSource.source);
-          break;
-        case PROVISION_SOURCE_PXE:
-          break;
-        default:
-          // eslint-disable-next-line
-          console.warn(`Unknown provision source ${provisionSource.type}`);
-          break;
-      }
-    } else {
-      // eslint-disable-next-line
-      console.warn(`Cannot detect provision source for template ${getName(userTemplate)}`);
-    }
-  }
-  return newBasicSettings;
-};
-
-// Do clean-up
-export const onCloseBasic = async (basicSettings, callerContext) => {
-  const v2vvmwareName = getV2VVmwareName(basicSettings);
-  if (v2vvmwareName) {
-    // This is a friendly help to keep things clean.
-    // If missed here (e.g. when the browser window is closed), the kubevirt-vmware controller's garbage
-    // collector will do following automatically after a delay.
-    const resource = {
-      metadata: {
-        name: v2vvmwareName,
-        // TODO: potential issue if the user changed the namespace after creation of the v2vvmware object
-        // to fix: either store the namespace along the v2vvmwareName or empty v2vvmwareName on namespace change
-        namespace: settingsValue(basicSettings, NAMESPACE_KEY),
-      },
-    };
-    try {
-      await callerContext.k8sKill(V2VVMwareModel, resource);
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.log(
-        'Failed to remove temporary V2VVMWare object. It is not an issue, it will be garbage collected later if still present, resource: ',
-        resource,
-        ', error: ',
-        error
-      );
-    }
-  }
-};
-
-export class BasicSettingsTab extends React.Component {
-  constructor(props) {
-    super(props);
-    if (props.selectedNamespace) {
-      this.updateSelectedNamespace(props);
-    }
-  }
-
-  componentDidUpdate(prevProps) {
-    const newNamespace = this.props.selectedNamespace;
-    const oldNamespace = prevProps.selectedNamespace;
-
-    if (getName(newNamespace) !== getName(oldNamespace)) {
-      this.updateSelectedNamespace(this.props);
-    }
-  }
-
-  updateSelectedNamespace = props => {
-    const {
-      basicSettings,
-      namespaces,
-      selectedNamespace,
-      templates,
-      createTemplate,
-      WithResources,
-      k8sCreate,
-      k8sGet,
-      k8sPatch,
-    } = props;
-    const formFields = getFormFields(
-      basicSettings,
-      namespaces,
-      templates,
-      selectedNamespace,
-      createTemplate,
-      WithResources,
-      k8sCreate,
-      k8sGet,
-      k8sPatch
-    );
-    const valid = validateForm(formFields, basicSettings);
-    publish(props, asValueObject(getName(selectedNamespace)), NAMESPACE_KEY, valid, formFields);
-  };
-
-  render() {
-    const {
-      basicSettings,
-      namespaces,
-      templates,
-      selectedNamespace,
-      createTemplate,
-      WithResources,
-      k8sCreate,
-      k8sGet,
-      k8sPatch,
-    } = this.props;
-    const formFields = getFormFields(
-      basicSettings,
-      namespaces,
-      templates,
-      selectedNamespace,
-      createTemplate,
-      WithResources,
-      k8sCreate,
-      k8sGet,
-      k8sPatch
-    );
-
-    return (
-      <FormFactory
-        fields={formFields}
-        fieldsValues={basicSettings}
-        onFormChange={(newValue, target, formValid) => publish(this.props, newValue, target, formValid, formFields)}
-      />
-    );
-  }
-}
-
-BasicSettingsTab.defaultProps = {
-  selectedNamespace: undefined,
-  createTemplate: false,
-};
-
-BasicSettingsTab.propTypes = {
-  WithResources: PropTypes.func.isRequired,
-  k8sCreate: PropTypes.func.isRequired,
-  k8sGet: PropTypes.func.isRequired,
-  k8sPatch: PropTypes.func.isRequired,
-  templates: PropTypes.array.isRequired,
-  namespaces: PropTypes.array.isRequired,
-  selectedNamespace: PropTypes.object, // used only in initialization
-  basicSettings: PropTypes.object.isRequired,
-  // eslint-disable-next-line react/no-unused-prop-types
-  onChange: PropTypes.func.isRequired,
-  createTemplate: PropTypes.bool,
-  // eslint-disable-next-line react/no-unused-prop-types
-  dataVolumes: PropTypes.array.isRequired,
-};
diff --git a/src/components/Wizard/CreateVmWizard/CreateVmWizard.js b/src/components/Wizard/CreateVmWizard/CreateVmWizard.js
index 3feee5160..82b68afab 100644
--- a/src/components/Wizard/CreateVmWizard/CreateVmWizard.js
+++ b/src/components/Wizard/CreateVmWizard/CreateVmWizard.js
@@ -1,428 +1,149 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { findIndex } from 'lodash';
 import { Wizard } from 'patternfly-react';
 
-import { BasicSettingsTab, onCloseBasic } from './BasicSettingsTab';
+import { VmSettingsTab } from './VmSettingsTab';
+import { getInitialActiveStepIndex, getTabInitialState } from './initialState';
+
+import { validateTabData } from './validations';
 import { StorageTab } from './StorageTab';
 import { ResultTab } from './ResultTab';
 import { ResultTabRow } from './ResultTabRow';
 import { NetworksTab } from './NetworksTab';
-import { loadingWizardTab } from '../loadingWizardTab';
-import { settingsValue } from '../../../k8s/selectors';
+import { LoadingTab } from '../LoadingTab';
 import { createVm, createVmTemplate } from '../../../k8s/request';
 
 import {
-  POD_NETWORK,
-  PROVISION_SOURCE_URL,
-  PROVISION_SOURCE_CONTAINER,
-  PROVISION_SOURCE_PXE,
-  PROVISION_SOURCE_IMPORT,
-  PROVISION_SOURCE_CLONED_DISK,
-} from '../../../constants';
-
-import {
-  PROVISION_SOURCE_TYPE_KEY,
-  USER_TEMPLATE_KEY,
-  BASIC_SETTINGS_TAB_KEY,
+  VM_SETTINGS_TAB_KEY,
+  NAMESPACE_KEY,
   NETWORKS_TAB_KEY,
-  STORAGE_TAB_KEY,
+  PROVISION_SOURCE_TYPE_KEY,
   RESULT_TAB_KEY,
-  STORAGE_TYPE_CONTAINER,
-  STORAGE_TYPE_DATAVOLUME,
-  NETWORK_TYPE_POD,
-  INTERMEDIARY_NETWORKS_TAB_KEY,
-  NAMESPACE_KEY,
-  PROVIDER_VMWARE_VM_KEY,
-  INTERMEDIARY_STORAGE_TAB_KEY,
-  NETWORK_BINDING_MASQUERADE,
+  STORAGE_TAB_KEY,
 } from './constants';
 
 import {
   CREATE_VM,
   CREATE_VM_TEMPLATE,
+  NEXT,
   STEP_BASIC_SETTINGS,
   STEP_NETWORK,
-  STEP_STORAGE,
   STEP_RESULT,
-  NEXT,
-  ERROR,
-  CREATED,
-  CREATED_WITH_CLEANUP,
-  CREATED_WITH_FAILED_CLEANUP,
-  FAILED_TO_CREATE,
-  FAILED_TO_PATCH,
+  STEP_STORAGE,
 } from './strings';
 
-import { getFullResourceId } from '../../../utils';
-import {
-  getUserTemplate,
-  getTemplateStorages,
-  getTemplateInterfaces,
-  hasAutoAttachPodInterface,
-} from '../../../utils/templates';
-
-import { getName, getGeneratedName, getKind } from '../../../selectors';
 import { EnhancedK8sMethods } from '../../../k8s/util/enhancedK8sMethods';
-
-// left intentionally empty
-const TEMPLATE_ROOT_STORAGE = {};
-
-const LoadingBasicWizardTab = loadingWizardTab(BasicSettingsTab);
-const LoadingStorageTab = loadingWizardTab(StorageTab);
-const LoadingNetworksTab = loadingWizardTab(NetworksTab);
-
-const getBasicSettingsValue = (stepData, key) => settingsValue(stepData[BASIC_SETTINGS_TAB_KEY].value, key);
-
-const getInitialDisk = provisionSource => {
-  switch (provisionSource) {
-    case PROVISION_SOURCE_URL:
-      return rootDataVolumeDisk;
-    case PROVISION_SOURCE_CONTAINER:
-      return rootContainerDisk;
-    case PROVISION_SOURCE_PXE:
-    case PROVISION_SOURCE_CLONED_DISK:
-    case PROVISION_SOURCE_IMPORT:
-      return null;
-    default:
-      // eslint-disable-next-line
-      console.warn(`Unknown provision source ${provisionSource}`);
-      return null;
-  }
-};
-
-const onUserTemplateChangedInStorageTab = (stepData, newUserTemplate, dataVolumes) => {
-  const withoutDiscardedTemplateStorage = stepData[STORAGE_TAB_KEY].value.filter(
-    storage => !(storage.templateStorage || storage.rootStorage)
+import { getUpdatedState } from './stateUpdate/stateUpdate';
+import { cleanupAndGetResults, errorsFirstSort, getResults } from '../../../k8s/util/k8sMethodsUtils';
+import { VMWareImportProvider } from './providers/VMwareImportProvider/VMWareImportProvider';
+import { ImportProvider } from './providers/ImportProvider/ImportProvider';
+import { isVmwareProvider } from './providers/VMwareImportProvider/selectors';
+import { getVmWareProviderRequestedResources } from './providers/VMwareImportProvider/requestedResources';
+import { getVmSettings, getVmSettingValue, onCloseVmSettings } from './utils/vmSettingsTabUtils';
+
+const ALL_TAB_KEYS = [VM_SETTINGS_TAB_KEY, NETWORKS_TAB_KEY, STORAGE_TAB_KEY, RESULT_TAB_KEY];
+
+const getUpdatedValidatedState = (prevProps, prevState, props, state, extra) => {
+  const newState = ALL_TAB_KEYS.reduce(
+    (intermediaryState, tabKey) =>
+      getUpdatedState(tabKey, prevProps, prevState, props, intermediaryState, extra) || intermediaryState,
+    state
   );
 
-  const rows = [...withoutDiscardedTemplateStorage];
-
-  if (newUserTemplate) {
-    const templateStorages = getTemplateStorages(newUserTemplate, dataVolumes).map(storage => ({
-      templateStorage: storage,
-      rootStorage: storage.disk.bootOrder === 1 ? TEMPLATE_ROOT_STORAGE : undefined,
-    }));
-    rows.push(...templateStorages);
-  } else {
-    const basicSettings = stepData[BASIC_SETTINGS_TAB_KEY].value;
-    const storage = getInitialDisk(settingsValue(basicSettings, PROVISION_SOURCE_TYPE_KEY));
-    if (storage) {
-      rows.push(storage);
-    }
+  if (state === newState) {
+    return state; // skip validation
   }
 
-  return {
-    ...stepData,
-    [STORAGE_TAB_KEY]: {
-      ...stepData[STORAGE_TAB_KEY],
-      value: rows,
-    },
-  };
-};
-
-const onUserTemplateChangedInNetworksTab = (stepData, newUserTemplate) => {
-  const withoutDiscardedTemplateNetworks = stepData[NETWORKS_TAB_KEY].value.filter(network => !network.templateNetwork);
-
-  const rows = [...withoutDiscardedTemplateNetworks];
-  if (!rows.find(row => row.rootNetwork)) {
-    rows.push(podNetwork);
-  }
-
-  if (newUserTemplate) {
-    const templateInterfaces = getTemplateInterfaces(newUserTemplate);
-    const networks = templateInterfaces.map(i => ({
-      templateNetwork: i,
-    }));
-
-    // do not add root interface if there already is one or autoAttachPodInterface is set to false
-    if (networks.some(network => network.templateNetwork.network.pod) || !hasAutoAttachPodInterface(newUserTemplate)) {
-      const index = findIndex(rows, network => network.rootNetwork);
-      rows.splice(index, 1);
-    }
-
-    rows.push(...networks);
-  }
-
-  return {
-    ...stepData,
-    [NETWORKS_TAB_KEY]: {
-      ...stepData[NETWORKS_TAB_KEY],
-      value: rows,
-    },
-  };
-};
-
-const rootDisk = {
-  rootStorage: {},
-  name: 'rootdisk',
-  isBootable: true,
-};
-
-export const rootContainerDisk = {
-  ...rootDisk,
-  storageType: STORAGE_TYPE_CONTAINER,
-};
-
-export const rootDataVolumeDisk = {
-  ...rootDisk,
-  storageType: STORAGE_TYPE_DATAVOLUME,
-  size: 10,
-};
+  const validatedStepData = ALL_TAB_KEYS.reduce((resultStepData, tabKey) => {
+    const { value, valid } = newState.stepData[tabKey];
+    resultStepData[tabKey] = validateTabData(tabKey, value, valid);
+    return resultStepData;
+  }, {});
 
-const onImageSourceTypeChangedInStorageTab = stepData => {
-  const filteredStorage = stepData[STORAGE_TAB_KEY].value.filter(
-    storage => storage.templateStorage || !storage.rootStorage
-  );
-  const rows = [...filteredStorage];
-  const basicSettings = stepData[BASIC_SETTINGS_TAB_KEY].value;
-  if (!settingsValue(basicSettings, USER_TEMPLATE_KEY)) {
-    const storage = getInitialDisk(settingsValue(basicSettings, PROVISION_SOURCE_TYPE_KEY));
-    if (storage) {
-      rows.push(storage);
-    }
-  }
   return {
-    ...stepData,
-    [STORAGE_TAB_KEY]: {
-      ...stepData[STORAGE_TAB_KEY],
-      value: rows,
-    },
+    ...newState,
+    stepData: validatedStepData,
   };
 };
 
-const onUserTemplateChanged = (props, stepData) => {
-  const userTemplateName = getBasicSettingsValue(stepData, USER_TEMPLATE_KEY);
-  const userTemplate = userTemplateName ? getUserTemplate(props.templates, userTemplateName) : undefined;
-  const newStepData = onUserTemplateChangedInStorageTab(stepData, userTemplate, props.dataVolumes);
-  return onUserTemplateChangedInNetworksTab(newStepData, userTemplate);
-};
-
-const onImageSourceTypeChanged = (props, stepData) => onImageSourceTypeChangedInStorageTab(stepData);
-
-export const onVmwareVmChanged = (props, stepData) => {
-  const sourceNetworks = getBasicSettingsValue(stepData, INTERMEDIARY_NETWORKS_TAB_KEY);
-  delete stepData[BASIC_SETTINGS_TAB_KEY].value[INTERMEDIARY_NETWORKS_TAB_KEY]; // not needed anymore, do not setState() that
-
-  const sourceDisks = getBasicSettingsValue(stepData, INTERMEDIARY_STORAGE_TAB_KEY);
-  delete stepData[BASIC_SETTINGS_TAB_KEY].value[INTERMEDIARY_STORAGE_TAB_KEY];
-
-  if (sourceNetworks) {
-    const rows = sourceNetworks.map((src, index) => ({
-      rootNetwork: {},
-      id: index,
-      name: src.name,
-      mac: src.mac,
-      network: undefined, // Let the user select proper mapping
-      networkType: undefined,
-      editable: true,
-      edit: false,
-      importSourceId: src.id, // will be used for pairing when Conversion POD is executed
-    }));
+export class CreateVmWizard extends React.Component {
+  constructor(props) {
+    super(props);
 
-    stepData = {
-      ...stepData,
-      [NETWORKS_TAB_KEY]: {
-        ...stepData[NETWORKS_TAB_KEY],
-        value: rows,
+    const initialState = ALL_TAB_KEYS.reduce(
+      (state, tabKey) => {
+        state.stepData[tabKey] = getTabInitialState(tabKey, props);
+        return state;
       },
-    };
-  }
+      {
+        activeStepIndex: getInitialActiveStepIndex(),
+        stepData: {},
+      }
+    );
 
-  if (sourceDisks) {
-    stepData = {
-      ...stepData,
-      [STORAGE_TAB_KEY]: {
-        ...stepData[STORAGE_TAB_KEY],
-        value: sourceDisks,
-        // the "valid" field will be set within StorageTab constructor processing based on the "row.error"
-      },
-    };
+    this.state = getUpdatedValidatedState(null, null, props, initialState, {
+      // eslint-disable-next-line no-console
+      safeSetState: () => console.warn('setState not supported when initializing'),
+    });
   }
 
-  return stepData;
-};
-
-const podNetwork = {
-  rootNetwork: {},
-  id: 0,
-  name: 'nic0',
-  mac: '',
-  network: POD_NETWORK,
-  editable: true,
-  edit: false,
-  networkType: NETWORK_TYPE_POD,
-  binding: NETWORK_BINDING_MASQUERADE,
-};
-
-const k8sObjectToResult = ({ obj, content, message, isExpanded, isError }) => ({
-  title: [getKind(obj), getName(obj) || getGeneratedName(obj), message].filter(a => a).join(' '),
-  content,
-  isExpanded,
-  isError,
-});
-
-const cleanupAndGetResults = async (enhancedK8sMethods, { message, failedObject, failedPatches }) => {
-  const actualState = enhancedK8sMethods.getActualState(); // actual state will differ after cleanup
-
-  let errors;
-  try {
-    await enhancedK8sMethods.rollback();
-  } catch (e) {
-    // eslint-disable-next-line prefer-destructuring
-    errors = e.errors;
+  componentDidMount() {
+    this._unmounted = false;
   }
 
-  const failedObjectsMap = {};
-
-  if (errors) {
-    errors.forEach(error => {
-      failedObjectsMap[getFullResourceId(error.failedObject)] = error.failedObject;
-    });
+  componentWillUnmount() {
+    this._unmounted = true;
   }
 
-  const cleanupArray = actualState
-    .map(resource => {
-      const failedToCleanup = !!failedObjectsMap[getFullResourceId(resource)];
-
-      return k8sObjectToResult({
-        obj: resource,
-        content: resource,
-        message: failedToCleanup ? CREATED_WITH_FAILED_CLEANUP : CREATED_WITH_CLEANUP,
-        isExpanded: failedToCleanup,
-        isError: failedToCleanup,
-      });
-    })
-    .reverse();
-
-  const results = [
-    k8sObjectToResult({
-      content: message,
-      message: ERROR,
-      isExpanded: true,
-      isError: true,
-    }),
-    k8sObjectToResult({
-      obj: failedObject,
-      content: failedPatches || failedObject,
-      message: failedPatches ? FAILED_TO_PATCH : FAILED_TO_CREATE,
-      isError: true,
-    }),
-    ...cleanupArray,
-  ];
-
-  return {
-    valid: false,
-    results,
+  safeSetState = state => {
+    if (!this._unmounted) {
+      this.setState(state);
+    }
   };
-};
 
-const getResults = enhancedK8sMethods => ({
-  valid: true,
-  results: enhancedK8sMethods
-    .getActualState()
-    .map(obj => k8sObjectToResult({ obj, content: obj, message: CREATED }))
-    .reverse(),
-});
+  componentDidUpdate(prevProps, prevState, snapshot) {
+    const newState = getUpdatedValidatedState(prevProps, prevState, this.props, this.state, {
+      safeSetState: this.safeSetState,
+    });
 
-export class CreateVmWizard extends React.Component {
-  state = {
-    activeStepIndex: 0,
-    stepData: {
-      [BASIC_SETTINGS_TAB_KEY]: {
-        // Basic Settings
-        value: {},
-        valid: false,
-      },
-      [NETWORKS_TAB_KEY]: {
-        value: [podNetwork],
-        valid: true,
-      },
-      [STORAGE_TAB_KEY]: {
-        value: [], // Storages
-        valid: true, // empty Storages are valid
-      },
-      [RESULT_TAB_KEY]: {
-        value: [],
-        valid: null, // result of the request
-      },
-    },
-  };
+    if (this.state !== newState) {
+      // eslint-disable-next-line react/no-did-update-set-state
+      this.safeSetState(newState);
+    }
+  }
 
   getLastStepIndex = () => this.wizardStepsNewVM.length - 1;
 
   lastStepReached = () => this.state.activeStepIndex === this.getLastStepIndex();
 
-  callbacks = [
-    {
-      field: USER_TEMPLATE_KEY,
-      callback: onUserTemplateChanged,
-    },
-    {
-      field: PROVISION_SOURCE_TYPE_KEY,
-      callback: onImageSourceTypeChanged,
-    },
-    {
-      field: INTERMEDIARY_NETWORKS_TAB_KEY, // can not use PROVIDER_VMWARE_VM_KEY to detect changes due to asynchronous load of details _after_ selection
-      callback: onVmwareVmChanged,
-    },
-  ];
-
-  onStepDataChanged = (key, value, valid) => {
-    this.setState((state, props) => {
-      let stepData = { ...state.stepData };
-
-      stepData[key] = {
-        value,
-        valid,
-      };
-
-      if (key === BASIC_SETTINGS_TAB_KEY) {
-        this.callbacks.forEach(callback => {
-          const oldValue = getBasicSettingsValue(state.stepData, callback.field);
-          const newValue = getBasicSettingsValue(stepData, callback.field);
-          if (oldValue !== newValue) {
-            stepData = callback.callback(props, stepData);
-          }
-        });
-      }
-
-      return { stepData };
-    });
+  onStepDataChanged = (tabKey, value, valid) => {
+    const validatedTabData = validateTabData(tabKey, value, valid);
+    this.safeSetState(state => ({
+      stepData: {
+        ...state.stepData,
+        [tabKey]: validatedTabData,
+      },
+    }));
   };
 
   finish() {
     const create = this.props.createTemplate ? createVmTemplate : createVm;
 
-    const basicSettings = this.state.stepData[BASIC_SETTINGS_TAB_KEY].value;
+    const vmSettings = this.state.stepData[VM_SETTINGS_TAB_KEY].value;
 
     const enhancedK8sMethods = new EnhancedK8sMethods(this.props);
 
     create(
       enhancedK8sMethods,
       this.props.templates,
-      basicSettings,
+      vmSettings,
       this.state.stepData[NETWORKS_TAB_KEY].value,
       this.state.stepData[STORAGE_TAB_KEY].value,
       this.props.persistentVolumeClaims
     )
       .then(() => getResults(enhancedK8sMethods))
       .catch(error => cleanupAndGetResults(enhancedK8sMethods, error))
-      .then(({ results, valid }) =>
-        this.onStepDataChanged(
-          RESULT_TAB_KEY,
-          results
-            .map((result, sortIndex) => ({ ...result, sortIndex }))
-            // move errors to the top
-            .sort((a, b) => {
-              if (a.isError === b.isError) {
-                return a.sortIndex - b.sortIndex;
-              }
-              return a.isError ? -1 : 1;
-            }),
-          valid
-        )
-      )
+      .then(({ results, valid }) => this.onStepDataChanged(RESULT_TAB_KEY, errorsFirstSort(results), valid))
       // eslint-disable-next-line no-console
       .catch(e => console.error(e));
   }
@@ -436,7 +157,7 @@ export class CreateVmWizard extends React.Component {
       if (newActiveStepIndex === this.getLastStepIndex()) {
         this.finish();
       }
-      this.setState({ activeStepIndex: newActiveStepIndex });
+      this.safeSetState({ activeStepIndex: newActiveStepIndex });
     }
   };
 
@@ -458,28 +179,32 @@ export class CreateVmWizard extends React.Component {
   wizardStepsNewVM = [
     {
       title: STEP_BASIC_SETTINGS,
-      key: BASIC_SETTINGS_TAB_KEY,
-      onCloseWizard: onCloseBasic,
+      key: VM_SETTINGS_TAB_KEY,
+      onCloseWizard: onCloseVmSettings,
       render: () => {
-        const loadingData = {
-          namespaces: this.props.namespaces,
-          templates: this.props.templates,
-          dataVolumes: this.props.dataVolumes,
-        };
+        const { namespaces, templates, dataVolumes, WithResources } = this.props;
+
+        const loadingData = { namespaces, templates, dataVolumes };
+        const vmSettings = getVmSettings(this.state);
+
         return (
-          <LoadingBasicWizardTab
-            key="1"
-            selectedNamespace={this.props.selectedNamespace}
-            basicSettings={this.state.stepData[BASIC_SETTINGS_TAB_KEY].value}
-            onChange={(value, valid) => this.onStepDataChanged(BASIC_SETTINGS_TAB_KEY, value, valid)}
-            loadingData={loadingData}
-            createTemplate={this.props.createTemplate}
-            WithResources={this.props.WithResources}
-            k8sCreate={this.props.k8sCreate}
-            k8sGet={this.props.k8sGet}
-            k8sPatch={this.props.k8sPatch}
-            k8sKill={this.props.k8sKill}
-          />
+          <LoadingTab {...loadingData}>
+            <VmSettingsTab
+              key={VM_SETTINGS_TAB_KEY}
+              vmSettings={vmSettings}
+              onChange={(value, valid) => this.onStepDataChanged(VM_SETTINGS_TAB_KEY, value, valid)}
+              {...loadingData}
+            >
+              <ImportProvider isVisible={isVmwareProvider(this.state)}>
+                <WithResources resourceMap={getVmWareProviderRequestedResources(this.state)}>
+                  <VMWareImportProvider
+                    vmSettings={vmSettings}
+                    onChange={(value, valid) => this.onStepDataChanged(VM_SETTINGS_TAB_KEY, value, valid)}
+                  />
+                </WithResources>
+              </ImportProvider>
+            </VmSettingsTab>
+          </LoadingTab>
         );
       },
     },
@@ -490,17 +215,20 @@ export class CreateVmWizard extends React.Component {
         const loadingData = {
           networkConfigs: this.props.networkConfigs,
         };
-        const sourceType = getBasicSettingsValue(this.state.stepData, PROVISION_SOURCE_TYPE_KEY);
+        const sourceType = getVmSettingValue(this.state, PROVISION_SOURCE_TYPE_KEY);
         return (
-          <LoadingNetworksTab
-            onChange={(value, valid) => this.onStepDataChanged(NETWORKS_TAB_KEY, value, valid)}
-            networkConfigs={this.props.networkConfigs}
-            networks={this.state.stepData[NETWORKS_TAB_KEY].value || []}
-            sourceType={sourceType}
-            namespace={getBasicSettingsValue(this.state.stepData, NAMESPACE_KEY)}
-            loadingData={loadingData}
-            isCreateRemoveDisabled={!!getBasicSettingsValue(this.state.stepData, PROVIDER_VMWARE_VM_KEY)}
-          />
+          <LoadingTab {...loadingData}>
+            <NetworksTab
+              key={NETWORKS_TAB_KEY}
+              onChange={(value, valid) => this.onStepDataChanged(NETWORKS_TAB_KEY, value, valid)}
+              networkConfigs={this.props.networkConfigs}
+              networks={this.state.stepData[NETWORKS_TAB_KEY].value || []}
+              sourceType={sourceType}
+              namespace={getVmSettingValue(this.state, NAMESPACE_KEY)}
+              isCreateRemoveDisabled={isVmwareProvider(this.state)}
+              {...loadingData}
+            />
+          </LoadingTab>
         );
       },
     },
@@ -512,17 +240,20 @@ export class CreateVmWizard extends React.Component {
           storageClasses: this.props.storageClasses,
           persistentVolumeClaims: this.props.persistentVolumeClaims,
         };
-        const sourceType = getBasicSettingsValue(this.state.stepData, PROVISION_SOURCE_TYPE_KEY);
+        const sourceType = getVmSettingValue(this.state, PROVISION_SOURCE_TYPE_KEY);
         return (
-          <LoadingStorageTab
-            initialStorages={this.state.stepData[STORAGE_TAB_KEY].value}
-            onChange={(value, valid) => this.onStepDataChanged(STORAGE_TAB_KEY, value, valid)}
-            units={this.props.units}
-            sourceType={sourceType}
-            namespace={getBasicSettingsValue(this.state.stepData, NAMESPACE_KEY)}
-            loadingData={loadingData}
-            isCreateRemoveDisabled={!!getBasicSettingsValue(this.state.stepData, PROVIDER_VMWARE_VM_KEY)}
-          />
+          <LoadingTab {...loadingData}>
+            <StorageTab
+              key={STORAGE_TAB_KEY}
+              initialStorages={this.state.stepData[STORAGE_TAB_KEY].value}
+              onChange={(value, valid) => this.onStepDataChanged(STORAGE_TAB_KEY, value, valid)}
+              units={this.props.units}
+              sourceType={sourceType}
+              namespace={getVmSettingValue(this.state, NAMESPACE_KEY)}
+              isCreateRemoveDisabled={isVmwareProvider(this.state)}
+              {...loadingData}
+            />
+          </LoadingTab>
         );
       },
     },
@@ -532,7 +263,7 @@ export class CreateVmWizard extends React.Component {
       render: () => {
         const stepData = this.state.stepData[RESULT_TAB_KEY];
         return (
-          <ResultTab isSuccessful={stepData.valid} isCreateTemplate={this.props.createTemplate}>
+          <ResultTab key={RESULT_TAB_KEY} isSuccessful={stepData.valid} isCreateTemplate={this.props.createTemplate}>
             {stepData.value.map((result, index) => (
               <ResultTabRow key={index} {...result} />
             ))}
@@ -554,7 +285,7 @@ export class CreateVmWizard extends React.Component {
         onHide={this.onHideWrapper}
         steps={this.wizardStepsNewVM}
         activeStepIndex={this.state.activeStepIndex}
-        onStepChanged={index => this.onStepChanged(index)}
+        onStepChanged={this.onStepChanged}
         previousStepDisabled={lastStepReached}
         cancelButtonDisabled={lastStepReached}
         stepButtonsDisabled={lastStepReached}
diff --git a/src/components/Wizard/CreateVmWizard/StorageTab.js b/src/components/Wizard/CreateVmWizard/StorageTab.js
index 33aaff1ed..8fe57f65e 100644
--- a/src/components/Wizard/CreateVmWizard/StorageTab.js
+++ b/src/components/Wizard/CreateVmWizard/StorageTab.js
@@ -190,7 +190,7 @@ const resolveTemplateStorage = (storage, persistentVolumeClaims, storageClasses,
     }
     if (!templateStorage.storageClass) {
       templateStorage.storageClass = getName(
-        storageClasses.find(clazz => getName(clazz) === pvc.spec.storageClassName)
+        storageClasses.find(clazz => getName(clazz) === getPvcStorageClassName(pvc))
       );
     }
     templateStorage.storageType = STORAGE_TYPE_PVC;
diff --git a/src/components/Wizard/CreateVmWizard/VmSettingsTab.js b/src/components/Wizard/CreateVmWizard/VmSettingsTab.js
new file mode 100644
index 000000000..1c5f1f22c
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/VmSettingsTab.js
@@ -0,0 +1,187 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Form } from 'patternfly-react';
+import { get } from 'lodash';
+
+import { Checkbox, Dropdown, Integer, Text, TextArea } from '../../Form';
+import { getName } from '../../../selectors';
+import { getTemplate } from '../../../utils/templates';
+
+import { NO_TEMPLATE } from './strings';
+
+import { TEMPLATE_TYPE_VM } from '../../../constants';
+
+import {
+  AUTHKEYS_KEY,
+  CLOUD_INIT_CUSTOM_SCRIPT_KEY,
+  CONTAINER_IMAGE_KEY,
+  CPU_KEY,
+  DESCRIPTION_KEY,
+  FLAVOR_KEY,
+  HOST_NAME_KEY,
+  IMAGE_URL_KEY,
+  MEMORY_KEY,
+  NAME_KEY,
+  NAMESPACE_KEY,
+  OPERATING_SYSTEM_KEY,
+  PROVIDER_KEY,
+  PROVISION_SOURCE_TYPE_KEY,
+  START_VM_KEY,
+  USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY,
+  USE_CLOUD_INIT_KEY,
+  USER_TEMPLATE_KEY,
+  WORKLOAD_PROFILE_KEY,
+} from './constants';
+import { FormRow } from '../../Form/FormRow';
+import { isFieldDisabled, isFieldHidden, isFieldRequired } from './utils/vmSettingsTabUtils';
+import { getDefaultValue, getFieldHelp, getFieldId, getFieldTitle } from './initialState/vmSettingsTabInitialState';
+import { ImportProvider } from './providers/ImportProvider/ImportProvider';
+import { objectMerge } from '../../../utils';
+
+export class VmSettingsTab extends React.Component {
+  onChange = (key, value) => {
+    this.props.onChange(
+      objectMerge({}, this.props.vmSettings, {
+        [key]: { value },
+      })
+    );
+  };
+
+  onUserTemplateChange = userTemplate => {
+    this.onChange(USER_TEMPLATE_KEY, userTemplate === NO_TEMPLATE ? null : userTemplate);
+  };
+
+  // helpers
+  getField = key => get(this.props.vmSettings, key);
+
+  getFieldAttribute = (key, attribute) => get(this.getField(key), attribute);
+
+  getValue = key => this.getFieldAttribute(key, 'value');
+
+  getRowMetadata = key => ({
+    key,
+    title: getFieldTitle(key),
+    help: getFieldHelp(key, this.getValue(key)),
+    validation: this.getFieldAttribute(key, 'validation'),
+    isHidden: isFieldHidden(this.getField(key)),
+    isRequired: isFieldRequired(this.getField(key)),
+  });
+
+  getFieldData = key => ({
+    id: getFieldId(key),
+    disabled: isFieldDisabled(this.getField(key)),
+    value: this.getValue(key) || getDefaultValue(key),
+    onChange: value => this.onChange(key, value),
+  });
+
+  getCheckboxFieldData = key => ({
+    id: getFieldId(key),
+    title: getFieldTitle(key),
+    disabled: isFieldDisabled(this.getField(key)),
+    checked: this.getValue(key),
+    onChange: value => this.onChange(key, value),
+  });
+
+  render() {
+    const { namespaces, templates, children } = this.props;
+    const namespaceNames = namespaces.map(getName);
+    const userTemplateNames = getTemplate(templates, TEMPLATE_TYPE_VM).map(getName);
+    userTemplateNames.push(NO_TEMPLATE);
+
+    return (
+      <Form horizontal>
+        <FormRow {...this.getRowMetadata(NAME_KEY)}>
+          <Text {...this.getFieldData(NAME_KEY)} />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(DESCRIPTION_KEY)}>
+          <TextArea {...this.getFieldData(DESCRIPTION_KEY)} />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(NAMESPACE_KEY)}>
+          <Dropdown {...this.getFieldData(NAMESPACE_KEY)} choices={namespaceNames} />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(USER_TEMPLATE_KEY)}>
+          <Dropdown
+            {...this.getFieldData(USER_TEMPLATE_KEY)}
+            choices={userTemplateNames}
+            onChange={this.onUserTemplateChange}
+          />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(PROVISION_SOURCE_TYPE_KEY)}>
+          <Dropdown
+            {...this.getFieldData(PROVISION_SOURCE_TYPE_KEY)}
+            choices={this.getFieldAttribute(PROVISION_SOURCE_TYPE_KEY, 'sources')}
+          />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(PROVIDER_KEY)}>
+          <Dropdown {...this.getFieldData(PROVIDER_KEY)} choices={this.getFieldAttribute(PROVIDER_KEY, 'providers')} />
+        </FormRow>
+        {React.Children.toArray(children).filter(child => child.type.displayName === ImportProvider.displayName)}
+        <FormRow {...this.getRowMetadata(CONTAINER_IMAGE_KEY)}>
+          <TextArea {...this.getFieldData(CONTAINER_IMAGE_KEY)} />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(IMAGE_URL_KEY)}>
+          <TextArea {...this.getFieldData(IMAGE_URL_KEY)} />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(OPERATING_SYSTEM_KEY)}>
+          <Dropdown
+            {...this.getFieldData(OPERATING_SYSTEM_KEY)}
+            choices={this.getFieldAttribute(OPERATING_SYSTEM_KEY, 'operatingSystems')}
+          />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(FLAVOR_KEY)}>
+          <Dropdown {...this.getFieldData(FLAVOR_KEY)} choices={this.getFieldAttribute(FLAVOR_KEY, 'flavors')} />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(MEMORY_KEY)}>
+          <Integer {...this.getFieldData(MEMORY_KEY)} positive />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(CPU_KEY)}>
+          <Integer {...this.getFieldData(CPU_KEY)} positive />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(WORKLOAD_PROFILE_KEY)}>
+          <Dropdown
+            {...this.getFieldData(WORKLOAD_PROFILE_KEY)}
+            choices={this.getFieldAttribute(WORKLOAD_PROFILE_KEY, 'workloadProfiles')}
+          />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(START_VM_KEY)} title="" className="kubevirt-form-group--no-bottom">
+          <Checkbox {...this.getCheckboxFieldData(START_VM_KEY)} />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(USE_CLOUD_INIT_KEY)} title="">
+          <Checkbox {...this.getCheckboxFieldData(USE_CLOUD_INIT_KEY)} />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY)} title="">
+          <Checkbox {...this.getCheckboxFieldData(USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY)} />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(HOST_NAME_KEY)}>
+          <Text {...this.getFieldData(HOST_NAME_KEY)} />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(AUTHKEYS_KEY)}>
+          <TextArea {...this.getFieldData(AUTHKEYS_KEY)} />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(CLOUD_INIT_CUSTOM_SCRIPT_KEY)}>
+          <TextArea
+            {...this.getFieldData(CLOUD_INIT_CUSTOM_SCRIPT_KEY)}
+            className="kubevirt-create-vm-wizard__custom-cloud-script-textarea"
+          />
+        </FormRow>
+      </Form>
+    );
+  }
+}
+
+VmSettingsTab.defaultProps = {
+  children: null,
+  templates: null,
+  namespaces: null,
+  dataVolumes: null,
+};
+
+VmSettingsTab.propTypes = {
+  vmSettings: PropTypes.object.isRequired,
+  onChange: PropTypes.func.isRequired,
+  templates: PropTypes.array,
+  namespaces: PropTypes.array,
+  // eslint-disable-next-line react/no-unused-prop-types
+  dataVolumes: PropTypes.array,
+  children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+};
diff --git a/src/components/Wizard/CreateVmWizard/constants.js b/src/components/Wizard/CreateVmWizard/constants.js
index 29d17f306..99f9ba96a 100644
--- a/src/components/Wizard/CreateVmWizard/constants.js
+++ b/src/components/Wizard/CreateVmWizard/constants.js
@@ -1,4 +1,4 @@
-// BasicSettingsTab
+// VmSettingsTab
 export const NAME_KEY = 'name';
 export const NAMESPACE_KEY = 'namespace';
 export const DESCRIPTION_KEY = 'description';
@@ -6,6 +6,7 @@ export const PROVISION_SOURCE_TYPE_KEY = 'provisionSourceType';
 export const CONTAINER_IMAGE_KEY = 'containerImage';
 export const IMAGE_URL_KEY = 'imageURL';
 export const PROVIDER_KEY = 'provider';
+export const PROVIDERS_DATA_KEY = 'providersData';
 export const USER_TEMPLATE_KEY = 'userTemplate';
 export const OPERATING_SYSTEM_KEY = 'operatingSystem';
 export const FLAVOR_KEY = 'flavor';
@@ -13,20 +14,18 @@ export const MEMORY_KEY = 'memory';
 export const CPU_KEY = 'cpu';
 export const WORKLOAD_PROFILE_KEY = 'workloadProfile';
 export const START_VM_KEY = 'startVM';
-export const CLOUD_INIT_KEY = 'cloudInit';
+export const USE_CLOUD_INIT_KEY = 'cloudInit';
 export const USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY = 'useCloudInitCustomScript';
 export const HOST_NAME_KEY = 'hostname';
 export const AUTHKEYS_KEY = 'authKeys';
 export const CLOUD_INIT_CUSTOM_SCRIPT_KEY = 'cloudInitCustomScript';
 
 // Top-level stepData keys
-export const BASIC_SETTINGS_TAB_KEY = 'basicSettings';
+export const VM_SETTINGS_TAB_KEY = 'vmSettings';
 export const NETWORKS_TAB_KEY = 'network';
 export const STORAGE_TAB_KEY = 'storage';
 export const RESULT_TAB_KEY = 'result';
 
-export const BATCH_CHANGES_KEY = 'internalBatchChanges';
-
 // NetworksTab
 export const NETWORK_TYPE_MULTUS = 'multus';
 export const NETWORK_TYPE_POD = 'pod';
@@ -44,24 +43,3 @@ export const STORAGE_TYPE_CONTAINER = 'container';
 export const DATA_VOLUME_SOURCE_BLANK = 'datavolume-blank';
 export const DATA_VOLUME_SOURCE_URL = 'datavolume-url';
 export const DATA_VOLUME_SOURCE_PVC = 'datavolume-pvc';
-
-// Providers
-export const PROVIDER_VMWARE = 'VMWare';
-export const PROVIDER_VMWARE_VCENTER_KEY = 'vCenterInstance';
-export const PROVIDER_VMWARE_VM_KEY = 'vmwareVm';
-export const PROVIDER_VMWARE_USER_NAME_KEY = 'vmwareUserName';
-export const PROVIDER_VMWARE_USER_PWD_KEY = 'vmwareUserPwd';
-export const PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY = 'vmwareUserPwdCheck';
-export const PROVIDER_VMWARE_STATUS_KEY = 'vmwareStatus';
-export const PROVIDER_VMWARE_NAMESPACE_ALERT_KEY = 'vmwareNamespaceAlert';
-export const PROVIDER_VMWARE_HOSTNAME_KEY = 'vmwareHostname';
-export const PROVIDER_VMWARE_USER_PWD_REMEMBER_KEY = 'rememberVmwareCredentials';
-export const PROVIDER_VMWARE_VM_DATA_KEY = 'vmwareVmData';
-export const PROVIDER_VMWARE_PROVIDER_POD_NAME_KEY = 'vmwareProviderPodName'; // name of v2v Provider Pod created by the UI
-export const PROVIDER_VMWARE_CONNECTION = 'vmwareConnection'; // name of Secret
-export const PROVIDER_STATUS_CONNECTING = 'connecting';
-export const PROVIDER_STATUS_SUCCESS = 'success';
-export const PROVIDER_STATUS_CONNECTION_FAILED = 'connectionFailed';
-// probably no need to make the name generic
-export const INTERMEDIARY_NETWORKS_TAB_KEY = 'intermediaryNetworksData';
-export const INTERMEDIARY_STORAGE_TAB_KEY = 'intermediaryStorageData';
diff --git a/src/components/Wizard/CreateVmWizard/fixtures/BasicSettingsTab.fixture.js b/src/components/Wizard/CreateVmWizard/fixtures/VmSettingsTab.fixture.js
similarity index 88%
rename from src/components/Wizard/CreateVmWizard/fixtures/BasicSettingsTab.fixture.js
rename to src/components/Wizard/CreateVmWizard/fixtures/VmSettingsTab.fixture.js
index d39519002..e8572216c 100644
--- a/src/components/Wizard/CreateVmWizard/fixtures/BasicSettingsTab.fixture.js
+++ b/src/components/Wizard/CreateVmWizard/fixtures/VmSettingsTab.fixture.js
@@ -1,4 +1,4 @@
-import { BasicSettingsTab } from '../BasicSettingsTab';
+import { VmSettingsTab } from '../VmSettingsTab';
 import { namespaces } from './CreateVmWizard.fixture';
 import { PROVISION_SOURCE_CONTAINER } from '../../../../constants';
 import { CONTAINER_IMAGE_KEY, PROVISION_SOURCE_TYPE_KEY } from '../constants';
@@ -6,7 +6,7 @@ import { baseTemplates } from '../../../../k8s/objects/template';
 import { userTemplates } from '../../../../tests/mocks/user_template';
 import { callerContext } from '../../../../tests/k8s';
 
-export const basicSettings = {
+export const vmSettings = {
   name: {
     value: null,
   },
@@ -27,7 +27,7 @@ export const basicSettings = {
   },
 };
 
-export const validBasicSettings = {
+export const validVmSettings = {
   name: {
     value: 'name',
     validation: undefined,
@@ -62,11 +62,11 @@ export const validBasicSettings = {
 };
 
 export default {
-  component: BasicSettingsTab,
+  component: VmSettingsTab,
   props: {
     templates: [...baseTemplates, ...userTemplates],
     namespaces,
-    basicSettings,
+    vmSettings,
     onChange: () => {},
     ...callerContext,
   },
diff --git a/src/components/Wizard/CreateVmWizard/initialState/index.js b/src/components/Wizard/CreateVmWizard/initialState/index.js
new file mode 100644
index 000000000..901faad9d
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/initialState/index.js
@@ -0,0 +1 @@
+export * from './initialState';
diff --git a/src/components/Wizard/CreateVmWizard/initialState/initialState.js b/src/components/Wizard/CreateVmWizard/initialState/initialState.js
new file mode 100644
index 000000000..918b7200f
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/initialState/initialState.js
@@ -0,0 +1,25 @@
+import { VM_SETTINGS_TAB_KEY, NETWORKS_TAB_KEY, STORAGE_TAB_KEY, RESULT_TAB_KEY } from '../constants';
+import { getVmSettingsInitialState } from './vmSettingsTabInitialState';
+import { getNetworksInitialState } from './networksTabInitialState';
+import { getStorageInitialState } from './storageTabInitialState';
+import { getResultInitialState } from './resultTabInitialState';
+
+const initialStateGetterResolver = {
+  [VM_SETTINGS_TAB_KEY]: getVmSettingsInitialState,
+  [NETWORKS_TAB_KEY]: getNetworksInitialState,
+  [STORAGE_TAB_KEY]: getStorageInitialState,
+  [RESULT_TAB_KEY]: getResultInitialState,
+};
+
+export const getTabInitialState = (tabKey, props) => {
+  const getter = initialStateGetterResolver[tabKey];
+
+  let result;
+  if (getter) {
+    result = getter(props);
+  }
+
+  return result || { value: {}, valid: false };
+};
+
+export const getInitialActiveStepIndex = () => 0;
diff --git a/src/components/Wizard/CreateVmWizard/initialState/networksTabInitialState.js b/src/components/Wizard/CreateVmWizard/initialState/networksTabInitialState.js
new file mode 100644
index 000000000..5d41beb5c
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/initialState/networksTabInitialState.js
@@ -0,0 +1,19 @@
+import { POD_NETWORK } from '../../../../constants';
+import { NETWORK_BINDING_MASQUERADE, NETWORK_TYPE_POD } from '../constants';
+
+export const podNetwork = {
+  rootNetwork: {},
+  id: 0,
+  name: 'nic0',
+  mac: '',
+  network: POD_NETWORK,
+  editable: true,
+  edit: false,
+  networkType: NETWORK_TYPE_POD,
+  binding: NETWORK_BINDING_MASQUERADE,
+};
+
+export const getNetworksInitialState = props => ({
+  value: [podNetwork],
+  valid: true,
+});
diff --git a/src/components/Wizard/CreateVmWizard/initialState/providers/vmWareInitialState.js b/src/components/Wizard/CreateVmWizard/initialState/providers/vmWareInitialState.js
new file mode 100644
index 000000000..652df384b
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/initialState/providers/vmWareInitialState.js
@@ -0,0 +1,81 @@
+import { asDisabled, asHidden, VMWARE_PROVIDER_METADATA_ID } from '../../utils/vmSettingsTabUtils';
+import { PROVIDER_SELECT_VM } from '../../strings';
+import {
+  PROVIDER_VMWARE_CHECK_CONNECTION_KEY,
+  PROVIDER_VMWARE_HOSTNAME_KEY,
+  PROVIDER_VMWARE_V2V_NAME_KEY,
+  PROVIDER_VMWARE_STATUS_KEY,
+  PROVIDER_VMWARE_USER_NAME_KEY,
+  PROVIDER_VMWARE_USER_PASSWORD_KEY,
+  PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY,
+  PROVIDER_VMWARE_VCENTER_KEY,
+  PROVIDER_VMWARE_VM_KEY,
+} from '../../providers/VMwareImportProvider/constants';
+import { getSimpleV2vVMwareStatus } from '../../../../../utils/status/v2vVMware/v2vVMwareStatus';
+
+export const getFieldId = key => idResolver[key];
+export const getFieldTitle = key => titleResolver[key];
+export const getDefaultValue = key => defaultValueResolver[key] || '';
+export const getFieldHelp = (key, value) => {
+  const resolveFunction = helpResolver[key];
+  return resolveFunction ? resolveFunction(value) : null;
+};
+
+export const getVmWareInitialState = props => ({
+  [PROVIDER_VMWARE_VCENTER_KEY]: {},
+  [PROVIDER_VMWARE_HOSTNAME_KEY]: {},
+  [PROVIDER_VMWARE_USER_NAME_KEY]: {},
+  [PROVIDER_VMWARE_USER_PASSWORD_KEY]: {},
+  [PROVIDER_VMWARE_CHECK_CONNECTION_KEY]: {
+    isDisabled: asDisabled(true, PROVIDER_VMWARE_VCENTER_KEY),
+  },
+  [PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY]: {},
+  [PROVIDER_VMWARE_VM_KEY]: {
+    isDisabled: asDisabled(true, PROVIDER_VMWARE_VM_KEY),
+  },
+  [PROVIDER_VMWARE_STATUS_KEY]: {
+    isHidden: asHidden(true, VMWARE_PROVIDER_METADATA_ID),
+    value: getSimpleV2vVMwareStatus(), // UNKNOWN
+  },
+
+  // simple values
+  [PROVIDER_VMWARE_V2V_NAME_KEY]: null,
+});
+
+const titleResolver = {
+  [PROVIDER_VMWARE_VCENTER_KEY]: 'vCenter Instance',
+  [PROVIDER_VMWARE_HOSTNAME_KEY]: 'vCenter Hostname',
+  [PROVIDER_VMWARE_USER_NAME_KEY]: 'vCenter User Name',
+  [PROVIDER_VMWARE_USER_PASSWORD_KEY]: 'vCenter Password',
+  [PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY]: 'Remember vCenter credentials',
+  [PROVIDER_VMWARE_VM_KEY]: 'VM to Import',
+};
+
+const idResolver = {
+  [PROVIDER_VMWARE_VCENTER_KEY]: 'vcenter-instance-dropdown',
+  [PROVIDER_VMWARE_HOSTNAME_KEY]: 'vcenter-hostname-dropdown',
+  [PROVIDER_VMWARE_USER_NAME_KEY]: 'vcenter-username',
+  [PROVIDER_VMWARE_USER_PASSWORD_KEY]: 'vcenter-password',
+  [PROVIDER_VMWARE_CHECK_CONNECTION_KEY]: 'vcenter-connect',
+  [PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY]: 'vcenter-remember-credentials',
+  [PROVIDER_VMWARE_STATUS_KEY]: 'vcenter-status',
+  [PROVIDER_VMWARE_VM_KEY]: 'vcenter-vm-dropdown',
+};
+
+const defaultValueResolver = {
+  [PROVIDER_VMWARE_VCENTER_KEY]: '--- Select vCenter Instance Secret ---',
+  [PROVIDER_VMWARE_VM_KEY]: PROVIDER_SELECT_VM,
+};
+
+const helpResolver = {
+  [PROVIDER_VMWARE_VCENTER_KEY]: () => 'Select secret containing connection details for a vCenter instance.',
+  [PROVIDER_VMWARE_HOSTNAME_KEY]: () =>
+    'Address to be used for connection to a vCenter instance. The "https://" protocol will be added automatically. Example: "my.domain.com:1234".',
+
+  [PROVIDER_VMWARE_USER_NAME_KEY]: () => 'User name to be used for connection to a vCenter instance.',
+  [PROVIDER_VMWARE_USER_PASSWORD_KEY]: () => 'User password to be used for connection to a vCenter instance.',
+  [PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY]: () =>
+    'If checked, new secret keeping connection details will be created for later use.',
+  [PROVIDER_VMWARE_VM_KEY]: () =>
+    'Select a vCenter virtual machine to import. Loading of their list might take some time. The list will be enabled for selection once data are loaded.',
+};
diff --git a/src/components/Wizard/CreateVmWizard/initialState/resultTabInitialState.js b/src/components/Wizard/CreateVmWizard/initialState/resultTabInitialState.js
new file mode 100644
index 000000000..2861ea2ab
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/initialState/resultTabInitialState.js
@@ -0,0 +1,4 @@
+export const getResultInitialState = props => ({
+  value: [],
+  valid: null, // result of the request
+});
diff --git a/src/components/Wizard/CreateVmWizard/initialState/storageTabInitialState.js b/src/components/Wizard/CreateVmWizard/initialState/storageTabInitialState.js
new file mode 100644
index 000000000..08b14bdae
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/initialState/storageTabInitialState.js
@@ -0,0 +1,4 @@
+export const getStorageInitialState = props => ({
+  value: [],
+  valid: true, // empty Storages are valid
+});
diff --git a/src/components/Wizard/CreateVmWizard/initialState/vmSettingsTabInitialState.js b/src/components/Wizard/CreateVmWizard/initialState/vmSettingsTabInitialState.js
new file mode 100644
index 000000000..3492a3d58
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/initialState/vmSettingsTabInitialState.js
@@ -0,0 +1,181 @@
+import {
+  PROVISION_SOURCE_CLONED_DISK,
+  PROVISION_SOURCE_CONTAINER,
+  PROVISION_SOURCE_IMPORT,
+  PROVISION_SOURCE_PXE,
+  PROVISION_SOURCE_URL,
+} from '../../../../constants';
+
+import {
+  AUTHKEYS_KEY,
+  CLOUD_INIT_CUSTOM_SCRIPT_KEY,
+  CONTAINER_IMAGE_KEY,
+  CPU_KEY,
+  DESCRIPTION_KEY,
+  FLAVOR_KEY,
+  HOST_NAME_KEY,
+  IMAGE_URL_KEY,
+  MEMORY_KEY,
+  NAME_KEY,
+  NAMESPACE_KEY,
+  OPERATING_SYSTEM_KEY,
+  PROVIDER_KEY,
+  PROVIDERS_DATA_KEY,
+  PROVISION_SOURCE_TYPE_KEY,
+  START_VM_KEY,
+  USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY,
+  USE_CLOUD_INIT_KEY,
+  USER_TEMPLATE_KEY,
+  WORKLOAD_PROFILE_KEY,
+} from '../constants';
+
+import { getProvisionSourceHelp, HELP_CPU, HELP_FLAVOR, HELP_MEMORY, HELP_OS, HELP_WORKLOAD } from '../strings';
+
+import { getProviders, getProviderHelp, getProviderInitialState } from '../providers';
+
+import { asHidden, asRequired } from '../utils/vmSettingsTabUtils';
+
+export const getFieldId = key => idResolver[key];
+export const getFieldTitle = key => titleResolver[key];
+export const getDefaultValue = key => defaultValueResolver[key] || '';
+export const getFieldHelp = (key, value) => {
+  const resolveFunction = helpResolver[key];
+  return resolveFunction ? resolveFunction(value) : null;
+};
+
+export const getVmSettingsInitialState = props => ({
+  value: getInitialVmSettings(props),
+  valid: false,
+});
+
+export const getInitialVmSettings = (props = { createTemplate: false }) => {
+  const { createTemplate } = props;
+
+  const provisionSources = [
+    PROVISION_SOURCE_PXE,
+    PROVISION_SOURCE_URL,
+    PROVISION_SOURCE_CONTAINER,
+    PROVISION_SOURCE_CLONED_DISK,
+  ];
+
+  const importProviders = createTemplate ? [] : getProviders();
+
+  if (!createTemplate) {
+    provisionSources.push(PROVISION_SOURCE_IMPORT);
+  }
+
+  // initial fields should never change
+  return {
+    [NAME_KEY]: {
+      isRequired: asRequired(true),
+    },
+    [DESCRIPTION_KEY]: {},
+    [NAMESPACE_KEY]: {
+      isRequired: asRequired(true),
+    },
+    [USER_TEMPLATE_KEY]: {
+      isHidden: asHidden(createTemplate, 'CREATE_TEMPLATE'),
+    },
+    [PROVISION_SOURCE_TYPE_KEY]: {
+      isRequired: asRequired(true),
+      sources: provisionSources,
+    },
+    [PROVIDER_KEY]: {
+      providers: importProviders,
+    },
+    [CONTAINER_IMAGE_KEY]: {},
+    [IMAGE_URL_KEY]: {},
+    [OPERATING_SYSTEM_KEY]: {
+      isRequired: asRequired(true),
+      operatingSystems: [],
+    },
+    [FLAVOR_KEY]: {
+      isRequired: asRequired(true),
+      flavors: [],
+    },
+    [MEMORY_KEY]: {},
+    [CPU_KEY]: {},
+    [WORKLOAD_PROFILE_KEY]: {
+      isRequired: asRequired(true),
+      workloadProfiles: [],
+    },
+    [START_VM_KEY]: {
+      isHidden: asHidden(createTemplate, 'CREATE_TEMPLATE'),
+    },
+    [USE_CLOUD_INIT_KEY]: {},
+    [USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY]: {},
+    [HOST_NAME_KEY]: {},
+    [AUTHKEYS_KEY]: {},
+    [CLOUD_INIT_CUSTOM_SCRIPT_KEY]: {},
+    [PROVIDERS_DATA_KEY]: {
+      ...importProviders.reduce((allProviders, provider) => {
+        allProviders[provider] = getProviderInitialState(provider, props);
+        return allProviders;
+      }, {}),
+    },
+  };
+};
+
+const titleResolver = {
+  [NAME_KEY]: 'Name',
+  [DESCRIPTION_KEY]: 'Description',
+  [NAMESPACE_KEY]: 'Namespace',
+  [USER_TEMPLATE_KEY]: 'Template',
+  [PROVISION_SOURCE_TYPE_KEY]: 'Provision Source',
+  [PROVIDER_KEY]: 'Provider',
+  [CONTAINER_IMAGE_KEY]: 'Container Image',
+  [IMAGE_URL_KEY]: 'URL',
+  [OPERATING_SYSTEM_KEY]: 'Operating System',
+  [FLAVOR_KEY]: 'Flavor',
+  [MEMORY_KEY]: 'Memory (GB)',
+  [CPU_KEY]: 'CPUs',
+  [WORKLOAD_PROFILE_KEY]: 'Workload Profile',
+  [START_VM_KEY]: 'Start virtual machine on creation',
+  [USE_CLOUD_INIT_KEY]: 'Use cloud-init',
+  [USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY]: 'Use custom script',
+  [HOST_NAME_KEY]: 'Hostname',
+  [AUTHKEYS_KEY]: 'Authenticated SSH Keys',
+  [CLOUD_INIT_CUSTOM_SCRIPT_KEY]: 'Custom Script',
+};
+
+const idResolver = {
+  [NAME_KEY]: 'vm-name',
+  [DESCRIPTION_KEY]: 'vm-description',
+  [NAMESPACE_KEY]: 'namespace-dropdown',
+  [USER_TEMPLATE_KEY]: 'template-dropdown',
+  [PROVISION_SOURCE_TYPE_KEY]: 'image-source-type-dropdown',
+  [PROVIDER_KEY]: 'provider-dropdown',
+  [CONTAINER_IMAGE_KEY]: 'provision-source-container',
+  [IMAGE_URL_KEY]: 'provision-source-url',
+  [OPERATING_SYSTEM_KEY]: 'operating-system-dropdown',
+  [FLAVOR_KEY]: 'flavor-dropdown',
+  [MEMORY_KEY]: 'resources-memory',
+  [CPU_KEY]: 'resources-cpu',
+  [WORKLOAD_PROFILE_KEY]: 'workload-profile-dropdown',
+  [START_VM_KEY]: 'start-vm',
+  [USE_CLOUD_INIT_KEY]: 'use-cloud-init',
+  [USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY]: 'use-cloud-init-custom-script',
+  [HOST_NAME_KEY]: 'cloud-init-hostname',
+  [AUTHKEYS_KEY]: 'cloud-init-ssh',
+  [CLOUD_INIT_CUSTOM_SCRIPT_KEY]: 'cloud-init-custom-script',
+};
+
+const defaultValueResolver = {
+  [NAMESPACE_KEY]: '--- Select Namespace ---',
+  [USER_TEMPLATE_KEY]: '--- Select Template ---',
+  [PROVISION_SOURCE_TYPE_KEY]: '--- Select Provision Source ---',
+  [PROVIDER_KEY]: '--- Select Provider ---',
+  [OPERATING_SYSTEM_KEY]: '--- Select Operating System ---',
+  [FLAVOR_KEY]: '--- Select Flavor ---',
+  [WORKLOAD_PROFILE_KEY]: '--- Select Workload Profile ---',
+};
+
+const helpResolver = {
+  [PROVISION_SOURCE_TYPE_KEY]: getProvisionSourceHelp,
+  [PROVIDER_KEY]: getProviderHelp,
+  [OPERATING_SYSTEM_KEY]: () => HELP_OS,
+  [FLAVOR_KEY]: () => HELP_FLAVOR,
+  [MEMORY_KEY]: () => HELP_MEMORY,
+  [CPU_KEY]: () => HELP_CPU,
+  [WORKLOAD_PROFILE_KEY]: () => HELP_WORKLOAD,
+};
diff --git a/src/components/Wizard/CreateVmWizard/providers/ImportProvider/ImportProvider.js b/src/components/Wizard/CreateVmWizard/providers/ImportProvider/ImportProvider.js
new file mode 100644
index 000000000..865809780
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/providers/ImportProvider/ImportProvider.js
@@ -0,0 +1,18 @@
+// eslint-disable-next-line no-unused-vars
+import React from 'react';
+
+import PropTypes from 'prop-types';
+
+export const ImportProvider = ({ children, isVisible }) => (isVisible ? children : null);
+
+ImportProvider.displayName = 'ImportProvider';
+
+ImportProvider.defaultProps = {
+  isVisible: false,
+  children: null,
+};
+
+ImportProvider.propTypes = {
+  isVisible: PropTypes.bool,
+  children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+};
diff --git a/src/components/Wizard/CreateVmWizard/providers/ImportProvider/fixtures/ImportProvider.fixture.js b/src/components/Wizard/CreateVmWizard/providers/ImportProvider/fixtures/ImportProvider.fixture.js
new file mode 100644
index 000000000..e51158574
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/providers/ImportProvider/fixtures/ImportProvider.fixture.js
@@ -0,0 +1,11 @@
+import { ImportProvider } from '../ImportProvider';
+
+export default [
+  {
+    component: ImportProvider,
+    props: {
+      isVisible: true,
+      children: 'provider',
+    },
+  },
+];
diff --git a/src/components/Wizard/CreateVmWizard/providers/ImportProvider/tests/ImportProvider.test.js b/src/components/Wizard/CreateVmWizard/providers/ImportProvider/tests/ImportProvider.test.js
new file mode 100644
index 000000000..0924c91c2
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/providers/ImportProvider/tests/ImportProvider.test.js
@@ -0,0 +1,13 @@
+import React from 'react';
+import { mount } from 'enzyme';
+
+import { ImportProvider } from '../ImportProvider';
+
+const testImportProvider = () => <ImportProvider isVisible>provider</ImportProvider>;
+
+describe('<ImportProvider />', () => {
+  it('renders correctly', () => {
+    const component = mount(testImportProvider());
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/src/components/Wizard/CreateVmWizard/providers/ImportProvider/tests/__snapshots__/ImportProvider.test.js.snap b/src/components/Wizard/CreateVmWizard/providers/ImportProvider/tests/__snapshots__/ImportProvider.test.js.snap
new file mode 100644
index 000000000..a94882f25
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/providers/ImportProvider/tests/__snapshots__/ImportProvider.test.js.snap
@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<ImportProvider /> renders correctly 1`] = `
+<ImportProvider
+  isVisible={true}
+>
+  provider
+</ImportProvider>
+`;
diff --git a/src/components/Wizard/CreateVmWizard/providers/VCenterInstances.js b/src/components/Wizard/CreateVmWizard/providers/VCenterInstances.js
deleted file mode 100644
index 0eaaeaf2e..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/VCenterInstances.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { getName } from '../../../../selectors';
-import { settingsValue } from '../../../../k8s/selectors';
-
-import { getResource } from '../../../../utils';
-import { SecretModel } from '../../../../models';
-import { VCENTER_TEMPORARY_LABEL, VCENTER_TYPE_LABEL } from '../../../../constants';
-import { Dropdown } from '../../../Form';
-
-import { CONNECT_TO_NEW_INSTANCE } from '../strings';
-import { NAMESPACE_KEY } from '../constants';
-
-const getVCenterInstanceSecrets = vCenterSecrets => {
-  vCenterSecrets = vCenterSecrets || [];
-  return [CONNECT_TO_NEW_INSTANCE, ...vCenterSecrets.map(getName)];
-};
-
-const areResourcesLoaded = resources => !!resources;
-
-const VCenterInstances = ({ onChange, id, value, extraProps }) => {
-  const { WithResources, basicSettings } = extraProps;
-
-  const resourceMap = {
-    vCenterSecrets: {
-      resource: getResource(SecretModel, {
-        namespace: settingsValue(basicSettings, NAMESPACE_KEY),
-        matchExpressions: [
-          { key: VCENTER_TYPE_LABEL, operator: 'Exists' },
-          { key: VCENTER_TEMPORARY_LABEL, operator: 'DoesNotExist' },
-        ],
-      }),
-    },
-  };
-  const resourceToProps = ({ vCenterSecrets }) => ({
-    choices: getVCenterInstanceSecrets(vCenterSecrets),
-    onChange: name => onChange(vCenterSecrets.find(secret => getName(secret) === name) || name), // CONNECT_TO_NEW_INSTANCE
-    disabled: !areResourcesLoaded(vCenterSecrets),
-  });
-
-  return (
-    <WithResources resourceMap={resourceMap} resourceToProps={resourceToProps}>
-      <Dropdown id={id} value={getName(value) || value} /> {/* default value */}
-    </WithResources>
-  );
-};
-VCenterInstances.defaultProps = {
-  id: undefined,
-  value: undefined,
-};
-VCenterInstances.propTypes = {
-  onChange: PropTypes.func.isRequired,
-  extraProps: PropTypes.object.isRequired,
-  id: PropTypes.string,
-  value: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
-};
-
-export default VCenterInstances;
diff --git a/src/components/Wizard/CreateVmWizard/providers/VCenterVms.js b/src/components/Wizard/CreateVmWizard/providers/VCenterVms.js
deleted file mode 100644
index 450da613b..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/VCenterVms.js
+++ /dev/null
@@ -1,87 +0,0 @@
-import React from 'react';
-import { get } from 'lodash';
-
-import PropTypes from 'prop-types';
-
-import { getResource } from '../../../../utils';
-import { ConfigMapModel, V2VVMwareModel } from '../../../../models';
-import { Dropdown } from '../../../Form';
-
-import { PROVIDER_SELECT_VM } from '../strings';
-import { NAMESPACE_KEY } from '../constants';
-import { settingsValue, getV2VVmwareName } from '../../../../k8s/selectors';
-
-import VCenterVmsWithPrefill from './VCenterVmsWithPrefill';
-import {
-  VMWARE_TO_KUBEVIRT_OS_CONFIG_MAP_NAME,
-  VMWARE_TO_KUBEVIRT_OS_CONFIG_MAP_NAMESPACE,
-} from '../../../../constants';
-
-const VCenterVms = ({ onChange, onFormChange, id, value, extraProps, ...extra }) => {
-  // the "value" is name of selected VMWare VM
-  const { WithResources, basicSettings, operatingSystems, k8sGet } = extraProps;
-
-  const v2vvmwareName = getV2VVmwareName(basicSettings);
-
-  if (!v2vvmwareName) {
-    return <Dropdown id={id} value={PROVIDER_SELECT_VM} disabled />;
-  }
-
-  const resourceMap = {
-    v2vvmware: {
-      resource: getResource(V2VVMwareModel, {
-        name: v2vvmwareName,
-        namespace: settingsValue(basicSettings, NAMESPACE_KEY),
-        isList: false,
-      }),
-    },
-    vmwareToKubevirtOsConfigMap: {
-      resource: getResource(ConfigMapModel, {
-        name: VMWARE_TO_KUBEVIRT_OS_CONFIG_MAP_NAME,
-        namespace: VMWARE_TO_KUBEVIRT_OS_CONFIG_MAP_NAMESPACE,
-        isList: false,
-      }),
-    },
-  };
-  const resourceToProps = ({ v2vvmware }) => {
-    const vms = get(v2vvmware, 'spec.vms');
-    let choices = [];
-    if (vms) {
-      choices = Array.from(new Set(vms.map(vm => vm.name))).sort((a, b) =>
-        a.toLowerCase().localeCompare(b.toLowerCase())
-      );
-    }
-
-    return {
-      choices, // value set by the controller
-      disabled: !vms,
-    };
-  };
-
-  return (
-    <WithResources resourceMap={resourceMap} resourceToProps={resourceToProps}>
-      <VCenterVmsWithPrefill
-        id={id}
-        value={value}
-        onChange={onChange}
-        onFormChange={onFormChange}
-        basicSettings={basicSettings}
-        operatingSystems={operatingSystems}
-        k8sGet={k8sGet}
-      />
-    </WithResources>
-  );
-};
-VCenterVms.defaultProps = {
-  id: undefined,
-  value: undefined,
-};
-VCenterVms.propTypes = {
-  onChange: PropTypes.func.isRequired,
-  extraProps: PropTypes.object.isRequired,
-  onFormChange: PropTypes.func.isRequired,
-  id: PropTypes.string,
-  value: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
-};
-
-export default VCenterVms;
diff --git a/src/components/Wizard/CreateVmWizard/providers/VCenterVmsWithPrefill.js b/src/components/Wizard/CreateVmWizard/providers/VCenterVmsWithPrefill.js
deleted file mode 100644
index 71d77a25f..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/VCenterVmsWithPrefill.js
+++ /dev/null
@@ -1,331 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { get, isEqual } from 'lodash';
-
-import { Dropdown } from '../../../Form';
-import { settingsValue } from '../../../../k8s/selectors';
-
-import {
-  BATCH_CHANGES_KEY,
-  CPU_KEY,
-  PROVIDER_VMWARE_VM_DATA_KEY,
-  DESCRIPTION_KEY,
-  FLAVOR_KEY,
-  MEMORY_KEY,
-  NAME_KEY,
-  INTERMEDIARY_NETWORKS_TAB_KEY,
-  OPERATING_SYSTEM_KEY,
-  PROVIDER_VMWARE_VM_KEY,
-  INTERMEDIARY_STORAGE_TAB_KEY,
-  STORAGE_TYPE_EXTERNAL_IMPORT,
-  STORAGE_TYPE_EXTERNAL_V2V_TEMP,
-  STORAGE_TYPE_EXTERNAL_V2V_VDDK,
-} from '../constants';
-import { getValidationObject } from '../../../../utils';
-import { CUSTOM_FLAVOR, VALIDATION_INFO_TYPE } from '../../../../constants';
-import { getVmwareOsString } from '../strings';
-import { CONVERSION_POD_TEMP_MOUNT_PATH, CONVERSION_POD_VDDK_MOUNT_PATH } from '../../../../k8s/requests/v2v';
-
-const prefillGeneric = ({ basicSettings, formKey, lastPrefilledValue, vmVmware, vmwareValuePath, convertNewValue }) => {
-  let pair;
-  let value = get(vmVmware, vmwareValuePath);
-  if (convertNewValue) {
-    value = convertNewValue(value);
-  }
-
-  if (value) {
-    const formValue = settingsValue(basicSettings, formKey);
-    if (!formValue || formValue === lastPrefilledValue) {
-      if (lastPrefilledValue !== value) {
-        // avoid infinite loop
-        pair = { value, target: formKey };
-      }
-    }
-  }
-  return pair;
-};
-
-const prefillVmName = params => prefillGeneric({ ...params, formKey: NAME_KEY, vmwareValuePath: ['Config', 'Name'] });
-
-const prefillVmDescription = params =>
-  prefillGeneric({ ...params, formKey: DESCRIPTION_KEY, vmwareValuePath: ['Config', 'Annotation'] });
-
-const prefillMemory = params =>
-  prefillGeneric({
-    ...params,
-    formKey: MEMORY_KEY,
-    vmwareValuePath: ['Config', 'Hardware', 'MemoryMB'],
-    convertNewValue: value => value / 1024,
-  });
-
-const prefillCpu = params =>
-  prefillGeneric({ ...params, formKey: CPU_KEY, vmwareValuePath: ['Config', 'Hardware', 'NumCPU'] });
-
-export const prefillVmData = async ({ basicSettings, additionalData, lastPrefilledValue }) => {
-  if (!isEqual(additionalData, lastPrefilledValue)) {
-    return {
-      value: additionalData,
-      target: PROVIDER_VMWARE_VM_DATA_KEY,
-    };
-  }
-  return undefined;
-};
-
-/**
- * Provides mapping from VMWare GuesId to common-templates operating system.
- *
- * https://code.vmware.com/docs/4206/vsphere-web-services-api-reference#/doc/vim.vm.GuestOsDescriptor.GuestOsIdentifier.html
- *
- * The vmwareToKubevirtOsConfigMap is usually created by the web-ui-operator and can be missing.
- *
- * operatingSystems - see getTemplateOperatingSystems() in selectors.js
- */
-export const prefillOperatingSystem = async ({
-  basicSettings,
-  operatingSystems,
-  vmVmware,
-  vmwareToKubevirtOsConfigMap,
-  lastPrefilledValue,
-}) => {
-  const formValue = settingsValue(basicSettings, OPERATING_SYSTEM_KEY);
-
-  const guestId = get(vmVmware, ['Config', 'GuestId']);
-
-  const kubevirtId = get(vmwareToKubevirtOsConfigMap, ['data', guestId]);
-  const os = operatingSystems.find(o => o.id === kubevirtId);
-  if (os) {
-    // os is of format: { id, name }
-    if (!formValue) {
-      return { value: os, target: OPERATING_SYSTEM_KEY };
-    }
-
-    if (isEqual(formValue, lastPrefilledValue)) {
-      return undefined; // nothing to do
-    }
-  }
-
-  if (!formValue || !isEqual(formValue, lastPrefilledValue)) {
-    const guestFullName = get(vmVmware, ['Config', 'GuestFullName']);
-    return {
-      value: formValue,
-      target: OPERATING_SYSTEM_KEY,
-      validation: getValidationObject(getVmwareOsString(guestFullName), VALIDATION_INFO_TYPE),
-    };
-  }
-  return undefined;
-};
-
-// Just store data here, actual prefill will be handled within a callback in CreateVmWizard after passing through data in BasicSettingsTab
-export const prefillNics = ({ vmVmware, lastPrefilledValue }) => {
-  const devices = get(vmVmware, ['Config', 'Hardware', 'Device']);
-
-  // If the device is a network card, it has "MacAddress" present
-  // Source:
-  //   - https://www.vmware.com/support/developer/converter-sdk/conv50_apireference/vim.vm.device.VirtualDevice.BackingInfo.html
-  //   - https://www.vmware.com/support/developer/converter-sdk/conv50_apireference/vim.vm.device.VirtualDevice.html
-  const networkDevices = (devices || []).filter(device => device.hasOwnProperty('MacAddress'));
-  const value = networkDevices.map(device => ({
-    name: get(device, ['DeviceInfo', 'Label']),
-    mac: device.MacAddress,
-    id: device.Key, // TODO: verify once the Conversion pod is implemented
-  }));
-
-  if (!isEqual(lastPrefilledValue, value)) {
-    // avoid infinite loop
-    return { value, target: INTERMEDIARY_NETWORKS_TAB_KEY }; // value is expected to be passed to NETWORKS_TAB_KEY
-  }
-
-  return undefined;
-};
-
-// Just store data here, actual prefill will be handled within a callback in CreateVmWizard after passing through data in BasicSettingsTab
-export const prefillDisks = ({ vmVmware, lastDisks }) => {
-  const devices = get(vmVmware, ['Config', 'Hardware', 'Device']);
-
-  // if the device is a disk, it has "capacityInKB" present
-  // Alternatively:
-  //   diskObjectId - since vSphere API 5.5
-  //   capacityInBytes - since vSphere API 5.5
-  //   capacityInKB - deprecated since vSphere API 5.5
-  // https://www.vmware.com/support/developer/converter-sdk/conv50_apireference/vim.vm.device.VirtualDisk.html
-  // TODO: what about CDROM, Floppy, VirtualSCSIPassthrough,
-  const diskDevices = (devices || []).filter(
-    device => device.hasOwnProperty('CapacityInKB') || device.hasOwnProperty('CapacityInBytes')
-  );
-
-  const diskRows = diskDevices.map((device, idx) => {
-    const capacityKib = device.CapacityInBytes / 1024 || device.CapacityInKB;
-
-    return {
-      id: idx,
-      storageType: STORAGE_TYPE_EXTERNAL_IMPORT,
-      name: get(device, ['DeviceInfo', 'Label']),
-      size: capacityKib / (1024 * 1024),
-      storageClass: undefined, // Let the user select proper mapping
-      isBootable: idx === 0, // TODO get and set the real boot order
-      data: {
-        fileName: get(device, ['Backing', 'FileName']),
-        mountPath: `/data/vm/disk${idx + 1}`, // hardcoded
-      },
-    };
-  });
-
-  // temp disk needed for conversion pod
-  diskRows.push({
-    id: diskRows.length,
-    storageType: STORAGE_TYPE_EXTERNAL_V2V_TEMP,
-    name: 'v2v-conversion-temp',
-    size: 2,
-    storageClass: undefined,
-    data: {
-      mountPath: CONVERSION_POD_TEMP_MOUNT_PATH,
-    },
-  });
-
-  // TODO: make vddk configurable or move setup to somewhere else
-  // vddk pvc must be present in the same namespace as the VM
-  diskRows.push({
-    editable: false,
-    id: diskRows.length,
-    storageType: STORAGE_TYPE_EXTERNAL_V2V_VDDK,
-    name: 'vddk-pvc',
-    storageClass: undefined,
-    data: {
-      mountPath: CONVERSION_POD_VDDK_MOUNT_PATH,
-    },
-  });
-
-  if (!isEqual(lastDisks, diskRows)) {
-    // avoid infinite loop
-    return { value: diskRows, target: INTERMEDIARY_STORAGE_TAB_KEY }; // value is expected to be passed to STORAGE_TAB_KEY
-  }
-
-  return undefined;
-};
-
-class VCenterVmsWithPrefill extends React.Component {
-  state = {
-    lastName: undefined, // last prefilled VM name value
-    lastDescription: undefined,
-    lastOS: undefined,
-    lastVmData: undefined,
-    lastCpu: undefined,
-    lastMem: undefined,
-    lastNics: undefined,
-    lastDisks: undefined,
-  };
-
-  async prefillValues(vmVmware, additionalData) {
-    const { onFormChange, vmwareToKubevirtOsConfigMap, basicSettings, operatingSystems } = this.props;
-    const result = [];
-    const newState = {};
-
-    const namePair = prefillVmName({ basicSettings, vmVmware, lastPrefilledValue: this.state.lastName });
-    if (namePair) {
-      newState.lastName = namePair.value;
-      result.push(namePair);
-    }
-
-    const descrPair = prefillVmDescription({ basicSettings, vmVmware, lastPrefilledValue: this.state.lastDescription });
-    if (descrPair) {
-      newState.lastDescription = descrPair.value;
-      result.push(descrPair);
-    }
-
-    const osPair = await prefillOperatingSystem({
-      basicSettings,
-      vmVmware,
-      lastPrefilledValue: this.state.lastOS,
-      vmwareToKubevirtOsConfigMap,
-      operatingSystems,
-    });
-    if (osPair) {
-      newState.lastOS = osPair.value;
-      result.push(osPair);
-    }
-
-    const vmDataPair = await prefillVmData({
-      basicSettings,
-      additionalData,
-      lastPrefilledValue: this.state.lastVmData,
-    });
-    if (vmDataPair) {
-      newState.lastVmData = vmDataPair.value;
-      result.push(vmDataPair);
-    }
-
-    const memPair = prefillMemory({ basicSettings, vmVmware, lastPrefilledValue: this.state.lastMem });
-    if (memPair) {
-      newState.lastMem = memPair.value;
-      result.push({ value: CUSTOM_FLAVOR, target: FLAVOR_KEY });
-      result.push(memPair);
-    }
-
-    const cpuPair = prefillCpu({ basicSettings, vmVmware, lastPrefilledValue: this.state.lastCpu });
-    if (cpuPair) {
-      newState.lastCpu = cpuPair.value;
-      result.push(cpuPair);
-    }
-
-    const nics = prefillNics({ vmVmware, lastPrefilledValue: this.state.lastNics });
-    if (nics) {
-      newState.lastNics = nics.value;
-      result.push(nics);
-    }
-
-    const disks = prefillDisks({ vmVmware, lastDisks: this.state.lastDisks });
-    if (disks) {
-      newState.lastDisks = disks.value;
-      result.push(disks);
-    }
-
-    if (result.length > 0) {
-      this.setState(newState);
-      onFormChange({ value: result }, BATCH_CHANGES_KEY);
-    }
-  }
-
-  componentDidUpdate() {
-    const { v2vvmware, basicSettings } = this.props;
-
-    if (v2vvmware) {
-      const selectedVmName = settingsValue(basicSettings, PROVIDER_VMWARE_VM_KEY);
-      if (this.state.lastName !== selectedVmName) {
-        // just once
-        const vms = get(v2vvmware, 'spec.vms');
-        const vmWithDetail = (vms || []).find(vm => vm.name === selectedVmName && vm.detail && vm.detail.raw);
-        if (vmWithDetail) {
-          const { hostPath, raw } = vmWithDetail.detail;
-          const vmVmware = JSON.parse(raw);
-          this.prefillValues(vmVmware, { hostPath, thumbPrint: get(v2vvmware, 'spec.thumbprint') });
-        }
-      }
-    }
-  }
-
-  render() {
-    const { id, value, onChange, choices, disabled } = this.props;
-    return <Dropdown id={id} value={value} onChange={onChange} choices={choices} disabled={disabled} />;
-  }
-}
-VCenterVmsWithPrefill.defaultProps = {
-  value: undefined,
-  choices: [],
-  disabled: true,
-  v2vvmware: undefined,
-  vmwareToKubevirtOsConfigMap: undefined,
-};
-VCenterVmsWithPrefill.propTypes = {
-  id: PropTypes.string.isRequired,
-  onChange: PropTypes.func.isRequired,
-  onFormChange: PropTypes.func.isRequired,
-  basicSettings: PropTypes.object.isRequired,
-  operatingSystems: PropTypes.array.isRequired,
-  vmwareToKubevirtOsConfigMap: PropTypes.object,
-  v2vvmware: PropTypes.object,
-  value: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
-  choices: PropTypes.array,
-  disabled: PropTypes.bool,
-};
-
-export default VCenterVmsWithPrefill;
diff --git a/src/components/Wizard/CreateVmWizard/providers/VMWarePasswordAndCheck.js b/src/components/Wizard/CreateVmWizard/providers/VMWarePasswordAndCheck.js
deleted file mode 100644
index 6bc495251..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/VMWarePasswordAndCheck.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import React, { Fragment } from 'react';
-import PropTypes from 'prop-types';
-import { get } from 'lodash';
-
-import { Button } from 'patternfly-react';
-
-import { PASSWORD, Text } from '../../../Form';
-import { PROVIDER_VMWARE_USER_PWD_KEY, PROVIDER_VMWARE_CONNECTION, PROVIDER_VMWARE_HOSTNAME_KEY } from '../constants';
-import { settingsValue } from '../../../../k8s/selectors';
-
-// workaround to wrap two components at a single row
-const VMWarePasswordAndCheck = ({ onChange, id, value, extraProps }) => {
-  const { onCheckConnection, basicSettings } = extraProps;
-  const pwdValue = get(value, PROVIDER_VMWARE_USER_PWD_KEY);
-  const connValue = get(value, PROVIDER_VMWARE_CONNECTION);
-
-  return (
-    <Fragment>
-      <Text
-        type={PASSWORD}
-        id={`${id}-text`}
-        value={pwdValue || ''}
-        onChange={newValue =>
-          onChange({
-            [PROVIDER_VMWARE_USER_PWD_KEY]: newValue,
-            [PROVIDER_VMWARE_CONNECTION]: connValue,
-          })
-        }
-      />
-      <div className="kubevirt-create-vm-wizard__import-vmware-passwordcheck-button-section">
-        <Button
-          id={`${id}-check-button`}
-          className="kubevirt-create-vm-wizard__import-vmware-passwordcheck-button"
-          disabled={!settingsValue(basicSettings, PROVIDER_VMWARE_HOSTNAME_KEY)}
-          onClick={() => {
-            onCheckConnection(newValue =>
-              onChange({
-                [PROVIDER_VMWARE_USER_PWD_KEY]: pwdValue,
-                [PROVIDER_VMWARE_CONNECTION]: newValue,
-              })
-            );
-          }}
-        >
-          Check
-        </Button>
-      </div>
-    </Fragment>
-  );
-};
-VMWarePasswordAndCheck.defaultProps = {
-  id: undefined,
-  value: undefined,
-};
-VMWarePasswordAndCheck.propTypes = {
-  onChange: PropTypes.func.isRequired,
-  extraProps: PropTypes.object.isRequired,
-  id: PropTypes.string,
-  value: PropTypes.object,
-};
-
-export default VMWarePasswordAndCheck;
diff --git a/src/components/Wizard/CreateVmWizard/providers/VMWareProviderStatus.js b/src/components/Wizard/CreateVmWizard/providers/VMWareProviderStatus.js
deleted file mode 100644
index 5f1315620..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/VMWareProviderStatus.js
+++ /dev/null
@@ -1,166 +0,0 @@
-import React from 'react';
-import { get } from 'lodash';
-import PropTypes from 'prop-types';
-
-import { Alert, Spinner } from 'patternfly-react';
-
-import {
-  NAMESPACE_KEY,
-  PROVIDER_STATUS_CONNECTING,
-  PROVIDER_STATUS_CONNECTION_FAILED,
-  PROVIDER_VMWARE_CONNECTION,
-  PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY,
-} from '../constants';
-import { getResource } from '../../../../utils';
-import { V2VVMwareModel } from '../../../../models';
-import { settingsValue } from '../../../../k8s/selectors';
-
-// Following constants conform v2vvmware_controller.go
-const PhaseConnecting = 'Connecting';
-const PhaseConnectionSuccessful = 'ConnectionVerified';
-const PhaseConnectionFailed = 'Failed';
-const PhaseLoadingVmsList = 'LoadingVmsList';
-const PhaseLoadingVmsListFailed = 'LoadingVmsList';
-const PhaseLoadingVmDetail = 'LoadingVmDetail';
-const PhaseLoadingVmDetailFailed = 'LoadingVmDetailFailed';
-
-const StatusField = ({ children }) => (
-  <div className="kubevirt-create-vm-wizard__import-vmware-connection-status">{children}</div>
-);
-StatusField.propTypes = {
-  children: PropTypes.node.isRequired,
-};
-
-const CheckingCredentials = () => (
-  <StatusField>
-    Checking vCenter Credentials...
-    <Spinner loading size="sm" />
-  </StatusField>
-);
-
-const LoadingData = () => (
-  <StatusField>
-    Connection successful. Loading data...
-    <Spinner loading size="sm" />
-  </StatusField>
-);
-
-const ConnectionFailed = () => (
-  <StatusField>
-    <Alert type="warning">Could not connect to vCenter using the provided credentials.</Alert>
-  </StatusField>
-);
-
-const ConnectionFailedInfra = () => (
-  <StatusField>
-    <Alert type="warning">Can not verify vCenter credentials, connection to the V2V VMWare failed.</Alert>
-  </StatusField>
-);
-
-const ConnectionSuccessful = () => <StatusField>Connection successful</StatusField>;
-
-const ReadVmsListFailed = () => (
-  <StatusField>
-    <Alert type="warning">
-      Connection succeeded but could not read list of virtual machines from the vCenter instance.
-    </Alert>
-  </StatusField>
-);
-
-const ReadVmDetailFailed = () => (
-  <StatusField>
-    <Alert type="warning">
-      Connection succeeded but could not read details of the virtual machine from the vCenter instance.
-    </Alert>
-  </StatusField>
-);
-
-// Determine status of the "check-connection" user action from the 'status.phase' of the V2V VMWare object
-const VMWareProviderStatusByPhase = ({ phase }) => {
-  if (!phase || phase === PhaseConnecting) {
-    return <CheckingCredentials />;
-  }
-
-  if (phase === PhaseConnectionSuccessful) {
-    return <ConnectionSuccessful />;
-  }
-
-  if ([PhaseLoadingVmsList, PhaseLoadingVmDetail].includes(phase)) {
-    return <LoadingData />;
-  }
-
-  if (phase === PhaseConnectionFailed) {
-    return <ConnectionFailed />;
-  }
-
-  if (phase === PhaseLoadingVmsListFailed) {
-    return <ReadVmsListFailed />;
-  }
-
-  if (phase === PhaseLoadingVmDetailFailed) {
-    return <ReadVmDetailFailed />;
-  }
-
-  // eslint-disable-next-line no-console
-  console.warn('VMWareProviderStatusByPhase unrecognized phase found within the V2V VMWare object: ', phase);
-  return null;
-};
-VMWareProviderStatusByPhase.defaultProps = {
-  phase: undefined,
-};
-VMWareProviderStatusByPhase.propTypes = {
-  phase: PropTypes.string,
-};
-
-const getConnection = basicSettings =>
-  get(settingsValue(basicSettings, PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY), PROVIDER_VMWARE_CONNECTION);
-
-export const hasConnection = basicSettings => {
-  const connValue = getConnection(basicSettings);
-  return connValue && !!connValue.V2VVmwareName;
-};
-
-// see onVmwareCheckConnection() for details
-const VMWareProviderStatus = ({ extraProps }) => {
-  const { WithResources, basicSettings } = extraProps;
-
-  if (!hasConnection(basicSettings)) {
-    return null;
-  }
-  const { providerStatus, V2VVmwareName } = getConnection(basicSettings);
-
-  if (providerStatus === PROVIDER_STATUS_CONNECTION_FAILED) {
-    return <ConnectionFailedInfra />;
-  }
-
-  if (providerStatus === PROVIDER_STATUS_CONNECTING && !V2VVmwareName) {
-    return <CheckingCredentials />;
-  }
-
-  const resourceMap = {
-    v2vvmware: {
-      resource: getResource(V2VVMwareModel, {
-        name: V2VVmwareName,
-        namespace: settingsValue(basicSettings, NAMESPACE_KEY),
-        isList: false,
-      }),
-    },
-  };
-  const resourceToProps = ({ v2vvmware }) => ({
-    // TODO: handle the case when V2VVmwareName is set but the object is missing in API (404)
-    // means: it was garbage collected (so rare case)
-    phase: get(v2vvmware, 'status.phase'), // value set by the controller
-  });
-
-  return (
-    <WithResources resourceMap={resourceMap} resourceToProps={resourceToProps}>
-      <VMWareProviderStatusByPhase />
-    </WithResources>
-  );
-};
-VMWareProviderStatus.defaultProps = {};
-VMWareProviderStatus.propTypes = {
-  extraProps: PropTypes.object.isRequired,
-};
-
-export default VMWareProviderStatus;
diff --git a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/VMWareImportProvider.js b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/VMWareImportProvider.js
new file mode 100644
index 000000000..90f1680bc
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/VMWareImportProvider.js
@@ -0,0 +1,209 @@
+import React from 'react';
+
+import { get } from 'lodash';
+
+import PropTypes from 'prop-types';
+
+import { Button } from 'patternfly-react';
+
+import { PROVIDERS_DATA_KEY } from '../../constants';
+
+import { Checkbox, Dropdown, PASSWORD, Text } from '../../../../Form';
+import { objectMerge } from '../../../../../utils';
+
+import {
+  getDefaultValue,
+  getFieldHelp,
+  getFieldId,
+  getFieldTitle,
+} from '../../initialState/providers/vmWareInitialState';
+import { isFieldDisabled, isFieldHidden, isFieldRequired } from '../../utils/vmSettingsTabUtils';
+import { getName } from '../../../../../selectors';
+import { getLoadedVm, getThumbprint, getVms } from '../../../../../selectors/v2v';
+
+import { FormRow } from '../../../../Form/FormRow';
+
+import { CONNECT_TO_NEW_INSTANCE } from '../../strings';
+import {
+  PROVIDER_VMWARE,
+  PROVIDER_VMWARE_CHECK_CONNECTION_KEY,
+  PROVIDER_VMWARE_HOSTNAME_KEY,
+  PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY,
+  PROVIDER_VMWARE_STATUS_KEY,
+  PROVIDER_VMWARE_USER_NAME_KEY,
+  PROVIDER_VMWARE_USER_PASSWORD_KEY,
+  PROVIDER_VMWARE_VCENTER_KEY,
+  PROVIDER_VMWARE_VM_KEY,
+} from './constants';
+import VMWareProviderStatus from './VMWareProviderStatus';
+import { getSimpleV2vVMwareStatus } from '../../../../../utils/status/v2vVMware/v2vVMwareStatus';
+import { V2V_WMWARE_STATUS_UNKNOWN } from '../../../../../utils/status/v2vVMware';
+import { getVmwareField } from './selectors';
+
+export class VMWareImportProvider extends React.Component {
+  state = {
+    prevLoadedVmName: null,
+  };
+
+  onDataChange = data => {
+    this.props.onChange(
+      objectMerge({}, this.props.vmSettings, {
+        [PROVIDERS_DATA_KEY]: {
+          [PROVIDER_VMWARE]: data,
+        },
+      })
+    );
+  };
+
+  onChange = (key, value, attribute = 'value') => {
+    this.onDataChange({ [key]: { [attribute]: value } });
+  };
+
+  onSecretChange = value => {
+    const secret = value === CONNECT_TO_NEW_INSTANCE ? null : this.props.vCenterSecrets.find(s => getName(s) === value);
+    this.onDataChange({
+      [PROVIDER_VMWARE_VCENTER_KEY]: {
+        value,
+        secret,
+      },
+    });
+  };
+
+  // helpers
+  getField = key => getVmwareField(this.props.vmSettings, key);
+
+  getFieldAttribute = (key, attribute) => get(this.getField(key), attribute);
+
+  getValue = key => this.getFieldAttribute(key, 'value');
+
+  getRowMetadata = key => ({
+    key,
+    title: getFieldTitle(key),
+    help: getFieldHelp(key, this.getValue(key)),
+    validation: this.getFieldAttribute(key, 'validation'),
+    isHidden: isFieldHidden(this.getField(key)),
+    isRequired: isFieldRequired(this.getField(key)),
+  });
+
+  getFieldData = key => ({
+    id: getFieldId(key),
+    disabled: isFieldDisabled(this.getField(key)),
+    value: this.getValue(key) || getDefaultValue(key),
+    onChange: value => this.onChange(key, value),
+  });
+
+  getCheckboxFieldData = key => ({
+    id: getFieldId(key),
+    title: getFieldTitle(key),
+    disabled: isFieldDisabled(this.getField(key)),
+    checked: this.getValue(key),
+    onChange: value => this.onChange(key, value),
+  });
+
+  componentDidUpdate() {
+    const { vmwareToKubevirtOsConfigMap, v2vvmware } = this.props;
+
+    const { prevLoadedVmName } = this.state;
+
+    const selectedVmName = this.getValue(PROVIDER_VMWARE_VM_KEY);
+    const status = this.getValue(PROVIDER_VMWARE_STATUS_KEY);
+
+    const newStatus = getSimpleV2vVMwareStatus(v2vvmware);
+
+    const hasStatusChanged = newStatus !== status;
+
+    if (selectedVmName && prevLoadedVmName !== selectedVmName) {
+      const vm = getLoadedVm(this.props.v2vvmware, selectedVmName);
+      if (vm) {
+        // eslint-disable-next-line react/no-did-update-set-state
+        this.setState({ prevLoadedVmName: selectedVmName });
+        this.onDataChange({
+          [PROVIDER_VMWARE_VM_KEY]: {
+            vm,
+            vmwareToKubevirtOsConfigMap,
+            thumbprint: getThumbprint(v2vvmware),
+          },
+          [PROVIDER_VMWARE_STATUS_KEY]: {
+            value: hasStatusChanged ? newStatus : undefined,
+          },
+        });
+        return;
+      }
+    }
+    if (hasStatusChanged && newStatus !== V2V_WMWARE_STATUS_UNKNOWN) {
+      this.onChange(PROVIDER_VMWARE_STATUS_KEY, newStatus);
+    }
+  }
+
+  render() {
+    const { vCenterSecrets, v2vvmware } = this.props;
+
+    const secrets = [CONNECT_TO_NEW_INSTANCE, ...vCenterSecrets.map(getName)];
+
+    const vms = getVms(v2vvmware);
+    let vmNames = [];
+    if (vms) {
+      vmNames = Array.from(new Set(vms.map(vm => vm.name))).sort((a, b) =>
+        a.toLowerCase().localeCompare(b.toLowerCase())
+      );
+    }
+
+    return (
+      <React.Fragment>
+        <FormRow {...this.getRowMetadata(PROVIDER_VMWARE_VCENTER_KEY)}>
+          <Dropdown
+            {...this.getFieldData(PROVIDER_VMWARE_VCENTER_KEY)}
+            onChange={this.onSecretChange}
+            choices={secrets}
+          />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(PROVIDER_VMWARE_HOSTNAME_KEY)}>
+          <Text {...this.getFieldData(PROVIDER_VMWARE_HOSTNAME_KEY)} />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(PROVIDER_VMWARE_USER_NAME_KEY)}>
+          <Text {...this.getFieldData(PROVIDER_VMWARE_USER_NAME_KEY)} />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(PROVIDER_VMWARE_USER_PASSWORD_KEY)}>
+          <Text {...this.getFieldData(PROVIDER_VMWARE_USER_PASSWORD_KEY)} type={PASSWORD} />
+        </FormRow>
+        <FormRow
+          {...this.getRowMetadata(PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY)}
+          title=""
+          className="kubevirt-create-vm-wizard__import-vmware-password"
+        >
+          <Checkbox {...this.getCheckboxFieldData(PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY)} />
+        </FormRow>
+        <FormRow isHidden={isFieldHidden(this.getField(PROVIDER_VMWARE_CHECK_CONNECTION_KEY))}>
+          <Button
+            id={getFieldId(PROVIDER_VMWARE_CHECK_CONNECTION_KEY)}
+            className="kubevirt-create-vm-wizard__import-vmware-passwordcheck-button"
+            disabled={isFieldDisabled(this.getField(PROVIDER_VMWARE_CHECK_CONNECTION_KEY))}
+            onClick={() => this.onChange(PROVIDER_VMWARE_CHECK_CONNECTION_KEY, true)}
+          >
+            Check
+          </Button>
+        </FormRow>
+        <FormRow isHidden={isFieldHidden(this.getField(PROVIDER_VMWARE_STATUS_KEY))}>
+          <VMWareProviderStatus status={this.getValue(PROVIDER_VMWARE_STATUS_KEY)} />
+        </FormRow>
+        <FormRow {...this.getRowMetadata(PROVIDER_VMWARE_VM_KEY)}>
+          <Dropdown {...this.getFieldData(PROVIDER_VMWARE_VM_KEY)} choices={vmNames} />
+        </FormRow>
+      </React.Fragment>
+    );
+  }
+}
+
+VMWareImportProvider.defaultProps = {
+  vCenterSecrets: [], // TODO: add loading when undefined
+  v2vvmware: null,
+  vmwareToKubevirtOsConfigMap: null,
+};
+
+VMWareImportProvider.propTypes = {
+  vmSettings: PropTypes.object.isRequired,
+  onChange: PropTypes.func.isRequired,
+  vCenterSecrets: PropTypes.array,
+  v2vvmware: PropTypes.object,
+  vmwareToKubevirtOsConfigMap: PropTypes.object,
+};
diff --git a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/VMWareProviderStatus.js b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/VMWareProviderStatus.js
new file mode 100644
index 000000000..dccb74146
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/VMWareProviderStatus.js
@@ -0,0 +1,97 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { Alert, Spinner } from 'patternfly-react';
+
+import {
+  V2V_WMWARE_STATUS_CONNECTING,
+  V2V_WMWARE_STATUS_CONNECTION_FAILED,
+  V2V_WMWARE_STATUS_CONNECTION_SUCCESSFUL,
+  V2V_WMWARE_STATUS_LOADING_VM_DETAIL,
+  V2V_WMWARE_STATUS_LOADING_VM_DETAIL_FAILED,
+  V2V_WMWARE_STATUS_LOADING_VMS_LIST,
+  V2V_WMWARE_STATUS_LOADING_VMS_LIST_FAILED,
+  V2V_WMWARE_STATUS_UNKNOWN,
+  V2V_WMWARE_STATUS_CONNECTION_TO_VCENTER_FAILED,
+} from '../../../../../utils/status/v2vVMware';
+
+const StatusField = ({ children }) => (
+  <div className="kubevirt-create-vm-wizard__import-vmware-connection-status">{children}</div>
+);
+StatusField.propTypes = {
+  children: PropTypes.node.isRequired,
+};
+
+const CheckingCredentials = () => (
+  <StatusField>
+    Checking vCenter Credentials...
+    <Spinner loading size="sm" />
+  </StatusField>
+);
+
+const LoadingData = () => (
+  <StatusField>
+    Connection successful. Loading data...
+    <Spinner loading size="sm" />
+  </StatusField>
+);
+
+const ConnectionFailed = () => (
+  <StatusField>
+    <Alert type="warning">Could not connect to vCenter using the provided credentials.</Alert>
+  </StatusField>
+);
+
+const ConnectionFailedInfra = () => (
+  <StatusField>
+    <Alert type="warning">Can not verify vCenter credentials, connection to the V2V VMWare failed.</Alert>
+  </StatusField>
+);
+
+const ConnectionSuccessful = () => <StatusField>Connection successful</StatusField>;
+
+const ConnectionUnknown = () => <StatusField>Status unknown</StatusField>;
+
+const ReadVmsListFailed = () => (
+  <StatusField>
+    <Alert type="warning">
+      Connection succeeded but could not read list of virtual machines from the vCenter instance.
+    </Alert>
+  </StatusField>
+);
+
+const ReadVmDetailFailed = () => (
+  <StatusField>
+    <Alert type="warning">
+      Connection succeeded but could not read details of the virtual machine from the vCenter instance.
+    </Alert>
+  </StatusField>
+);
+
+const vmwareStatusComponentResolver = {
+  [V2V_WMWARE_STATUS_CONNECTING]: CheckingCredentials,
+  [V2V_WMWARE_STATUS_CONNECTION_TO_VCENTER_FAILED]: ConnectionFailedInfra,
+  [V2V_WMWARE_STATUS_CONNECTION_FAILED]: ConnectionFailed,
+  [V2V_WMWARE_STATUS_LOADING_VMS_LIST]: LoadingData,
+  [V2V_WMWARE_STATUS_LOADING_VMS_LIST_FAILED]: ReadVmsListFailed,
+  [V2V_WMWARE_STATUS_LOADING_VM_DETAIL]: LoadingData,
+  [V2V_WMWARE_STATUS_LOADING_VM_DETAIL_FAILED]: ReadVmDetailFailed,
+  [V2V_WMWARE_STATUS_CONNECTION_SUCCESSFUL]: ConnectionSuccessful,
+  [V2V_WMWARE_STATUS_UNKNOWN]: ConnectionUnknown,
+};
+// see onVmwareCheckConnection() for details
+const VMWareProviderStatus = ({ status }) => {
+  const StatusComponent = vmwareStatusComponentResolver[status] || ConnectionUnknown;
+
+  return <StatusComponent />;
+};
+
+VMWareProviderStatus.defaultProps = {
+  status: null,
+};
+
+VMWareProviderStatus.propTypes = {
+  status: PropTypes.string,
+};
+
+export default VMWareProviderStatus;
diff --git a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/constants.js b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/constants.js
new file mode 100644
index 000000000..389405286
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/constants.js
@@ -0,0 +1,14 @@
+export const PROVIDER_VMWARE = 'VMware';
+
+export const PROVIDER_VMWARE_VCENTER_KEY = 'vCenterInstance';
+export const PROVIDER_VMWARE_HOSTNAME_KEY = 'vmwareHostname';
+export const PROVIDER_VMWARE_USER_NAME_KEY = 'vmwareUserName';
+export const PROVIDER_VMWARE_USER_PASSWORD_KEY = 'vmwarePassword';
+export const PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY = 'rememberVMwareCredentials';
+
+export const PROVIDER_VMWARE_CHECK_CONNECTION_KEY = 'checkConnectionButton';
+export const PROVIDER_VMWARE_STATUS_KEY = 'vmwareStatus';
+
+export const PROVIDER_VMWARE_VM_KEY = 'vmwareVm';
+
+export const PROVIDER_VMWARE_V2V_NAME_KEY = 'v2vVmwareName';
diff --git a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/fixtures/VMWareImportProvider.fixture.js b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/fixtures/VMWareImportProvider.fixture.js
new file mode 100644
index 000000000..b272463ec
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/fixtures/VMWareImportProvider.fixture.js
@@ -0,0 +1 @@
+// TODO: add
diff --git a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/fixtures/VMWareProviderStatus.fixture.js b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/fixtures/VMWareProviderStatus.fixture.js
new file mode 100644
index 000000000..b272463ec
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/fixtures/VMWareProviderStatus.fixture.js
@@ -0,0 +1 @@
+// TODO: add
diff --git a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/requestedResources.js b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/requestedResources.js
new file mode 100644
index 000000000..555073952
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/requestedResources.js
@@ -0,0 +1,52 @@
+import { getResource } from '../../../../../utils';
+import { ConfigMapModel, SecretModel, V2VVMwareModel } from '../../../../../models';
+import { VCENTER_TEMPORARY_LABEL, VCENTER_TYPE_LABEL } from '../../../../../constants';
+import { getVmwareField } from './selectors';
+import { NAMESPACE_KEY } from '../../constants';
+import {
+  VMWARE_TO_KUBEVIRT_OS_CONFIG_MAP_NAME,
+  VMWARE_TO_KUBEVIRT_OS_CONFIG_MAP_NAMESPACE,
+} from '../../../../../config';
+import { PROVIDER_VMWARE_V2V_NAME_KEY } from './constants';
+import { getVmSettingValue } from '../../utils/vmSettingsTabUtils';
+
+export const getVmWareProviderRequestedResources = state => {
+  const v2vVmwareName = getVmwareField(state, PROVIDER_VMWARE_V2V_NAME_KEY);
+  const namespace = getVmSettingValue(state, NAMESPACE_KEY);
+  const resources = {
+    vCenterSecrets: {
+      resource: getResource(SecretModel, {
+        namespace,
+        matchExpressions: [
+          {
+            key: VCENTER_TYPE_LABEL,
+            operator: 'Exists',
+          },
+          {
+            key: VCENTER_TEMPORARY_LABEL,
+            operator: 'DoesNotExist',
+          },
+        ],
+      }),
+    },
+    vmwareToKubevirtOsConfigMap: {
+      resource: getResource(ConfigMapModel, {
+        name: VMWARE_TO_KUBEVIRT_OS_CONFIG_MAP_NAME,
+        namespace: VMWARE_TO_KUBEVIRT_OS_CONFIG_MAP_NAMESPACE,
+        isList: false,
+      }),
+    },
+  };
+
+  if (v2vVmwareName) {
+    resources.v2vvmware = {
+      resource: getResource(V2VVMwareModel, {
+        name: v2vVmwareName,
+        namespace,
+        isList: false,
+      }),
+    };
+  }
+
+  return resources;
+};
diff --git a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/selectors.js b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/selectors.js
new file mode 100644
index 000000000..bd6b7d03c
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/selectors.js
@@ -0,0 +1,28 @@
+import { get, isEqual } from 'lodash';
+
+import { PROVIDER_KEY, PROVIDERS_DATA_KEY, PROVISION_SOURCE_TYPE_KEY } from '../../constants';
+import { CONNECT_TO_NEW_INSTANCE } from '../../strings';
+import { PROVISION_SOURCE_IMPORT } from '../../../../../constants';
+import { PROVIDER_VMWARE, PROVIDER_VMWARE_VCENTER_KEY } from './constants';
+import { getVmSettings, getVmSettingValue } from '../../utils/vmSettingsTabUtils';
+
+export const isVmwareNewInstanceSecret = state =>
+  getVmwareValue(state, PROVIDER_VMWARE_VCENTER_KEY) === CONNECT_TO_NEW_INSTANCE;
+
+export const isVmwareProvider = state =>
+  getVmSettingValue(state, PROVISION_SOURCE_TYPE_KEY) === PROVISION_SOURCE_IMPORT &&
+  getVmSettingValue(state, PROVIDER_KEY) === PROVIDER_VMWARE;
+
+export const getVmwareField = (state, key, defaultValue) =>
+  get(getVmSettings(state), [PROVIDERS_DATA_KEY, PROVIDER_VMWARE, key], defaultValue);
+
+export const getVmwareAttribute = (state, key, attribute = 'value', defaultValue) =>
+  get(getVmwareField(state, key), attribute, defaultValue);
+
+export const getVmwareValue = (state, key, defaultValue) => getVmwareAttribute(state, key, 'value', defaultValue);
+
+export const hasVmWareSettingsChanged = (prevState, state, ...keys) =>
+  keys.find(key => !isEqual(getVmwareField(prevState, key), getVmwareField(state, key)));
+
+export const hasVmWareSettingsValuesChanged = (prevState, state, ...keys) =>
+  keys.find(key => !isEqual(getVmwareValue(prevState, key), getVmwareValue(state, key)));
diff --git a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/VMWareImportProvider.test.js b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/VMWareImportProvider.test.js
new file mode 100644
index 000000000..8e7194fc0
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/VMWareImportProvider.test.js
@@ -0,0 +1,14 @@
+import React from 'react';
+import { mount } from 'enzyme';
+
+import { VMWareImportProvider } from '../VMWareImportProvider';
+
+const testVMWareImportProvider = () => <VMWareImportProvider />;
+
+// TODO
+describe('<VMWareImportProvider />', () => {
+  it('renders correctly', () => {
+    const component = mount(testVMWareImportProvider());
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/VMWareProviderStatus.test.js b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/VMWareProviderStatus.test.js
new file mode 100644
index 000000000..2b1fd89c6
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/VMWareProviderStatus.test.js
@@ -0,0 +1,14 @@
+import React from 'react';
+import { mount } from 'enzyme';
+
+import VMWareProviderStatus from '../VMWareProviderStatus';
+
+const testVMWareProviderStatus = () => <VMWareProviderStatus />;
+
+// TODO
+describe('<VMWareProviderStatus />', () => {
+  it('renders correctly', () => {
+    const component = mount(testVMWareProviderStatus());
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/__snapshots__/VMWareImportProvider.test.js.snap b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/__snapshots__/VMWareImportProvider.test.js.snap
new file mode 100644
index 000000000..e22f0abd9
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/__snapshots__/VMWareImportProvider.test.js.snap
@@ -0,0 +1,1434 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<VMWareImportProvider /> renders correctly 1`] = `
+<VMWareImportProvider
+  v2vvmware={null}
+  vCenterSecrets={Array []}
+  vmwareToKubevirtOsConfigMap={null}
+>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help="Select secret containing connection details for a vCenter instance."
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="vCenterInstance"
+    labelSize={3}
+    textPosition="text-right"
+    title="vCenter Instance"
+    validation={Object {}}
+  >
+    <ValidationFormRow
+      className={null}
+      controlSize={5}
+      help="Select secret containing connection details for a vCenter instance."
+      id={null}
+      isHidden={false}
+      isRequired={false}
+      labelSize={3}
+      textPosition="text-right"
+      title="vCenter Instance"
+      validation={Object {}}
+    >
+      <FormGroup
+        bsClass="form-group"
+        className="kubevirt-form-group"
+        id={null}
+      >
+        <div
+          className="kubevirt-form-group form-group"
+          id={null}
+        >
+          <Col
+            bsClass="col"
+            className="text-right"
+            componentClass="div"
+            sm={3}
+          >
+            <div
+              className="text-right col-sm-3"
+            >
+              <FormControlLabel
+                help="Select secret containing connection details for a vCenter instance."
+                isRequired={false}
+                title="vCenter Instance"
+              >
+                <ControlLabel
+                  bsClass="control-label"
+                  className={null}
+                  srOnly={false}
+                >
+                  <label
+                    className="control-label"
+                  >
+                    vCenter Instance
+                  </label>
+                </ControlLabel>
+                <FieldLevelHelp
+                  buttonClass=""
+                  className="kubevirt-form-group__field-help"
+                  content="Select secret containing connection details for a vCenter instance."
+                  placement="right"
+                  rootClose={true}
+                >
+                  <OverlayTrigger
+                    defaultOverlayShown={false}
+                    overlay={
+                      <Popover
+                        bsClass="popover"
+                        id="popover"
+                        placement="right"
+                      >
+                        Select secret containing connection details for a vCenter instance.
+                      </Popover>
+                    }
+                    placement="right"
+                    rootClose={true}
+                    trigger={
+                      Array [
+                        "click",
+                      ]
+                    }
+                  >
+                    <Button
+                      active={false}
+                      block={false}
+                      bsClass="btn"
+                      bsStyle="link"
+                      className="popover-pf-info"
+                      disabled={false}
+                      onClick={[Function]}
+                    >
+                      <button
+                        className="popover-pf-info btn btn-link"
+                        disabled={false}
+                        onClick={[Function]}
+                        type="button"
+                      >
+                        <Icon
+                          name="info"
+                          type="pf"
+                        >
+                          <PatternflyIcon
+                            className=""
+                            name="info"
+                          >
+                            <span
+                              aria-hidden="true"
+                              className="pficon pficon-info"
+                            />
+                          </PatternflyIcon>
+                        </Icon>
+                      </button>
+                    </Button>
+                  </OverlayTrigger>
+                </FieldLevelHelp>
+              </FormControlLabel>
+            </div>
+          </Col>
+          <Col
+            bsClass="col"
+            componentClass="div"
+            sm={5}
+          >
+            <div
+              className="col-sm-5"
+            >
+              <Dropdown
+                choices={
+                  Array [
+                    "Connect to New Instance",
+                  ]
+                }
+                disabled={false}
+                id="vcenter-instance-dropdown"
+                onChange={[Function]}
+                value="--- Select vCenter Instance Secret ---"
+                withTooltips={false}
+              >
+                <ButtonGroup
+                  block={false}
+                  bsClass="btn-group"
+                  justified={true}
+                  key="vcenter-instance-dropdown"
+                  vertical={false}
+                >
+                  <div
+                    className="btn-group btn-group-justified"
+                  >
+                    <DropdownButton
+                      bsStyle="default"
+                      className="kubevirt-dropdown"
+                      disabled={false}
+                      id="vcenter-instance-dropdown"
+                      onSelect={[Function]}
+                      title="--- Select vCenter Instance Secret ---"
+                    >
+                      <DropdownButton
+                        bsStyle="default"
+                        className="kubevirt-dropdown"
+                        disabled={false}
+                        id="vcenter-instance-dropdown"
+                        onSelect={[Function]}
+                        title="--- Select vCenter Instance Secret ---"
+                      >
+                        <Uncontrolled(Dropdown)
+                          bsStyle="default"
+                          disabled={false}
+                          id="vcenter-instance-dropdown"
+                          onSelect={[Function]}
+                        >
+                          <Dropdown
+                            bsClass="dropdown"
+                            bsStyle="default"
+                            componentClass={[Function]}
+                            disabled={false}
+                            id="vcenter-instance-dropdown"
+                            onSelect={[Function]}
+                            onToggle={[Function]}
+                          >
+                            <ButtonGroup
+                              block={false}
+                              bsClass="btn-group"
+                              bsStyle="default"
+                              className="dropdown"
+                              justified={false}
+                              vertical={false}
+                            >
+                              <div
+                                className="dropdown btn-group btn-group-default"
+                              >
+                                <DropdownToggle
+                                  bsClass="dropdown-toggle"
+                                  bsRole="toggle"
+                                  bsStyle="default"
+                                  className="kubevirt-dropdown"
+                                  disabled={false}
+                                  id="vcenter-instance-dropdown"
+                                  key=".0"
+                                  onClick={[Function]}
+                                  onKeyDown={[Function]}
+                                  open={false}
+                                  useAnchor={false}
+                                >
+                                  <Button
+                                    active={false}
+                                    aria-expanded={false}
+                                    aria-haspopup={true}
+                                    block={false}
+                                    bsClass="btn"
+                                    bsStyle="default"
+                                    className="kubevirt-dropdown dropdown-toggle"
+                                    disabled={false}
+                                    id="vcenter-instance-dropdown"
+                                    onClick={[Function]}
+                                    onKeyDown={[Function]}
+                                    role="button"
+                                  >
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
+                                      className="kubevirt-dropdown dropdown-toggle btn btn-default"
+                                      disabled={false}
+                                      id="vcenter-instance-dropdown"
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      role="button"
+                                      type="button"
+                                    >
+                                      --- Select vCenter Instance Secret ---
+                                       
+                                      <span
+                                        className="caret"
+                                      />
+                                    </button>
+                                  </Button>
+                                </DropdownToggle>
+                                <DropdownMenu
+                                  bsClass="dropdown-menu"
+                                  bsRole="menu"
+                                  key=".1"
+                                  labelledBy="vcenter-instance-dropdown"
+                                  onClose={[Function]}
+                                  onSelect={[Function]}
+                                  pullRight={false}
+                                >
+                                  <RootCloseWrapper
+                                    disabled={true}
+                                    event="click"
+                                    onRootClose={[Function]}
+                                  >
+                                    <ul
+                                      aria-labelledby="vcenter-instance-dropdown"
+                                      className="dropdown-menu"
+                                      role="menu"
+                                    >
+                                      <MenuItem
+                                        bsClass="dropdown"
+                                        disabled={false}
+                                        divider={false}
+                                        eventKey="Connect to New Instance"
+                                        header={false}
+                                        key=".$Connect to New Instance"
+                                        onKeyDown={[Function]}
+                                        onSelect={[Function]}
+                                      >
+                                        <li
+                                          className=""
+                                          role="presentation"
+                                        >
+                                          <SafeAnchor
+                                            componentClass="a"
+                                            onClick={[Function]}
+                                            onKeyDown={[Function]}
+                                            role="menuitem"
+                                            tabIndex="-1"
+                                          >
+                                            <a
+                                              href="#"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                            >
+                                              Connect to New Instance
+                                            </a>
+                                          </SafeAnchor>
+                                        </li>
+                                      </MenuItem>
+                                    </ul>
+                                  </RootCloseWrapper>
+                                </DropdownMenu>
+                              </div>
+                            </ButtonGroup>
+                          </Dropdown>
+                        </Uncontrolled(Dropdown)>
+                      </DropdownButton>
+                    </DropdownButton>
+                  </div>
+                </ButtonGroup>
+              </Dropdown>
+            </div>
+          </Col>
+        </div>
+      </FormGroup>
+    </ValidationFormRow>
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help="Address to be used for connection to a vCenter instance. The \\"https://\\" protocol will be added automatically. Example: \\"my.domain.com:1234\\"."
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="vmwareHostname"
+    labelSize={3}
+    textPosition="text-right"
+    title="vCenter Hostname"
+    validation={Object {}}
+  >
+    <ValidationFormRow
+      className={null}
+      controlSize={5}
+      help="Address to be used for connection to a vCenter instance. The \\"https://\\" protocol will be added automatically. Example: \\"my.domain.com:1234\\"."
+      id={null}
+      isHidden={false}
+      isRequired={false}
+      labelSize={3}
+      textPosition="text-right"
+      title="vCenter Hostname"
+      validation={Object {}}
+    >
+      <FormGroup
+        bsClass="form-group"
+        className="kubevirt-form-group"
+        id={null}
+      >
+        <div
+          className="kubevirt-form-group form-group"
+          id={null}
+        >
+          <Col
+            bsClass="col"
+            className="text-right"
+            componentClass="div"
+            sm={3}
+          >
+            <div
+              className="text-right col-sm-3"
+            >
+              <FormControlLabel
+                help="Address to be used for connection to a vCenter instance. The \\"https://\\" protocol will be added automatically. Example: \\"my.domain.com:1234\\"."
+                isRequired={false}
+                title="vCenter Hostname"
+              >
+                <ControlLabel
+                  bsClass="control-label"
+                  className={null}
+                  srOnly={false}
+                >
+                  <label
+                    className="control-label"
+                  >
+                    vCenter Hostname
+                  </label>
+                </ControlLabel>
+                <FieldLevelHelp
+                  buttonClass=""
+                  className="kubevirt-form-group__field-help"
+                  content="Address to be used for connection to a vCenter instance. The \\"https://\\" protocol will be added automatically. Example: \\"my.domain.com:1234\\"."
+                  placement="right"
+                  rootClose={true}
+                >
+                  <OverlayTrigger
+                    defaultOverlayShown={false}
+                    overlay={
+                      <Popover
+                        bsClass="popover"
+                        id="popover"
+                        placement="right"
+                      >
+                        Address to be used for connection to a vCenter instance. The "https://" protocol will be added automatically. Example: "my.domain.com:1234".
+                      </Popover>
+                    }
+                    placement="right"
+                    rootClose={true}
+                    trigger={
+                      Array [
+                        "click",
+                      ]
+                    }
+                  >
+                    <Button
+                      active={false}
+                      block={false}
+                      bsClass="btn"
+                      bsStyle="link"
+                      className="popover-pf-info"
+                      disabled={false}
+                      onClick={[Function]}
+                    >
+                      <button
+                        className="popover-pf-info btn btn-link"
+                        disabled={false}
+                        onClick={[Function]}
+                        type="button"
+                      >
+                        <Icon
+                          name="info"
+                          type="pf"
+                        >
+                          <PatternflyIcon
+                            className=""
+                            name="info"
+                          >
+                            <span
+                              aria-hidden="true"
+                              className="pficon pficon-info"
+                            />
+                          </PatternflyIcon>
+                        </Icon>
+                      </button>
+                    </Button>
+                  </OverlayTrigger>
+                </FieldLevelHelp>
+              </FormControlLabel>
+            </div>
+          </Col>
+          <Col
+            bsClass="col"
+            componentClass="div"
+            sm={5}
+          >
+            <div
+              className="col-sm-5"
+            >
+              <Text
+                disabled={false}
+                id="vcenter-hostname-dropdown"
+                onBlur={[Function]}
+                onChange={[Function]}
+                type="text"
+                value=""
+              >
+                <FormControl
+                  bsClass="form-control"
+                  componentClass="input"
+                  disabled={false}
+                  id="vcenter-hostname-dropdown"
+                  key="vcenter-hostname-dropdown"
+                  onBlur={[Function]}
+                  onChange={[Function]}
+                  type="text"
+                  value=""
+                >
+                  <input
+                    className="form-control"
+                    disabled={false}
+                    id="vcenter-hostname-dropdown"
+                    onBlur={[Function]}
+                    onChange={[Function]}
+                    type="text"
+                    value=""
+                  />
+                </FormControl>
+              </Text>
+            </div>
+          </Col>
+        </div>
+      </FormGroup>
+    </ValidationFormRow>
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help="User name to be used for connection to a vCenter instance."
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="vmwareUserName"
+    labelSize={3}
+    textPosition="text-right"
+    title="vCenter User Name"
+    validation={Object {}}
+  >
+    <ValidationFormRow
+      className={null}
+      controlSize={5}
+      help="User name to be used for connection to a vCenter instance."
+      id={null}
+      isHidden={false}
+      isRequired={false}
+      labelSize={3}
+      textPosition="text-right"
+      title="vCenter User Name"
+      validation={Object {}}
+    >
+      <FormGroup
+        bsClass="form-group"
+        className="kubevirt-form-group"
+        id={null}
+      >
+        <div
+          className="kubevirt-form-group form-group"
+          id={null}
+        >
+          <Col
+            bsClass="col"
+            className="text-right"
+            componentClass="div"
+            sm={3}
+          >
+            <div
+              className="text-right col-sm-3"
+            >
+              <FormControlLabel
+                help="User name to be used for connection to a vCenter instance."
+                isRequired={false}
+                title="vCenter User Name"
+              >
+                <ControlLabel
+                  bsClass="control-label"
+                  className={null}
+                  srOnly={false}
+                >
+                  <label
+                    className="control-label"
+                  >
+                    vCenter User Name
+                  </label>
+                </ControlLabel>
+                <FieldLevelHelp
+                  buttonClass=""
+                  className="kubevirt-form-group__field-help"
+                  content="User name to be used for connection to a vCenter instance."
+                  placement="right"
+                  rootClose={true}
+                >
+                  <OverlayTrigger
+                    defaultOverlayShown={false}
+                    overlay={
+                      <Popover
+                        bsClass="popover"
+                        id="popover"
+                        placement="right"
+                      >
+                        User name to be used for connection to a vCenter instance.
+                      </Popover>
+                    }
+                    placement="right"
+                    rootClose={true}
+                    trigger={
+                      Array [
+                        "click",
+                      ]
+                    }
+                  >
+                    <Button
+                      active={false}
+                      block={false}
+                      bsClass="btn"
+                      bsStyle="link"
+                      className="popover-pf-info"
+                      disabled={false}
+                      onClick={[Function]}
+                    >
+                      <button
+                        className="popover-pf-info btn btn-link"
+                        disabled={false}
+                        onClick={[Function]}
+                        type="button"
+                      >
+                        <Icon
+                          name="info"
+                          type="pf"
+                        >
+                          <PatternflyIcon
+                            className=""
+                            name="info"
+                          >
+                            <span
+                              aria-hidden="true"
+                              className="pficon pficon-info"
+                            />
+                          </PatternflyIcon>
+                        </Icon>
+                      </button>
+                    </Button>
+                  </OverlayTrigger>
+                </FieldLevelHelp>
+              </FormControlLabel>
+            </div>
+          </Col>
+          <Col
+            bsClass="col"
+            componentClass="div"
+            sm={5}
+          >
+            <div
+              className="col-sm-5"
+            >
+              <Text
+                disabled={false}
+                id="vcenter-username"
+                onBlur={[Function]}
+                onChange={[Function]}
+                type="text"
+                value=""
+              >
+                <FormControl
+                  bsClass="form-control"
+                  componentClass="input"
+                  disabled={false}
+                  id="vcenter-username"
+                  key="vcenter-username"
+                  onBlur={[Function]}
+                  onChange={[Function]}
+                  type="text"
+                  value=""
+                >
+                  <input
+                    className="form-control"
+                    disabled={false}
+                    id="vcenter-username"
+                    onBlur={[Function]}
+                    onChange={[Function]}
+                    type="text"
+                    value=""
+                  />
+                </FormControl>
+              </Text>
+            </div>
+          </Col>
+        </div>
+      </FormGroup>
+    </ValidationFormRow>
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help="User password to be used for connection to a vCenter instance."
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="vmwarePassword"
+    labelSize={3}
+    textPosition="text-right"
+    title="vCenter Password"
+    validation={Object {}}
+  >
+    <ValidationFormRow
+      className={null}
+      controlSize={5}
+      help="User password to be used for connection to a vCenter instance."
+      id={null}
+      isHidden={false}
+      isRequired={false}
+      labelSize={3}
+      textPosition="text-right"
+      title="vCenter Password"
+      validation={Object {}}
+    >
+      <FormGroup
+        bsClass="form-group"
+        className="kubevirt-form-group"
+        id={null}
+      >
+        <div
+          className="kubevirt-form-group form-group"
+          id={null}
+        >
+          <Col
+            bsClass="col"
+            className="text-right"
+            componentClass="div"
+            sm={3}
+          >
+            <div
+              className="text-right col-sm-3"
+            >
+              <FormControlLabel
+                help="User password to be used for connection to a vCenter instance."
+                isRequired={false}
+                title="vCenter Password"
+              >
+                <ControlLabel
+                  bsClass="control-label"
+                  className={null}
+                  srOnly={false}
+                >
+                  <label
+                    className="control-label"
+                  >
+                    vCenter Password
+                  </label>
+                </ControlLabel>
+                <FieldLevelHelp
+                  buttonClass=""
+                  className="kubevirt-form-group__field-help"
+                  content="User password to be used for connection to a vCenter instance."
+                  placement="right"
+                  rootClose={true}
+                >
+                  <OverlayTrigger
+                    defaultOverlayShown={false}
+                    overlay={
+                      <Popover
+                        bsClass="popover"
+                        id="popover"
+                        placement="right"
+                      >
+                        User password to be used for connection to a vCenter instance.
+                      </Popover>
+                    }
+                    placement="right"
+                    rootClose={true}
+                    trigger={
+                      Array [
+                        "click",
+                      ]
+                    }
+                  >
+                    <Button
+                      active={false}
+                      block={false}
+                      bsClass="btn"
+                      bsStyle="link"
+                      className="popover-pf-info"
+                      disabled={false}
+                      onClick={[Function]}
+                    >
+                      <button
+                        className="popover-pf-info btn btn-link"
+                        disabled={false}
+                        onClick={[Function]}
+                        type="button"
+                      >
+                        <Icon
+                          name="info"
+                          type="pf"
+                        >
+                          <PatternflyIcon
+                            className=""
+                            name="info"
+                          >
+                            <span
+                              aria-hidden="true"
+                              className="pficon pficon-info"
+                            />
+                          </PatternflyIcon>
+                        </Icon>
+                      </button>
+                    </Button>
+                  </OverlayTrigger>
+                </FieldLevelHelp>
+              </FormControlLabel>
+            </div>
+          </Col>
+          <Col
+            bsClass="col"
+            componentClass="div"
+            sm={5}
+          >
+            <div
+              className="col-sm-5"
+            >
+              <Text
+                disabled={false}
+                id="vcenter-password"
+                onBlur={[Function]}
+                onChange={[Function]}
+                type="password"
+                value=""
+              >
+                <FormControl
+                  bsClass="form-control"
+                  componentClass="input"
+                  disabled={false}
+                  id="vcenter-password"
+                  key="vcenter-password"
+                  onBlur={[Function]}
+                  onChange={[Function]}
+                  type="password"
+                  value=""
+                >
+                  <input
+                    className="form-control"
+                    disabled={false}
+                    id="vcenter-password"
+                    onBlur={[Function]}
+                    onChange={[Function]}
+                    type="password"
+                    value=""
+                  />
+                </FormControl>
+              </Text>
+            </div>
+          </Col>
+        </div>
+      </FormGroup>
+    </ValidationFormRow>
+  </FormRow>
+  <FormRow
+    className="kubevirt-create-vm-wizard__import-vmware-password"
+    controlSize={5}
+    help="If checked, new secret keeping connection details will be created for later use."
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="rememberVMwareCredentials"
+    labelSize={3}
+    textPosition="text-right"
+    title=""
+    validation={Object {}}
+  >
+    <ValidationFormRow
+      className="kubevirt-create-vm-wizard__import-vmware-password"
+      controlSize={5}
+      help="If checked, new secret keeping connection details will be created for later use."
+      id={null}
+      isHidden={false}
+      isRequired={false}
+      labelSize={3}
+      textPosition="text-right"
+      title=""
+      validation={Object {}}
+    >
+      <FormGroup
+        bsClass="form-group"
+        className="kubevirt-form-group kubevirt-create-vm-wizard__import-vmware-password"
+        id={null}
+      >
+        <div
+          className="kubevirt-form-group kubevirt-create-vm-wizard__import-vmware-password form-group"
+          id={null}
+        >
+          <Col
+            bsClass="col"
+            className="text-right"
+            componentClass="div"
+            sm={3}
+          >
+            <div
+              className="text-right col-sm-3"
+            >
+              <FormControlLabel
+                help="If checked, new secret keeping connection details will be created for later use."
+                isRequired={false}
+                title=""
+              >
+                <ControlLabel
+                  bsClass="control-label"
+                  className={null}
+                  srOnly={false}
+                >
+                  <label
+                    className="control-label"
+                  />
+                </ControlLabel>
+                <FieldLevelHelp
+                  buttonClass=""
+                  className="kubevirt-form-group__field-help"
+                  content="If checked, new secret keeping connection details will be created for later use."
+                  placement="right"
+                  rootClose={true}
+                >
+                  <OverlayTrigger
+                    defaultOverlayShown={false}
+                    overlay={
+                      <Popover
+                        bsClass="popover"
+                        id="popover"
+                        placement="right"
+                      >
+                        If checked, new secret keeping connection details will be created for later use.
+                      </Popover>
+                    }
+                    placement="right"
+                    rootClose={true}
+                    trigger={
+                      Array [
+                        "click",
+                      ]
+                    }
+                  >
+                    <Button
+                      active={false}
+                      block={false}
+                      bsClass="btn"
+                      bsStyle="link"
+                      className="popover-pf-info"
+                      disabled={false}
+                      onClick={[Function]}
+                    >
+                      <button
+                        className="popover-pf-info btn btn-link"
+                        disabled={false}
+                        onClick={[Function]}
+                        type="button"
+                      >
+                        <Icon
+                          name="info"
+                          type="pf"
+                        >
+                          <PatternflyIcon
+                            className=""
+                            name="info"
+                          >
+                            <span
+                              aria-hidden="true"
+                              className="pficon pficon-info"
+                            />
+                          </PatternflyIcon>
+                        </Icon>
+                      </button>
+                    </Button>
+                  </OverlayTrigger>
+                </FieldLevelHelp>
+              </FormControlLabel>
+            </div>
+          </Col>
+          <Col
+            bsClass="col"
+            componentClass="div"
+            sm={5}
+          >
+            <div
+              className="col-sm-5"
+            >
+              <Checkbox
+                checked={false}
+                disabled={false}
+                id="vcenter-remember-credentials"
+                onBlur={[Function]}
+                onChange={[Function]}
+                title="Remember vCenter credentials"
+              >
+                <Checkbox
+                  bsClass="checkbox"
+                  checked={false}
+                  disabled={false}
+                  id="vcenter-remember-credentials"
+                  inline={false}
+                  onBlur={[Function]}
+                  onChange={[Function]}
+                  title=""
+                >
+                  <div
+                    className="checkbox"
+                  >
+                    <label
+                      title=""
+                    >
+                      <input
+                        checked={false}
+                        disabled={false}
+                        id="vcenter-remember-credentials"
+                        onBlur={[Function]}
+                        onChange={[Function]}
+                        type="checkbox"
+                      />
+                      Remember vCenter credentials
+                    </label>
+                  </div>
+                </Checkbox>
+              </Checkbox>
+            </div>
+          </Col>
+        </div>
+      </FormGroup>
+    </ValidationFormRow>
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help=""
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    labelSize={3}
+    textPosition="text-right"
+    title=""
+    validation={Object {}}
+  >
+    <ValidationFormRow
+      className={null}
+      controlSize={5}
+      help=""
+      id={null}
+      isHidden={false}
+      isRequired={false}
+      labelSize={3}
+      textPosition="text-right"
+      title=""
+      validation={Object {}}
+    >
+      <FormGroup
+        bsClass="form-group"
+        className="kubevirt-form-group"
+        id={null}
+      >
+        <div
+          className="kubevirt-form-group form-group"
+          id={null}
+        >
+          <Col
+            bsClass="col"
+            className="text-right"
+            componentClass="div"
+            sm={3}
+          >
+            <div
+              className="text-right col-sm-3"
+            >
+              <FormControlLabel
+                help=""
+                isRequired={false}
+                title=""
+              >
+                <ControlLabel
+                  bsClass="control-label"
+                  className={null}
+                  srOnly={false}
+                >
+                  <label
+                    className="control-label"
+                  />
+                </ControlLabel>
+              </FormControlLabel>
+            </div>
+          </Col>
+          <Col
+            bsClass="col"
+            componentClass="div"
+            sm={5}
+          >
+            <div
+              className="col-sm-5"
+            >
+              <Button
+                active={false}
+                block={false}
+                bsClass="btn"
+                bsStyle="default"
+                className="kubevirt-create-vm-wizard__import-vmware-passwordcheck-button"
+                disabled={false}
+                id="vcenter-connect"
+                onClick={[Function]}
+              >
+                <button
+                  className="kubevirt-create-vm-wizard__import-vmware-passwordcheck-button btn btn-default"
+                  disabled={false}
+                  id="vcenter-connect"
+                  onClick={[Function]}
+                  type="button"
+                >
+                  Check
+                </button>
+              </Button>
+            </div>
+          </Col>
+        </div>
+      </FormGroup>
+    </ValidationFormRow>
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help=""
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    labelSize={3}
+    textPosition="text-right"
+    title=""
+    validation={Object {}}
+  >
+    <ValidationFormRow
+      className={null}
+      controlSize={5}
+      help=""
+      id={null}
+      isHidden={false}
+      isRequired={false}
+      labelSize={3}
+      textPosition="text-right"
+      title=""
+      validation={Object {}}
+    >
+      <FormGroup
+        bsClass="form-group"
+        className="kubevirt-form-group"
+        id={null}
+      >
+        <div
+          className="kubevirt-form-group form-group"
+          id={null}
+        >
+          <Col
+            bsClass="col"
+            className="text-right"
+            componentClass="div"
+            sm={3}
+          >
+            <div
+              className="text-right col-sm-3"
+            >
+              <FormControlLabel
+                help=""
+                isRequired={false}
+                title=""
+              >
+                <ControlLabel
+                  bsClass="control-label"
+                  className={null}
+                  srOnly={false}
+                >
+                  <label
+                    className="control-label"
+                  />
+                </ControlLabel>
+              </FormControlLabel>
+            </div>
+          </Col>
+          <Col
+            bsClass="col"
+            componentClass="div"
+            sm={5}
+          >
+            <div
+              className="col-sm-5"
+            >
+              <VMWareProviderStatus
+                status={null}
+              >
+                <ConnectionUnknown>
+                  <StatusField>
+                    <div
+                      className="kubevirt-create-vm-wizard__import-vmware-connection-status"
+                    >
+                      Status unknown
+                    </div>
+                  </StatusField>
+                </ConnectionUnknown>
+              </VMWareProviderStatus>
+            </div>
+          </Col>
+        </div>
+      </FormGroup>
+    </ValidationFormRow>
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help="Select a vCenter virtual machine to import. Loading of their list might take some time. The list will be enabled for selection once data are loaded."
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="vmwareVm"
+    labelSize={3}
+    textPosition="text-right"
+    title="VM to Import"
+    validation={Object {}}
+  >
+    <ValidationFormRow
+      className={null}
+      controlSize={5}
+      help="Select a vCenter virtual machine to import. Loading of their list might take some time. The list will be enabled for selection once data are loaded."
+      id={null}
+      isHidden={false}
+      isRequired={false}
+      labelSize={3}
+      textPosition="text-right"
+      title="VM to Import"
+      validation={Object {}}
+    >
+      <FormGroup
+        bsClass="form-group"
+        className="kubevirt-form-group"
+        id={null}
+      >
+        <div
+          className="kubevirt-form-group form-group"
+          id={null}
+        >
+          <Col
+            bsClass="col"
+            className="text-right"
+            componentClass="div"
+            sm={3}
+          >
+            <div
+              className="text-right col-sm-3"
+            >
+              <FormControlLabel
+                help="Select a vCenter virtual machine to import. Loading of their list might take some time. The list will be enabled for selection once data are loaded."
+                isRequired={false}
+                title="VM to Import"
+              >
+                <ControlLabel
+                  bsClass="control-label"
+                  className={null}
+                  srOnly={false}
+                >
+                  <label
+                    className="control-label"
+                  >
+                    VM to Import
+                  </label>
+                </ControlLabel>
+                <FieldLevelHelp
+                  buttonClass=""
+                  className="kubevirt-form-group__field-help"
+                  content="Select a vCenter virtual machine to import. Loading of their list might take some time. The list will be enabled for selection once data are loaded."
+                  placement="right"
+                  rootClose={true}
+                >
+                  <OverlayTrigger
+                    defaultOverlayShown={false}
+                    overlay={
+                      <Popover
+                        bsClass="popover"
+                        id="popover"
+                        placement="right"
+                      >
+                        Select a vCenter virtual machine to import. Loading of their list might take some time. The list will be enabled for selection once data are loaded.
+                      </Popover>
+                    }
+                    placement="right"
+                    rootClose={true}
+                    trigger={
+                      Array [
+                        "click",
+                      ]
+                    }
+                  >
+                    <Button
+                      active={false}
+                      block={false}
+                      bsClass="btn"
+                      bsStyle="link"
+                      className="popover-pf-info"
+                      disabled={false}
+                      onClick={[Function]}
+                    >
+                      <button
+                        className="popover-pf-info btn btn-link"
+                        disabled={false}
+                        onClick={[Function]}
+                        type="button"
+                      >
+                        <Icon
+                          name="info"
+                          type="pf"
+                        >
+                          <PatternflyIcon
+                            className=""
+                            name="info"
+                          >
+                            <span
+                              aria-hidden="true"
+                              className="pficon pficon-info"
+                            />
+                          </PatternflyIcon>
+                        </Icon>
+                      </button>
+                    </Button>
+                  </OverlayTrigger>
+                </FieldLevelHelp>
+              </FormControlLabel>
+            </div>
+          </Col>
+          <Col
+            bsClass="col"
+            componentClass="div"
+            sm={5}
+          >
+            <div
+              className="col-sm-5"
+            >
+              <Dropdown
+                choices={Array []}
+                disabled={false}
+                id="vcenter-vm-dropdown"
+                onChange={[Function]}
+                value="--- Select VM ---"
+                withTooltips={false}
+              >
+                <ButtonGroup
+                  block={false}
+                  bsClass="btn-group"
+                  justified={true}
+                  key="vcenter-vm-dropdown"
+                  vertical={false}
+                >
+                  <div
+                    className="btn-group btn-group-justified"
+                  >
+                    <DropdownButton
+                      bsStyle="default"
+                      className="kubevirt-dropdown"
+                      disabled={false}
+                      id="vcenter-vm-dropdown"
+                      onSelect={[Function]}
+                      title="--- Select VM ---"
+                    >
+                      <DropdownButton
+                        bsStyle="default"
+                        className="kubevirt-dropdown"
+                        disabled={false}
+                        id="vcenter-vm-dropdown"
+                        onSelect={[Function]}
+                        title="--- Select VM ---"
+                      >
+                        <Uncontrolled(Dropdown)
+                          bsStyle="default"
+                          disabled={false}
+                          id="vcenter-vm-dropdown"
+                          onSelect={[Function]}
+                        >
+                          <Dropdown
+                            bsClass="dropdown"
+                            bsStyle="default"
+                            componentClass={[Function]}
+                            disabled={false}
+                            id="vcenter-vm-dropdown"
+                            onSelect={[Function]}
+                            onToggle={[Function]}
+                          >
+                            <ButtonGroup
+                              block={false}
+                              bsClass="btn-group"
+                              bsStyle="default"
+                              className="dropdown"
+                              justified={false}
+                              vertical={false}
+                            >
+                              <div
+                                className="dropdown btn-group btn-group-default"
+                              >
+                                <DropdownToggle
+                                  bsClass="dropdown-toggle"
+                                  bsRole="toggle"
+                                  bsStyle="default"
+                                  className="kubevirt-dropdown"
+                                  disabled={false}
+                                  id="vcenter-vm-dropdown"
+                                  key=".0"
+                                  onClick={[Function]}
+                                  onKeyDown={[Function]}
+                                  open={false}
+                                  useAnchor={false}
+                                >
+                                  <Button
+                                    active={false}
+                                    aria-expanded={false}
+                                    aria-haspopup={true}
+                                    block={false}
+                                    bsClass="btn"
+                                    bsStyle="default"
+                                    className="kubevirt-dropdown dropdown-toggle"
+                                    disabled={false}
+                                    id="vcenter-vm-dropdown"
+                                    onClick={[Function]}
+                                    onKeyDown={[Function]}
+                                    role="button"
+                                  >
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
+                                      className="kubevirt-dropdown dropdown-toggle btn btn-default"
+                                      disabled={false}
+                                      id="vcenter-vm-dropdown"
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      role="button"
+                                      type="button"
+                                    >
+                                      --- Select VM ---
+                                       
+                                      <span
+                                        className="caret"
+                                      />
+                                    </button>
+                                  </Button>
+                                </DropdownToggle>
+                                <DropdownMenu
+                                  bsClass="dropdown-menu"
+                                  bsRole="menu"
+                                  key=".1"
+                                  labelledBy="vcenter-vm-dropdown"
+                                  onClose={[Function]}
+                                  onSelect={[Function]}
+                                  pullRight={false}
+                                >
+                                  <RootCloseWrapper
+                                    disabled={true}
+                                    event="click"
+                                    onRootClose={[Function]}
+                                  >
+                                    <ul
+                                      aria-labelledby="vcenter-vm-dropdown"
+                                      className="dropdown-menu"
+                                      role="menu"
+                                    />
+                                  </RootCloseWrapper>
+                                </DropdownMenu>
+                              </div>
+                            </ButtonGroup>
+                          </Dropdown>
+                        </Uncontrolled(Dropdown)>
+                      </DropdownButton>
+                    </DropdownButton>
+                  </div>
+                </ButtonGroup>
+              </Dropdown>
+            </div>
+          </Col>
+        </div>
+      </FormGroup>
+    </ValidationFormRow>
+  </FormRow>
+</VMWareImportProvider>
+`;
diff --git a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/__snapshots__/VMWareProviderStatus.test.js.snap b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/__snapshots__/VMWareProviderStatus.test.js.snap
new file mode 100644
index 000000000..b829bf285
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/__snapshots__/VMWareProviderStatus.test.js.snap
@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<VMWareProviderStatus /> renders correctly 1`] = `
+<VMWareProviderStatus
+  status={null}
+>
+  <ConnectionUnknown>
+    <StatusField>
+      <div
+        className="kubevirt-create-vm-wizard__import-vmware-connection-status"
+      >
+        Status unknown
+      </div>
+    </StatusField>
+  </ConnectionUnknown>
+</VMWareProviderStatus>
+`;
diff --git a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/utils.js b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/utils.js
new file mode 100644
index 000000000..a3dc3830c
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/utils.js
@@ -0,0 +1,34 @@
+// Do clean-up
+import { settingsValue } from '../../../../../k8s/selectors';
+import { NAMESPACE_KEY } from '../../constants';
+import { getVmwareField } from './selectors';
+import { PROVIDER_VMWARE_V2V_NAME_KEY } from './constants';
+import { V2VVMwareModel } from '../../../../../models';
+
+export const cleanupVmWareProvider = async (vmSettings, callerContext) => {
+  const v2vvmwareName = getVmwareField(vmSettings, PROVIDER_VMWARE_V2V_NAME_KEY);
+  if (v2vvmwareName) {
+    // This is a friendly help to keep things clean.
+    // If missed here (e.g. when the browser window is closed), the kubevirt-vmware controller's garbage
+    // collector will do following automatically after a delay.
+    const resource = {
+      metadata: {
+        name: v2vvmwareName,
+        // TODO: potential issue if the user changed the namespace after creation of the v2vvmware object
+        // to fix: either store the namespace along the v2vvmwareName or empty v2vvmwareName on namespace change
+        namespace: settingsValue(vmSettings, NAMESPACE_KEY),
+      },
+    };
+    try {
+      await callerContext.k8sKill(V2VVMwareModel, resource);
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.log(
+        'Failed to remove temporary V2VVMWare object. It is not an issue, it will be garbage collected later if still present, resource: ',
+        resource,
+        ', error: ',
+        error
+      );
+    }
+  }
+};
diff --git a/src/components/Wizard/CreateVmWizard/providers/fixtures/VCenterInstances.fixture.js b/src/components/Wizard/CreateVmWizard/providers/fixtures/VCenterInstances.fixture.js
deleted file mode 100644
index 00323299c..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/fixtures/VCenterInstances.fixture.js
+++ /dev/null
@@ -1 +0,0 @@
-// no content
diff --git a/src/components/Wizard/CreateVmWizard/providers/fixtures/VCenterVms.fixture.js b/src/components/Wizard/CreateVmWizard/providers/fixtures/VCenterVms.fixture.js
deleted file mode 100644
index 00323299c..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/fixtures/VCenterVms.fixture.js
+++ /dev/null
@@ -1 +0,0 @@
-// no content
diff --git a/src/components/Wizard/CreateVmWizard/providers/fixtures/VCenterVmsWithPrefill.fixture.js b/src/components/Wizard/CreateVmWizard/providers/fixtures/VCenterVmsWithPrefill.fixture.js
deleted file mode 100644
index 00323299c..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/fixtures/VCenterVmsWithPrefill.fixture.js
+++ /dev/null
@@ -1 +0,0 @@
-// no content
diff --git a/src/components/Wizard/CreateVmWizard/providers/fixtures/VMWarePasswordAndCheck.fixture.js b/src/components/Wizard/CreateVmWizard/providers/fixtures/VMWarePasswordAndCheck.fixture.js
deleted file mode 100644
index e67bcaa03..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/fixtures/VMWarePasswordAndCheck.fixture.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import VMWarePasswordAndCheck from '../VMWarePasswordAndCheck';
-
-export default {
-  component: VMWarePasswordAndCheck,
-  props: {
-    onChange: () => {},
-    id: 'my-id',
-    value: {},
-    extraProps: {},
-  },
-};
diff --git a/src/components/Wizard/CreateVmWizard/providers/fixtures/VMWareProviderStatus.fixture.js b/src/components/Wizard/CreateVmWizard/providers/fixtures/VMWareProviderStatus.fixture.js
deleted file mode 100644
index 00323299c..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/fixtures/VMWareProviderStatus.fixture.js
+++ /dev/null
@@ -1 +0,0 @@
-// no content
diff --git a/src/components/Wizard/CreateVmWizard/providers/index.js b/src/components/Wizard/CreateVmWizard/providers/index.js
index 5b8880f76..5d4b81bd1 100644
--- a/src/components/Wizard/CreateVmWizard/providers/index.js
+++ b/src/components/Wizard/CreateVmWizard/providers/index.js
@@ -1,59 +1,61 @@
-import { get } from 'lodash';
+import { PROVIDER_VMWARE } from './VMwareImportProvider/constants';
 
-import { Alert } from 'patternfly-react';
+import { HELP_PROVIDER_VMWARE } from '../strings';
+import { getVmWareInitialState } from '../initialState/providers/vmWareInitialState';
+import { getVmwareProviderStateUpdate } from '../stateUpdate/providers/vmWareStateUpdate';
+import { validateVmwareProvider, isVmwareProviderValid } from '../validations/providers/vmWareValidation';
+import { cleanupVmWareProvider } from './VMwareImportProvider/utils';
 
-import React from 'react';
+const providers = [PROVIDER_VMWARE];
 
-import { NAMESPACE_KEY, PROVIDER_KEY, PROVIDER_VMWARE, PROVIDER_VMWARE_NAMESPACE_ALERT_KEY } from '../constants';
-import { isImageSourceType, settingsValue } from '../../../../k8s/selectors';
-import { PROVISION_SOURCE_IMPORT } from '../../../../constants';
+const helpResolver = {
+  [PROVIDER_VMWARE]: HELP_PROVIDER_VMWARE,
+};
 
-import { getVMWareSection } from './vmware';
-import { startV2VVMWareController } from './v2vvmwareController';
-import { HELP_PROVIDER_VMWARE } from '../strings';
+const initialStateFunctionResolver = {
+  [PROVIDER_VMWARE]: getVmWareInitialState,
+};
+
+const stateUpdateFunctionResolver = {
+  [PROVIDER_VMWARE]: getVmwareProviderStateUpdate,
+};
 
-import { CUSTOM } from '../../../Form';
+const validateProviderFunctionResolver = {
+  [PROVIDER_VMWARE]: validateVmwareProvider,
+};
 
-const providerList = [PROVIDER_VMWARE];
+const isProviderValidFunctionResolver = {
+  [PROVIDER_VMWARE]: isVmwareProviderValid,
+};
 
-const getProviderHelp = basicSettings => {
-  const provider = settingsValue(basicSettings, PROVIDER_KEY);
-  switch (provider) {
-    case PROVIDER_VMWARE:
-      return HELP_PROVIDER_VMWARE;
-    default:
-      return null;
-  }
+const providerCleanupFunctionResolver = {
+  [PROVIDER_VMWARE]: cleanupVmWareProvider,
 };
 
-export const importProviders = (basicSettings, operatingSystems, WithResources, k8sCreate, k8sGet, k8sPatch) => ({
-  [PROVIDER_VMWARE_NAMESPACE_ALERT_KEY]: {
-    id: 'vcenter-namespace-alert',
-    type: CUSTOM,
-    title: ' ',
-    CustomComponent: () => <Alert type="warning">Please select a namespace.</Alert>,
-    isVisible: basicVmSettings =>
-      isImageSourceType(basicVmSettings, PROVISION_SOURCE_IMPORT) && !settingsValue(basicSettings, NAMESPACE_KEY),
-  },
-  [PROVIDER_KEY]: {
-    id: 'provider-dropdown',
-    title: 'Provider',
-    type: 'dropdown',
-    defaultValue: '--- Select Provider ---',
-    choices: providerList,
-    required: true,
-    onChange: (...opts) => onProviderChanged(k8sCreate, k8sGet, ...opts),
-    isVisible: basicVmSettings =>
-      settingsValue(basicSettings, NAMESPACE_KEY) && isImageSourceType(basicVmSettings, PROVISION_SOURCE_IMPORT),
-    help: getProviderHelp(basicSettings),
-  },
-  ...getVMWareSection(basicSettings, operatingSystems, WithResources, k8sCreate, k8sGet, k8sPatch),
-});
-
-const onProviderChanged = (k8sCreate, k8sGet, valueValidationPair, key, formValid, prevBasicSettings) => {
-  startV2VVMWareController({
-    k8sCreate,
-    k8sGet,
-    namespace: get(prevBasicSettings[NAMESPACE_KEY], 'value'),
-  });
+export const getProviders = () => providers;
+
+export const getProviderInitialState = (provider, ...args) => {
+  const resolver = initialStateFunctionResolver[provider];
+  return resolver && resolver(...args);
+};
+
+export const getProviderHelp = provider => helpResolver[provider];
+
+export const getProviderStateUpdater = provider => stateUpdateFunctionResolver[provider];
+
+export const validateProvider = (provider, ...args) => {
+  const resolver = validateProviderFunctionResolver[provider];
+  return resolver && resolver(...args);
+};
+
+export const isProviderValid = (provider, ...args) => {
+  const resolver = isProviderValidFunctionResolver[provider];
+  return resolver ? resolver(...args) : true;
+};
+
+export const cleanupProvider = (provider, ...args) => {
+  const cleanup = providerCleanupFunctionResolver[provider];
+  if (cleanup) {
+    cleanup(...args);
+  }
 };
diff --git a/src/components/Wizard/CreateVmWizard/providers/tests/VCenterInstances.test.js b/src/components/Wizard/CreateVmWizard/providers/tests/VCenterInstances.test.js
deleted file mode 100644
index 7554bf94f..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/tests/VCenterInstances.test.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import { mount } from 'enzyme/build';
-
-import { WithResources } from '../../../../../tests/k8s';
-import VCenterInstances from '../VCenterInstances';
-import { basicSettingsImportVmwareNewConnection } from '../../../../../tests/forms_mocks/basicSettings.mock';
-
-const extraProps = {
-  WithResources,
-  basicSettings: basicSettingsImportVmwareNewConnection,
-};
-
-describe('<VCenterInstancesConnected /> for list of vCenter secrets', () => {
-  it('renders correctly', () => {
-    const onChange = jest.fn();
-    const component = mount(
-      <VCenterInstances onChange={onChange} id="test-dropdown-id" value="test-instance-1" extraProps={extraProps} />
-    );
-    expect(component).toMatchSnapshot();
-  });
-});
diff --git a/src/components/Wizard/CreateVmWizard/providers/tests/VCenterVms.test.js b/src/components/Wizard/CreateVmWizard/providers/tests/VCenterVms.test.js
deleted file mode 100644
index bf97631cc..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/tests/VCenterVms.test.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import { render } from 'enzyme/build';
-
-import { k8sGet, WithResources } from '../../../../../tests/k8s';
-import VCenterVms from '../VCenterVms';
-import { basicSettingsImportVmwareNewConnection } from '../../../../../tests/forms_mocks/basicSettings.mock';
-import { getOperatingSystems } from '../../../../..';
-import { baseTemplates } from '../../../../../k8s/objects/template';
-
-const extraProps = {
-  WithResources,
-  basicSettings: basicSettingsImportVmwareNewConnection,
-  k8sGet,
-  operatingSystems: getOperatingSystems(basicSettingsImportVmwareNewConnection, baseTemplates),
-};
-
-describe('<VCenterVms /> for list of vCenter secrets', () => {
-  it('renders correctly', () => {
-    const onChange = jest.fn();
-    const onFormChange = jest.fn();
-    const component = render(
-      <VCenterVms
-        onChange={onChange}
-        onFormChange={onFormChange}
-        id="test-dropdown-id"
-        value="test-vm1"
-        extraProps={extraProps}
-      />
-    );
-    expect(component).toMatchSnapshot();
-  });
-});
diff --git a/src/components/Wizard/CreateVmWizard/providers/tests/VCenterVmsWithPrefill.test.js b/src/components/Wizard/CreateVmWizard/providers/tests/VCenterVmsWithPrefill.test.js
deleted file mode 100644
index 87328cd09..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/tests/VCenterVmsWithPrefill.test.js
+++ /dev/null
@@ -1,308 +0,0 @@
-import React from 'react';
-import { mount, shallow } from 'enzyme/build';
-import { cloneDeep } from 'lodash';
-
-import { basicSettingsImportVmwareNewConnection } from '../../../../../tests/forms_mocks/basicSettings.mock';
-import { k8sGet } from '../../../../../tests/k8s';
-import { flushPromises } from '../../../../../tests/enzyme';
-
-import VCenterVmsWithPrefill, { prefillDisks, prefillNics, prefillOperatingSystem } from '../VCenterVmsWithPrefill';
-import {
-  BATCH_CHANGES_KEY,
-  PROVIDER_VMWARE_VM_KEY,
-  NAME_KEY,
-  DESCRIPTION_KEY,
-  OPERATING_SYSTEM_KEY,
-  INTERMEDIARY_NETWORKS_TAB_KEY,
-  FLAVOR_KEY,
-  MEMORY_KEY,
-  CPU_KEY,
-  INTERMEDIARY_STORAGE_TAB_KEY,
-  PROVIDER_VMWARE_VM_DATA_KEY,
-} from '../../constants';
-import { getOperatingSystems } from '../../../../../k8s/selectors';
-import { baseTemplates } from '../../../../../k8s/objects/template';
-import { CUSTOM_FLAVOR, VALIDATION_INFO_TYPE } from '../../../../../constants';
-import { osV2VConfigMap } from '../../../../../tests/mocks/configMap';
-
-const props = {
-  id: 'my-id',
-  value: 'vm-name',
-  choices: ['one-vm', 'vm-name'],
-  basicSettings: basicSettingsImportVmwareNewConnection,
-  k8sGet,
-  operatingSystems: getOperatingSystems(basicSettingsImportVmwareNewConnection, baseTemplates),
-};
-props.basicSettings[PROVIDER_VMWARE_VM_KEY] = {
-  value: 'vm-name',
-};
-
-const vmwareVm = {
-  Config: {
-    Name: 'vm-name',
-    Annotation: 'My description',
-    GuestId: 'win2k8',
-    GuestFullName: 'Windows Name',
-    Hardware: {
-      NumCPU: 2,
-      MemoryMB: 128,
-      Device: [
-        {
-          Key: 600,
-          DeviceInfo: {
-            Label: 'Keyboard ',
-            Summary: 'Keyboard',
-          },
-          Backing: null,
-          Connectable: null,
-          SlotInfo: null,
-        },
-        {
-          Key: 4000,
-          DeviceInfo: {
-            Label: 'nic0',
-            Summary: 'description of nic0',
-          },
-          Backing: {},
-          Connectable: {},
-          SlotInfo: {},
-          AddressType: 'assigned',
-          MacAddress: '00:50:56:a5:ff:de',
-          WakeOnLanEnabled: true,
-          ExternalId: '',
-        },
-        {
-          Key: 4001,
-          DeviceInfo: {
-            Label: 'nic1',
-            Summary: 'description of nic1',
-          },
-          MacAddress: '00:50:56:a5:ff:de',
-        },
-        {
-          Key: 2000,
-          DeviceInfo: {
-            Label: 'disk0',
-            Summary: 'description of disk0',
-          },
-          Backing: {
-            FileName: '[datastore12] ftp-01/ftp-01.vmdk',
-            Datastore: {
-              Type: 'Datastore',
-              Value: 'datastore-45',
-            },
-            BackingObjectId: '',
-            DiskMode: 'persistent',
-            Split: false,
-            WriteThrough: false,
-            ThinProvisioned: true,
-            EagerlyScrub: null,
-            Uuid: '6000C297-5043-93c2-12ca-f44ae8af4881',
-            ContentId: 'ee1918ce88582c53457b0c75fffffffe',
-            ChangeId: '',
-            Parent: null,
-            DeltaDiskFormat: '',
-            DigestEnabled: false,
-            DeltaGrainSize: 0,
-            DeltaDiskFormatVariant: '',
-            Sharing: 'sharingNone',
-            KeyId: null,
-          },
-          Connectable: null,
-          SlotInfo: null,
-          ControllerKey: 1000,
-          UnitNumber: 0,
-          CapacityInKB: 1,
-          CapacityInBytes: 1024 * 1024 * 1024,
-          Shares: {
-            Shares: 1000,
-            Level: 'normal',
-          },
-          StorageIOAllocation: {
-            Limit: -1,
-            Shares: {
-              Shares: 1000,
-              Level: 'normal',
-            },
-            Reservation: 0,
-          },
-          DiskObjectId: '61-2000',
-          VFlashCacheConfigInfo: null,
-          Iofilter: null,
-          VDiskId: null,
-          NativeUnmanagedLinkedClone: null,
-        },
-        {
-          Key: 2001,
-          DeviceInfo: {
-            Label: 'disk1',
-            Summary: 'description of disk1',
-          },
-          Backing: {
-            FileName: 'filename1',
-          },
-          CapacityInBytes: 2 * 1024 * 1024 * 1024,
-        },
-      ],
-    },
-  },
-};
-
-const v2vvmware = {
-  spec: {
-    thumbprint: '39:5C:6A:2D:36:38:B2:52:2B:21:EA:74:11:59:89:5E:20:D5:D9:A2',
-    vms: [
-      {
-        name: 'one-vm',
-      },
-      {
-        name: 'unknown-vm',
-      },
-      {
-        name: 'vm-name',
-        detail: {
-          hostPath: '/test/path/to/vm',
-          raw: JSON.stringify(vmwareVm),
-        },
-      },
-    ],
-  },
-};
-
-describe('<VCenterVmsWithPrefill />', () => {
-  it('renders correctly', () => {
-    const onChange = jest.fn();
-    const onFormChange = jest.fn();
-    const wrapper = shallow(<VCenterVmsWithPrefill {...props} onChange={onChange} onFormChange={onFormChange} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it('does prefill', async () => {
-    const failedRhel7 = {
-      value: { id: 'rhel7.0', name: 'Red Hat Enterprise Linux 7.0' },
-      target: OPERATING_SYSTEM_KEY,
-      validation: { message: 'Select matching for: Windows Name', type: VALIDATION_INFO_TYPE },
-    };
-
-    const onChange = jest.fn();
-    const onFormChange = jest.fn();
-    const wrapper = mount(<VCenterVmsWithPrefill {...props} onChange={onChange} onFormChange={onFormChange} />);
-    expect(wrapper).toMatchSnapshot();
-    expect(onChange.mock.calls).toHaveLength(0);
-    expect(onFormChange.mock.calls).toHaveLength(0);
-
-    wrapper.setProps({ v2vvmware }); // force componentDidUpdate containing async processing
-    await flushPromises();
-    expect(onChange.mock.calls).toHaveLength(0);
-    expect(onFormChange.mock.calls).toHaveLength(1);
-    const firstResolvedValue = onFormChange.mock.calls[0][0].value;
-    expect(firstResolvedValue).toHaveLength(8);
-    expect(onFormChange.mock.calls[0][1]).toBe(BATCH_CHANGES_KEY);
-    [
-      { value: 'My description', target: DESCRIPTION_KEY },
-      failedRhel7,
-      {
-        value: { hostPath: v2vvmware.spec.vms[2].detail.hostPath, thumbPrint: v2vvmware.spec.thumbprint },
-        target: PROVIDER_VMWARE_VM_DATA_KEY,
-      },
-      { value: CUSTOM_FLAVOR, target: FLAVOR_KEY },
-      { value: 0.125, target: MEMORY_KEY },
-      { value: 2, target: CPU_KEY },
-      {
-        value: [
-          { id: 4000, mac: '00:50:56:a5:ff:de', name: 'nic0' },
-          { id: 4001, mac: '00:50:56:a5:ff:de', name: 'nic1' },
-        ],
-        target: INTERMEDIARY_NETWORKS_TAB_KEY,
-      },
-    ].forEach((expectedValue, idx) => expect(firstResolvedValue[idx]).toEqual(expectedValue));
-
-    expect(firstResolvedValue[7]).toMatchSnapshot(); // disks
-
-    const newBasicSettings = cloneDeep(props.basicSettings);
-    newBasicSettings[NAME_KEY] = '';
-    wrapper.setProps({ basicSettings: newBasicSettings });
-    await flushPromises();
-    expect(onFormChange.mock.calls).toHaveLength(2);
-    expect(onFormChange.mock.calls[1][1]).toBe(BATCH_CHANGES_KEY);
-    expect(onFormChange.mock.calls[1][0].value[0]).toEqual({ value: 'vm-name', target: NAME_KEY }); // description is skipped as it is equal with former run
-  });
-
-  it('handles prefillOperatingSystem() with already preselected value by user', async () => {
-    const result = await prefillOperatingSystem({
-      basicSettings: basicSettingsImportVmwareNewConnection,
-      operatingSystems: getOperatingSystems(basicSettingsImportVmwareNewConnection, baseTemplates),
-      vmVmware: vmwareVm,
-      vmwareToKubevirtOsConfigMap: osV2VConfigMap,
-      lastPrefilledValue: '',
-    });
-    expect(result).toEqual({
-      target: 'operatingSystem',
-      validation: { message: 'Select matching for: Windows Name', type: 'info' },
-      value: { id: 'rhel7.0', name: 'Red Hat Enterprise Linux 7.0' },
-    });
-  });
-
-  it('handles successful prefillOperatingSystem()', async () => {
-    const fedora = cloneDeep(vmwareVm);
-    fedora.Config.GuestId = 'fedora28_guest';
-    fedora.Config.GuestFullName = 'Fedora OS Name';
-
-    const basicSettings = cloneDeep(basicSettingsImportVmwareNewConnection);
-    delete basicSettings[OPERATING_SYSTEM_KEY];
-
-    const result = await prefillOperatingSystem({
-      basicSettings,
-      operatingSystems: getOperatingSystems(basicSettingsImportVmwareNewConnection, baseTemplates),
-      vmVmware: fedora,
-      vmwareToKubevirtOsConfigMap: osV2VConfigMap,
-      lastPrefilledValue: '',
-    });
-    expect(result).toEqual({
-      target: 'operatingSystem',
-      value: { id: 'fedora28', name: 'Fedora 28' },
-    });
-  });
-
-  it('handles failing prefillOperatingSystem()', async () => {
-    const fedora = cloneDeep(vmwareVm);
-    fedora.Config.GuestId = 'unknown_id';
-    fedora.Config.GuestFullName = 'A random OS';
-
-    const basicSettings = cloneDeep(basicSettingsImportVmwareNewConnection);
-    delete basicSettings[OPERATING_SYSTEM_KEY];
-
-    const result = await prefillOperatingSystem({
-      basicSettings,
-      operatingSystems: getOperatingSystems(basicSettingsImportVmwareNewConnection, baseTemplates),
-      vmVmware: fedora,
-      vmwareToKubevirtOsConfigMap: osV2VConfigMap,
-      lastPrefilledValue: '',
-    });
-    expect(result).toEqual({
-      target: 'operatingSystem',
-      validation: { message: 'Select matching for: A random OS', type: 'info' },
-      value: undefined,
-    });
-  });
-
-  it('handlers prefillNics()', () => {
-    const result = prefillNics({ vmVmware: vmwareVm, lastPrefilledValue: undefined });
-    expect(result.target).toBe(INTERMEDIARY_NETWORKS_TAB_KEY);
-    expect(result.value).toHaveLength(2);
-    expect(result.value[0].id).toBe(4000);
-    expect(result.value[1].id).toBe(4001);
-    expect(result.value[0].name).toBe('nic0');
-    expect(result.value[1].name).toBe('nic1');
-  });
-
-  it('handlers prefillDisks()', () => {
-    const result = prefillDisks({ vmVmware: vmwareVm, lastPrefilledValue: undefined });
-    expect(result.target).toBe(INTERMEDIARY_STORAGE_TAB_KEY);
-    expect(result.value).toHaveLength(4);
-    ['disk0', 'disk1', 'v2v-conversion-temp', 'vddk-pvc'].forEach((name, idx) => {
-      expect(result.value[idx].id).toBe(idx);
-      expect(result.value[idx].name).toBe(name);
-    });
-  });
-});
diff --git a/src/components/Wizard/CreateVmWizard/providers/tests/VMWarePasswordAndCheck.test.js b/src/components/Wizard/CreateVmWizard/providers/tests/VMWarePasswordAndCheck.test.js
deleted file mode 100644
index d8fbdd490..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/tests/VMWarePasswordAndCheck.test.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import React from 'react';
-import { mount, render } from 'enzyme';
-
-import { WithResources } from '../../../../../tests/k8s';
-import VMWarePasswordAndCheck from '../VMWarePasswordAndCheck';
-import fixture from '../fixtures/VMWarePasswordAndCheck.fixture';
-import {
-  PROVIDER_STATUS_SUCCESS,
-  PROVIDER_VMWARE_CONNECTION,
-  PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY,
-} from '../../constants';
-import { basicSettingsImportVmwareNewConnection } from '../../../../../tests/forms_mocks/basicSettings.mock';
-
-export const rendersProviderStatus = (providerStatus, phase) => {
-  const onChange = jest.fn();
-  const { value } = basicSettingsImportVmwareNewConnection[PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY];
-  value[PROVIDER_VMWARE_CONNECTION].providerStatus = providerStatus;
-
-  const extraProps = {
-    onCheckConnection: () => {},
-    WithResources: props => <WithResources {...props} tesOnlyPhase={phase} />,
-    basicSettings: basicSettingsImportVmwareNewConnection,
-  };
-
-  const component = render(
-    <VMWarePasswordAndCheck onChange={onChange} id="my-id" value={value} extraProps={extraProps} />
-  );
-  expect(component).toMatchSnapshot();
-};
-
-describe('<VMWarePasswordAndCheck />', () => {
-  it('renders correctly', () => {
-    const component = mount(<VMWarePasswordAndCheck {...fixture.props} />);
-    expect(component).toMatchSnapshot();
-  });
-  it('renders PROVIDER_STATUS_SUCCESS', () => {
-    rendersProviderStatus(PROVIDER_STATUS_SUCCESS);
-  });
-  it('renders Connecting based on status.phase', () => {
-    rendersProviderStatus('', 'Connecting');
-  });
-});
diff --git a/src/components/Wizard/CreateVmWizard/providers/tests/VMWareProviderStatus.test.js b/src/components/Wizard/CreateVmWizard/providers/tests/VMWareProviderStatus.test.js
deleted file mode 100644
index 9cc1c4dd3..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/tests/VMWareProviderStatus.test.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import { render } from 'enzyme/build';
-
-import React from 'react';
-
-import {
-  PROVIDER_STATUS_CONNECTING,
-  PROVIDER_STATUS_CONNECTION_FAILED,
-  PROVIDER_STATUS_SUCCESS,
-  PROVIDER_VMWARE_CONNECTION,
-  PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY,
-} from '../../constants';
-import VMWareProviderStatus from '../VMWareProviderStatus';
-import { basicSettingsImportVmwareNewConnection } from '../../../../../tests/forms_mocks/basicSettings.mock';
-import { WithResources } from '../../../../../tests/k8s';
-
-export const rendersProviderStatus = (providerStatus, phase, removeV2VVmwareName) => {
-  const onChange = jest.fn();
-
-  const connValue = {
-    providerStatus,
-    V2VVmwareName: removeV2VVmwareName ? undefined : 'v2vvmware-object-name',
-  };
-
-  const pwdAndCheck = basicSettingsImportVmwareNewConnection[PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY].value;
-  const basicSettings = {
-    ...basicSettingsImportVmwareNewConnection,
-    [PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY]: {
-      value: {
-        ...pwdAndCheck,
-        [PROVIDER_VMWARE_CONNECTION]: connValue,
-      },
-    },
-  };
-
-  const extraProps = {
-    onCheckConnection: () => {},
-    WithResources: props => <WithResources {...props} tesOnlyPhase={phase} />,
-    basicSettings,
-  };
-
-  const component = render(
-    <VMWareProviderStatus onChange={onChange} id="my-id" connValue={connValue} extraProps={extraProps} />
-  );
-  expect(component).toMatchSnapshot();
-};
-
-describe('<VMWareProviderStatus />', () => {
-  it('renders PROVIDER_STATUS_SUCCESS', () => {
-    rendersProviderStatus(PROVIDER_STATUS_SUCCESS);
-  });
-  it('renders PROVIDER_STATUS_CONNECTION_FAILED', () => {
-    rendersProviderStatus(PROVIDER_STATUS_CONNECTION_FAILED);
-  });
-  it('renders PROVIDER_STATUS_CONNECTING', () => {
-    rendersProviderStatus(PROVIDER_STATUS_CONNECTING);
-  });
-
-  it('renders Connecting based on status.phase', () => {
-    rendersProviderStatus('', 'Connecting');
-  });
-  it('renders ConnectionVerified based on status.phase', () => {
-    rendersProviderStatus('', 'ConnectionVerified');
-  });
-  it('renders Failed based on status.phase', () => {
-    rendersProviderStatus('', 'Failed');
-  });
-  it('renders LoadingVmsList based on status.phase', () => {
-    rendersProviderStatus('', 'LoadingVmsList');
-  });
-  it('renders LoadingVmDetail based on status.phase', () => {
-    rendersProviderStatus('', 'LoadingVmDetail');
-  });
-  it('renders LoadingVmDetailFailed based on status.phase', () => {
-    rendersProviderStatus('', 'LoadingVmDetailFailed');
-  });
-
-  it('handles unknown V2VVMWare', () => {
-    rendersProviderStatus(PROVIDER_STATUS_CONNECTING, '', true);
-  });
-});
diff --git a/src/components/Wizard/CreateVmWizard/providers/tests/__snapshots__/VCenterInstances.test.js.snap b/src/components/Wizard/CreateVmWizard/providers/tests/__snapshots__/VCenterInstances.test.js.snap
deleted file mode 100644
index b7e4140b9..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/tests/__snapshots__/VCenterInstances.test.js.snap
+++ /dev/null
@@ -1,334 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<VCenterInstancesConnected /> for list of vCenter secrets renders correctly 1`] = `
-<VCenterInstances
-  extraProps={
-    Object {
-      "WithResources": [Function],
-      "basicSettings": Object {
-        "flavor": Object {
-          "value": "small",
-        },
-        "name": Object {
-          "value": "name",
-        },
-        "namespace": Object {
-          "value": "default",
-        },
-        "operatingSystem": Object {
-          "value": Object {
-            "id": "rhel7.0",
-            "name": "Red Hat Enterprise Linux 7.0",
-          },
-        },
-        "provider": Object {
-          "value": "VMWare",
-        },
-        "provisionSourceType": Object {
-          "value": "Import",
-        },
-        "rememberVmwareCredentials": Object {
-          "value": true,
-        },
-        "vCenterInstance": Object {
-          "value": "Connect to New Instance",
-        },
-        "vmwareHostname": Object {
-          "value": "my.domain.com",
-        },
-        "vmwareUserName": Object {
-          "value": "username",
-        },
-        "vmwareUserPwdCheck": Object {
-          "value": Object {
-            "vmwareConnection": Object {
-              "V2VVmwareName": "v2vvmware-object-name",
-            },
-            "vmwareUserPwd": "password",
-          },
-        },
-        "workloadProfile": Object {
-          "value": "generic",
-        },
-      },
-    }
-  }
-  id="test-dropdown-id"
-  onChange={[MockFunction]}
-  value="test-instance-1"
->
-  <WithResources
-    resourceMap={
-      Object {
-        "vCenterSecrets": Object {
-          "resource": Object {
-            "isList": true,
-            "kind": "Secret",
-            "namespace": "default",
-            "namespaced": true,
-            "prop": "Secret",
-            "selector": Object {
-              "matchExpressions": Array [
-                Object {
-                  "key": "kubevirt.io/vcenter",
-                  "operator": "Exists",
-                },
-                Object {
-                  "key": "kubevirt.io/temporary",
-                  "operator": "DoesNotExist",
-                },
-              ],
-            },
-          },
-        },
-      }
-    }
-    resourceToProps={[Function]}
-  >
-    <Dropdown
-      choices={
-        Array [
-          "Connect to New Instance",
-          "secret-1",
-          "secret-2",
-        ]
-      }
-      disabled={false}
-      id="test-dropdown-id"
-      key=".0"
-      onChange={[Function]}
-      value="test-instance-1"
-      withTooltips={false}
-    >
-      <ButtonGroup
-        block={false}
-        bsClass="btn-group"
-        justified={true}
-        key="test-dropdown-id"
-        vertical={false}
-      >
-        <div
-          className="btn-group btn-group-justified"
-        >
-          <DropdownButton
-            bsStyle="default"
-            className="kubevirt-dropdown"
-            disabled={false}
-            id="test-dropdown-id"
-            onSelect={[Function]}
-            title="test-instance-1"
-          >
-            <DropdownButton
-              bsStyle="default"
-              className="kubevirt-dropdown"
-              disabled={false}
-              id="test-dropdown-id"
-              onSelect={[Function]}
-              title="test-instance-1"
-            >
-              <Uncontrolled(Dropdown)
-                bsStyle="default"
-                disabled={false}
-                id="test-dropdown-id"
-                onSelect={[Function]}
-              >
-                <Dropdown
-                  bsClass="dropdown"
-                  bsStyle="default"
-                  componentClass={[Function]}
-                  disabled={false}
-                  id="test-dropdown-id"
-                  onSelect={[Function]}
-                  onToggle={[Function]}
-                >
-                  <ButtonGroup
-                    block={false}
-                    bsClass="btn-group"
-                    bsStyle="default"
-                    className="dropdown"
-                    justified={false}
-                    vertical={false}
-                  >
-                    <div
-                      className="dropdown btn-group btn-group-default"
-                    >
-                      <DropdownToggle
-                        bsClass="dropdown-toggle"
-                        bsRole="toggle"
-                        bsStyle="default"
-                        className="kubevirt-dropdown"
-                        disabled={false}
-                        id="test-dropdown-id"
-                        key=".0"
-                        onClick={[Function]}
-                        onKeyDown={[Function]}
-                        open={false}
-                        useAnchor={false}
-                      >
-                        <Button
-                          active={false}
-                          aria-expanded={false}
-                          aria-haspopup={true}
-                          block={false}
-                          bsClass="btn"
-                          bsStyle="default"
-                          className="kubevirt-dropdown dropdown-toggle"
-                          disabled={false}
-                          id="test-dropdown-id"
-                          onClick={[Function]}
-                          onKeyDown={[Function]}
-                          role="button"
-                        >
-                          <button
-                            aria-expanded={false}
-                            aria-haspopup={true}
-                            className="kubevirt-dropdown dropdown-toggle btn btn-default"
-                            disabled={false}
-                            id="test-dropdown-id"
-                            onClick={[Function]}
-                            onKeyDown={[Function]}
-                            role="button"
-                            type="button"
-                          >
-                            test-instance-1
-                             
-                            <span
-                              className="caret"
-                            />
-                          </button>
-                        </Button>
-                      </DropdownToggle>
-                      <DropdownMenu
-                        bsClass="dropdown-menu"
-                        bsRole="menu"
-                        key=".1"
-                        labelledBy="test-dropdown-id"
-                        onClose={[Function]}
-                        onSelect={[Function]}
-                        pullRight={false}
-                      >
-                        <RootCloseWrapper
-                          disabled={true}
-                          event="click"
-                          onRootClose={[Function]}
-                        >
-                          <ul
-                            aria-labelledby="test-dropdown-id"
-                            className="dropdown-menu"
-                            role="menu"
-                          >
-                            <MenuItem
-                              bsClass="dropdown"
-                              disabled={false}
-                              divider={false}
-                              eventKey="Connect to New Instance"
-                              header={false}
-                              key=".$Connect to New Instance"
-                              onKeyDown={[Function]}
-                              onSelect={[Function]}
-                            >
-                              <li
-                                className=""
-                                role="presentation"
-                              >
-                                <SafeAnchor
-                                  componentClass="a"
-                                  onClick={[Function]}
-                                  onKeyDown={[Function]}
-                                  role="menuitem"
-                                  tabIndex="-1"
-                                >
-                                  <a
-                                    href="#"
-                                    onClick={[Function]}
-                                    onKeyDown={[Function]}
-                                    role="menuitem"
-                                    tabIndex="-1"
-                                  >
-                                    Connect to New Instance
-                                  </a>
-                                </SafeAnchor>
-                              </li>
-                            </MenuItem>
-                            <MenuItem
-                              bsClass="dropdown"
-                              disabled={false}
-                              divider={false}
-                              eventKey="secret-1"
-                              header={false}
-                              key=".$secret-1"
-                              onKeyDown={[Function]}
-                              onSelect={[Function]}
-                            >
-                              <li
-                                className=""
-                                role="presentation"
-                              >
-                                <SafeAnchor
-                                  componentClass="a"
-                                  onClick={[Function]}
-                                  onKeyDown={[Function]}
-                                  role="menuitem"
-                                  tabIndex="-1"
-                                >
-                                  <a
-                                    href="#"
-                                    onClick={[Function]}
-                                    onKeyDown={[Function]}
-                                    role="menuitem"
-                                    tabIndex="-1"
-                                  >
-                                    secret-1
-                                  </a>
-                                </SafeAnchor>
-                              </li>
-                            </MenuItem>
-                            <MenuItem
-                              bsClass="dropdown"
-                              disabled={false}
-                              divider={false}
-                              eventKey="secret-2"
-                              header={false}
-                              key=".$secret-2"
-                              onKeyDown={[Function]}
-                              onSelect={[Function]}
-                            >
-                              <li
-                                className=""
-                                role="presentation"
-                              >
-                                <SafeAnchor
-                                  componentClass="a"
-                                  onClick={[Function]}
-                                  onKeyDown={[Function]}
-                                  role="menuitem"
-                                  tabIndex="-1"
-                                >
-                                  <a
-                                    href="#"
-                                    onClick={[Function]}
-                                    onKeyDown={[Function]}
-                                    role="menuitem"
-                                    tabIndex="-1"
-                                  >
-                                    secret-2
-                                  </a>
-                                </SafeAnchor>
-                              </li>
-                            </MenuItem>
-                          </ul>
-                        </RootCloseWrapper>
-                      </DropdownMenu>
-                    </div>
-                  </ButtonGroup>
-                </Dropdown>
-              </Uncontrolled(Dropdown)>
-            </DropdownButton>
-          </DropdownButton>
-        </div>
-      </ButtonGroup>
-    </Dropdown>
-     
-  </WithResources>
-</VCenterInstances>
-`;
diff --git a/src/components/Wizard/CreateVmWizard/providers/tests/__snapshots__/VCenterVms.test.js.snap b/src/components/Wizard/CreateVmWizard/providers/tests/__snapshots__/VCenterVms.test.js.snap
deleted file mode 100644
index b10515983..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/tests/__snapshots__/VCenterVms.test.js.snap
+++ /dev/null
@@ -1,55 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<VCenterVms /> for list of vCenter secrets renders correctly 1`] = `
-<div
-  class="btn-group btn-group-justified"
->
-  <div
-    class="dropdown btn-group btn-group-default"
-  >
-    <button
-      aria-expanded="false"
-      aria-haspopup="true"
-      class="kubevirt-dropdown dropdown-toggle btn btn-default"
-      id="test-dropdown-id"
-      role="button"
-      type="button"
-    >
-      test-vm1 
-      <span
-        class="caret"
-      />
-    </button>
-    <ul
-      aria-labelledby="test-dropdown-id"
-      class="dropdown-menu"
-      role="menu"
-    >
-      <li
-        class=""
-        role="presentation"
-      >
-        <a
-          href="#"
-          role="menuitem"
-          tabindex="-1"
-        >
-          vm-1
-        </a>
-      </li>
-      <li
-        class=""
-        role="presentation"
-      >
-        <a
-          href="#"
-          role="menuitem"
-          tabindex="-1"
-        >
-          vm-2
-        </a>
-      </li>
-    </ul>
-  </div>
-</div>
-`;
diff --git a/src/components/Wizard/CreateVmWizard/providers/tests/__snapshots__/VCenterVmsWithPrefill.test.js.snap b/src/components/Wizard/CreateVmWizard/providers/tests/__snapshots__/VCenterVmsWithPrefill.test.js.snap
deleted file mode 100644
index 82b01429d..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/tests/__snapshots__/VCenterVmsWithPrefill.test.js.snap
+++ /dev/null
@@ -1,386 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<VCenterVmsWithPrefill /> does prefill 1`] = `
-<VCenterVmsWithPrefill
-  basicSettings={
-    Object {
-      "flavor": Object {
-        "value": "small",
-      },
-      "name": Object {
-        "value": "name",
-      },
-      "namespace": Object {
-        "value": "default",
-      },
-      "operatingSystem": Object {
-        "value": Object {
-          "id": "rhel7.0",
-          "name": "Red Hat Enterprise Linux 7.0",
-        },
-      },
-      "provider": Object {
-        "value": "VMWare",
-      },
-      "provisionSourceType": Object {
-        "value": "Import",
-      },
-      "rememberVmwareCredentials": Object {
-        "value": true,
-      },
-      "vCenterInstance": Object {
-        "value": "Connect to New Instance",
-      },
-      "vmwareHostname": Object {
-        "value": "my.domain.com",
-      },
-      "vmwareUserName": Object {
-        "value": "username",
-      },
-      "vmwareUserPwdCheck": Object {
-        "value": Object {
-          "vmwareConnection": Object {
-            "V2VVmwareName": "v2vvmware-object-name",
-          },
-          "vmwareUserPwd": "password",
-        },
-      },
-      "vmwareVm": Object {
-        "value": "vm-name",
-      },
-      "workloadProfile": Object {
-        "value": "generic",
-      },
-    }
-  }
-  choices={
-    Array [
-      "one-vm",
-      "vm-name",
-    ]
-  }
-  disabled={true}
-  id="my-id"
-  k8sGet={[Function]}
-  onChange={[MockFunction]}
-  onFormChange={[MockFunction]}
-  operatingSystems={
-    Array [
-      Object {
-        "id": "fedora29",
-        "name": "Fedora 29",
-      },
-      Object {
-        "id": "fedora28",
-        "name": "Fedora 28",
-      },
-      Object {
-        "id": "fedora27",
-        "name": "Fedora 27",
-      },
-      Object {
-        "id": "fedora26",
-        "name": "Fedora 26",
-      },
-      Object {
-        "id": "fedora25",
-        "name": "Fedora 25",
-      },
-      Object {
-        "id": "fedora24",
-        "name": "Fedora 24",
-      },
-      Object {
-        "id": "fedora23",
-        "name": "Fedora 23",
-      },
-      Object {
-        "id": "rhel7.0",
-        "name": "Red Hat Enterprise Linux 7.0",
-      },
-      Object {
-        "id": "ubuntu18.04",
-        "name": "Ubuntu 18.04 LTS",
-      },
-    ]
-  }
-  value="vm-name"
->
-  <Dropdown
-    choices={
-      Array [
-        "one-vm",
-        "vm-name",
-      ]
-    }
-    disabled={true}
-    id="my-id"
-    onChange={[MockFunction]}
-    value="vm-name"
-    withTooltips={false}
-  >
-    <ButtonGroup
-      block={false}
-      bsClass="btn-group"
-      justified={true}
-      key="my-id"
-      vertical={false}
-    >
-      <div
-        className="btn-group btn-group-justified"
-      >
-        <DropdownButton
-          bsStyle="default"
-          className="kubevirt-dropdown"
-          disabled={true}
-          id="my-id"
-          onSelect={[MockFunction]}
-          title="vm-name"
-        >
-          <DropdownButton
-            bsStyle="default"
-            className="kubevirt-dropdown"
-            disabled={true}
-            id="my-id"
-            onSelect={[MockFunction]}
-            title="vm-name"
-          >
-            <Uncontrolled(Dropdown)
-              bsStyle="default"
-              disabled={true}
-              id="my-id"
-              onSelect={[MockFunction]}
-            >
-              <Dropdown
-                bsClass="dropdown"
-                bsStyle="default"
-                componentClass={[Function]}
-                disabled={true}
-                id="my-id"
-                onSelect={[MockFunction]}
-                onToggle={[Function]}
-              >
-                <ButtonGroup
-                  block={false}
-                  bsClass="btn-group"
-                  bsStyle="default"
-                  className="dropdown disabled"
-                  justified={false}
-                  vertical={false}
-                >
-                  <div
-                    className="dropdown disabled btn-group btn-group-default"
-                  >
-                    <DropdownToggle
-                      bsClass="dropdown-toggle"
-                      bsRole="toggle"
-                      bsStyle="default"
-                      className="kubevirt-dropdown"
-                      disabled={true}
-                      id="my-id"
-                      key=".0"
-                      onClick={[Function]}
-                      onKeyDown={[Function]}
-                      open={false}
-                      useAnchor={false}
-                    >
-                      <Button
-                        active={false}
-                        aria-expanded={false}
-                        aria-haspopup={true}
-                        block={false}
-                        bsClass="btn"
-                        bsStyle="default"
-                        className="kubevirt-dropdown dropdown-toggle"
-                        disabled={true}
-                        id="my-id"
-                        onClick={[Function]}
-                        onKeyDown={[Function]}
-                        role="button"
-                      >
-                        <button
-                          aria-expanded={false}
-                          aria-haspopup={true}
-                          className="kubevirt-dropdown dropdown-toggle btn btn-default"
-                          disabled={true}
-                          id="my-id"
-                          onClick={[Function]}
-                          onKeyDown={[Function]}
-                          role="button"
-                          type="button"
-                        >
-                          vm-name
-                           
-                          <span
-                            className="caret"
-                          />
-                        </button>
-                      </Button>
-                    </DropdownToggle>
-                    <DropdownMenu
-                      bsClass="dropdown-menu"
-                      bsRole="menu"
-                      key=".1"
-                      labelledBy="my-id"
-                      onClose={[Function]}
-                      onSelect={[Function]}
-                      pullRight={false}
-                    >
-                      <RootCloseWrapper
-                        disabled={true}
-                        event="click"
-                        onRootClose={[Function]}
-                      >
-                        <ul
-                          aria-labelledby="my-id"
-                          className="dropdown-menu"
-                          role="menu"
-                        >
-                          <MenuItem
-                            bsClass="dropdown"
-                            disabled={false}
-                            divider={false}
-                            eventKey="one-vm"
-                            header={false}
-                            key=".$one-vm"
-                            onKeyDown={[Function]}
-                            onSelect={[Function]}
-                          >
-                            <li
-                              className=""
-                              role="presentation"
-                            >
-                              <SafeAnchor
-                                componentClass="a"
-                                onClick={[Function]}
-                                onKeyDown={[Function]}
-                                role="menuitem"
-                                tabIndex="-1"
-                              >
-                                <a
-                                  href="#"
-                                  onClick={[Function]}
-                                  onKeyDown={[Function]}
-                                  role="menuitem"
-                                  tabIndex="-1"
-                                >
-                                  one-vm
-                                </a>
-                              </SafeAnchor>
-                            </li>
-                          </MenuItem>
-                          <MenuItem
-                            bsClass="dropdown"
-                            disabled={false}
-                            divider={false}
-                            eventKey="vm-name"
-                            header={false}
-                            key=".$vm-name"
-                            onKeyDown={[Function]}
-                            onSelect={[Function]}
-                          >
-                            <li
-                              className=""
-                              role="presentation"
-                            >
-                              <SafeAnchor
-                                componentClass="a"
-                                onClick={[Function]}
-                                onKeyDown={[Function]}
-                                role="menuitem"
-                                tabIndex="-1"
-                              >
-                                <a
-                                  href="#"
-                                  onClick={[Function]}
-                                  onKeyDown={[Function]}
-                                  role="menuitem"
-                                  tabIndex="-1"
-                                >
-                                  vm-name
-                                </a>
-                              </SafeAnchor>
-                            </li>
-                          </MenuItem>
-                        </ul>
-                      </RootCloseWrapper>
-                    </DropdownMenu>
-                  </div>
-                </ButtonGroup>
-              </Dropdown>
-            </Uncontrolled(Dropdown)>
-          </DropdownButton>
-        </DropdownButton>
-      </div>
-    </ButtonGroup>
-  </Dropdown>
-</VCenterVmsWithPrefill>
-`;
-
-exports[`<VCenterVmsWithPrefill /> does prefill 2`] = `
-Object {
-  "target": "intermediaryStorageData",
-  "value": Array [
-    Object {
-      "data": Object {
-        "fileName": "[datastore12] ftp-01/ftp-01.vmdk",
-        "mountPath": "/data/vm/disk1",
-      },
-      "id": 0,
-      "isBootable": true,
-      "name": "disk0",
-      "size": 1,
-      "storageClass": undefined,
-      "storageType": "external-import",
-    },
-    Object {
-      "data": Object {
-        "fileName": "filename1",
-        "mountPath": "/data/vm/disk2",
-      },
-      "id": 1,
-      "isBootable": false,
-      "name": "disk1",
-      "size": 2,
-      "storageClass": undefined,
-      "storageType": "external-import",
-    },
-    Object {
-      "data": Object {
-        "mountPath": "/var/tmp",
-      },
-      "id": 2,
-      "name": "v2v-conversion-temp",
-      "size": 2,
-      "storageClass": undefined,
-      "storageType": "external-v2v-temp",
-    },
-    Object {
-      "data": Object {
-        "mountPath": "/opt/vmware-vix-disklib-distrib",
-      },
-      "editable": false,
-      "id": 3,
-      "name": "vddk-pvc",
-      "storageClass": undefined,
-      "storageType": "external-v2v-vddk",
-    },
-  ],
-}
-`;
-
-exports[`<VCenterVmsWithPrefill /> renders correctly 1`] = `
-<Dropdown
-  choices={
-    Array [
-      "one-vm",
-      "vm-name",
-    ]
-  }
-  disabled={true}
-  id="my-id"
-  onChange={[MockFunction]}
-  value="vm-name"
-  withTooltips={false}
-/>
-`;
diff --git a/src/components/Wizard/CreateVmWizard/providers/tests/__snapshots__/VMWarePasswordAndCheck.test.js.snap b/src/components/Wizard/CreateVmWizard/providers/tests/__snapshots__/VMWarePasswordAndCheck.test.js.snap
deleted file mode 100644
index 8dbc68ab1..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/tests/__snapshots__/VMWarePasswordAndCheck.test.js.snap
+++ /dev/null
@@ -1,109 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<VMWarePasswordAndCheck /> renders Connecting based on status.phase 1`] = `
-Array [
-  <input
-    class="form-control"
-    id="my-id-text"
-    type="password"
-    value="password"
-  />,
-  <div
-    class="kubevirt-create-vm-wizard__import-vmware-passwordcheck-button-section"
-  >
-    <button
-      class="kubevirt-create-vm-wizard__import-vmware-passwordcheck-button btn btn-default"
-      id="my-id-check-button"
-      type="button"
-    >
-      Check
-    </button>
-  </div>,
-]
-`;
-
-exports[`<VMWarePasswordAndCheck /> renders PROVIDER_STATUS_SUCCESS 1`] = `
-Array [
-  <input
-    class="form-control"
-    id="my-id-text"
-    type="password"
-    value="password"
-  />,
-  <div
-    class="kubevirt-create-vm-wizard__import-vmware-passwordcheck-button-section"
-  >
-    <button
-      class="kubevirt-create-vm-wizard__import-vmware-passwordcheck-button btn btn-default"
-      id="my-id-check-button"
-      type="button"
-    >
-      Check
-    </button>
-  </div>,
-]
-`;
-
-exports[`<VMWarePasswordAndCheck /> renders correctly 1`] = `
-<VMWarePasswordAndCheck
-  extraProps={Object {}}
-  id="my-id"
-  onChange={[Function]}
-  value={Object {}}
->
-  <Text
-    disabled={false}
-    id="my-id-text"
-    onBlur={[Function]}
-    onChange={[Function]}
-    type="password"
-    value=""
-  >
-    <FormControl
-      bsClass="form-control"
-      componentClass="input"
-      disabled={false}
-      id="my-id-text"
-      key="my-id-text"
-      onBlur={[Function]}
-      onChange={[Function]}
-      type="password"
-      value=""
-    >
-      <input
-        className="form-control"
-        disabled={false}
-        id="my-id-text"
-        onBlur={[Function]}
-        onChange={[Function]}
-        type="password"
-        value=""
-      />
-    </FormControl>
-  </Text>
-  <div
-    className="kubevirt-create-vm-wizard__import-vmware-passwordcheck-button-section"
-  >
-    <Button
-      active={false}
-      block={false}
-      bsClass="btn"
-      bsStyle="default"
-      className="kubevirt-create-vm-wizard__import-vmware-passwordcheck-button"
-      disabled={true}
-      id="my-id-check-button"
-      onClick={[Function]}
-    >
-      <button
-        className="kubevirt-create-vm-wizard__import-vmware-passwordcheck-button btn btn-default"
-        disabled={true}
-        id="my-id-check-button"
-        onClick={[Function]}
-        type="button"
-      >
-        Check
-      </button>
-    </Button>
-  </div>
-</VMWarePasswordAndCheck>
-`;
diff --git a/src/components/Wizard/CreateVmWizard/providers/tests/__snapshots__/VMWareProviderStatus.test.js.snap b/src/components/Wizard/CreateVmWizard/providers/tests/__snapshots__/VMWareProviderStatus.test.js.snap
deleted file mode 100644
index 8ae8a19c2..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/tests/__snapshots__/VMWareProviderStatus.test.js.snap
+++ /dev/null
@@ -1,108 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<VMWareProviderStatus /> handles unknown V2VVMWare 1`] = `null`;
-
-exports[`<VMWareProviderStatus /> renders Connecting based on status.phase 1`] = `
-<div
-  class="kubevirt-create-vm-wizard__import-vmware-connection-status"
->
-  Checking vCenter Credentials...
-  <div
-    class="spinner spinner-sm"
-  />
-</div>
-`;
-
-exports[`<VMWareProviderStatus /> renders ConnectionVerified based on status.phase 1`] = `
-<div
-  class="kubevirt-create-vm-wizard__import-vmware-connection-status"
->
-  Connection successful
-</div>
-`;
-
-exports[`<VMWareProviderStatus /> renders Failed based on status.phase 1`] = `
-<div
-  class="kubevirt-create-vm-wizard__import-vmware-connection-status"
->
-  <div
-    class="alert alert-warning"
-  >
-    <span
-      aria-hidden="true"
-      class="pficon pficon-warning-triangle-o"
-    />
-    Could not connect to vCenter using the provided credentials.
-  </div>
-</div>
-`;
-
-exports[`<VMWareProviderStatus /> renders LoadingVmDetail based on status.phase 1`] = `
-<div
-  class="kubevirt-create-vm-wizard__import-vmware-connection-status"
->
-  Connection successful. Loading data...
-  <div
-    class="spinner spinner-sm"
-  />
-</div>
-`;
-
-exports[`<VMWareProviderStatus /> renders LoadingVmDetailFailed based on status.phase 1`] = `
-<div
-  class="kubevirt-create-vm-wizard__import-vmware-connection-status"
->
-  <div
-    class="alert alert-warning"
-  >
-    <span
-      aria-hidden="true"
-      class="pficon pficon-warning-triangle-o"
-    />
-    Connection succeeded but could not read details of the virtual machine from the vCenter instance.
-  </div>
-</div>
-`;
-
-exports[`<VMWareProviderStatus /> renders LoadingVmsList based on status.phase 1`] = `
-<div
-  class="kubevirt-create-vm-wizard__import-vmware-connection-status"
->
-  Connection successful. Loading data...
-  <div
-    class="spinner spinner-sm"
-  />
-</div>
-`;
-
-exports[`<VMWareProviderStatus /> renders PROVIDER_STATUS_CONNECTING 1`] = `
-<div
-  class="kubevirt-create-vm-wizard__import-vmware-connection-status"
->
-  Connection successful
-</div>
-`;
-
-exports[`<VMWareProviderStatus /> renders PROVIDER_STATUS_CONNECTION_FAILED 1`] = `
-<div
-  class="kubevirt-create-vm-wizard__import-vmware-connection-status"
->
-  <div
-    class="alert alert-warning"
-  >
-    <span
-      aria-hidden="true"
-      class="pficon pficon-warning-triangle-o"
-    />
-    Can not verify vCenter credentials, connection to the V2V VMWare failed.
-  </div>
-</div>
-`;
-
-exports[`<VMWareProviderStatus /> renders PROVIDER_STATUS_SUCCESS 1`] = `
-<div
-  class="kubevirt-create-vm-wizard__import-vmware-connection-status"
->
-  Connection successful
-</div>
-`;
diff --git a/src/components/Wizard/CreateVmWizard/providers/tests/v2vvmwareController.test.js b/src/components/Wizard/CreateVmWizard/providers/tests/v2vvmwareController.test.js
deleted file mode 100644
index 6653a3145..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/tests/v2vvmwareController.test.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { startV2VVMWareController } from '../v2vvmwareController';
-import { DeploymentModel, RoleBindingModel, RoleModel, ServiceAccountModel } from '../../../../../models';
-
-const k8sGetFailing = () => Promise.reject(new Error('Test-only: A dummy reason for failing k8sGet.'));
-
-describe('namespace-local kubevirt-vmware deployment', () => {
-  it('works', async () => {
-    const k8sCreate = jest.fn().mockReturnValue(Promise.resolve());
-    await startV2VVMWareController({
-      k8sCreate,
-      k8sGet: k8sGetFailing,
-      namespace: 'my-namespace',
-    });
-    expect(k8sCreate.mock.calls).toHaveLength(4);
-    expect(k8sCreate.mock.calls[0][0].kind).toBe(ServiceAccountModel.kind);
-    expect(k8sCreate.mock.calls[1][0].kind).toBe(RoleModel.kind);
-    expect(k8sCreate.mock.calls[2][0].kind).toBe(RoleBindingModel.kind);
-    expect(k8sCreate.mock.calls[3][0].kind).toBe(DeploymentModel.kind);
-  });
-});
diff --git a/src/components/Wizard/CreateVmWizard/providers/tests/vmware.test.js b/src/components/Wizard/CreateVmWizard/providers/tests/vmware.test.js
deleted file mode 100644
index b60063e1d..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/tests/vmware.test.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { basicSettingsImportVmwareNewConnection } from '../../../../../tests/forms_mocks/basicSettings.mock';
-import { isNewVmwareInstanceSelected } from '../vmware';
-
-describe('VMWare form section', () => {
-  it('detects selection of new connection', () => {
-    expect(isNewVmwareInstanceSelected(basicSettingsImportVmwareNewConnection)).toBe(true);
-  });
-});
diff --git a/src/components/Wizard/CreateVmWizard/providers/tests/vmwareActions.test.js b/src/components/Wizard/CreateVmWizard/providers/tests/vmwareActions.test.js
deleted file mode 100644
index 55426d52f..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/tests/vmwareActions.test.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import { onVmwareCheckConnection, onVCenterInstanceSelected, onVCenterVmSelectedConnected } from '../vmwareActions';
-import { basicSettingsImportVmwareNewConnection } from '../../../../../tests/forms_mocks/basicSettings.mock';
-import { k8sCreate, k8sGet } from '../../../../../tests/k8s';
-
-import {
-  PROVIDER_STATUS_CONNECTING,
-  PROVIDER_STATUS_CONNECTION_FAILED,
-  PROVIDER_VMWARE_CONNECTION,
-  PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY,
-} from '../../constants';
-import { V2VVMwareModel } from '../../../../../models';
-
-describe('vmware UI action', () => {
-  it('onVmwareCheckConnection() works', async () => {
-    const onChange = jest.fn();
-    // eslint-disable-next line promise/always-return
-    await onVmwareCheckConnection(basicSettingsImportVmwareNewConnection, onChange, k8sCreate);
-    expect(onChange.mock.calls).toHaveLength(2);
-    expect(onChange.mock.calls[0][0].status).toBe(PROVIDER_STATUS_CONNECTING);
-    expect(onChange.mock.calls[1][0].V2VVmwareName).toEqual(expect.stringMatching('check-my.domain.com-username--'));
-  });
-  it('onVmwareCheckConnection() handles error', async () => {
-    const onChange = jest.fn();
-    const k8sCreateFailing = () => Promise.reject(new Error('Test-only: A dummy reason for rejecting k8sCreate.'));
-    // eslint-disable-next line promise/always-return
-    await onVmwareCheckConnection(basicSettingsImportVmwareNewConnection, onChange, k8sCreateFailing);
-    expect(onChange.mock.calls).toHaveLength(2);
-    expect(onChange.mock.calls[0][0].status).toBe(PROVIDER_STATUS_CONNECTING);
-    expect(onChange.mock.calls[1][0].status).toBe(PROVIDER_STATUS_CONNECTION_FAILED);
-  });
-  it('onVCenterInstanceSelected() works', async () => {
-    const onFormChange = jest.fn();
-    await onVCenterInstanceSelected(
-      k8sCreate,
-      { value: { metadata: { name: 'connection-secret-name' } } },
-      undefined, // key,
-      undefined, // formValid
-      basicSettingsImportVmwareNewConnection,
-      onFormChange
-    );
-    expect(onFormChange.mock.calls).toHaveLength(1);
-    expect(onFormChange.mock.calls[0][0].value[PROVIDER_VMWARE_CONNECTION].V2VVmwareName).toEqual(
-      expect.stringMatching('')
-    );
-    expect(onFormChange.mock.calls[0][1]).toBe(PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY);
-  });
-  it('onVCenterVmSelectedConnected() works', async () => {
-    const onFormChange = jest.fn();
-    const k8sPatch = jest.fn();
-
-    await onVCenterVmSelectedConnected(
-      k8sCreate,
-      k8sGet,
-      k8sPatch,
-      { value: 'test-vm2-name' },
-      undefined, // key,
-      undefined, // formValid
-      basicSettingsImportVmwareNewConnection,
-      onFormChange
-    );
-    expect(k8sPatch.mock.calls).toHaveLength(1);
-    expect(k8sPatch.mock.calls[0][0].kind).toBe(V2VVMwareModel.kind);
-    expect(k8sPatch.mock.calls[0][2][0].path).toBe('/spec/vms/1/detailRequest');
-    expect(k8sPatch.mock.calls[0][2][0].op).toBe('add');
-
-    expect(onFormChange.mock.calls).toHaveLength(0); // VM Name is set by the user, so don't touch
-  });
-});
diff --git a/src/components/Wizard/CreateVmWizard/providers/tests/vmwareProviderPod.test.js b/src/components/Wizard/CreateVmWizard/providers/tests/vmwareProviderPod.test.js
deleted file mode 100644
index 871c62063..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/tests/vmwareProviderPod.test.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import { getDefaultSecretName, getImportProviderSecretObject, getV2VVMwareObject } from '../vmwareProviderPod';
-import { SecretModel, V2VVMwareModel } from '../../../../../models';
-import { VCENTER_TEMPORARY_LABEL } from '../../../../../constants';
-
-describe('VMWareProviderPod()', () => {
-  it('returns default secret name correctly', () => {
-    expect(getDefaultSecretName({ username: 'a', url: 'url' })).toBe('url-a');
-    expect(getDefaultSecretName({ username: 'a', url: 'https://url' })).toBe('url-a');
-    expect(getDefaultSecretName({ username: 'a', url: 'http://url' })).toBe('url-a');
-    expect(getDefaultSecretName({ username: 'a', url: 'https://url.com/' })).toBe('url.com-a');
-    expect(getDefaultSecretName({ username: 'a', url: 'https://url.com/foo' })).toBe('url.com-a');
-    expect(getDefaultSecretName({ username: 'a@b', url: 'https://url.com/foo/bar' })).toBe('url.com-a-at-b');
-  });
-  it('throws an exception', () => {
-    expect(() => getDefaultSecretName({ username: 'a', url: '' })).toThrow();
-    expect(() => getDefaultSecretName({ username: 'a' })).toThrow();
-    expect(() => getDefaultSecretName({})).toThrow();
-  });
-  it('generates Secret object', () => {
-    const secret = getImportProviderSecretObject({
-      url: 'url',
-      username: 'user',
-      password: 'pwd',
-      secretName: 'secret-name',
-      namespace: 'my-namespace',
-      isTemporary: true,
-    });
-    expect(secret).toMatchObject({
-      kind: SecretModel.kind,
-      apiVersion: SecretModel.apiVersion,
-      metadata: {
-        generateName: 'secret-name',
-        namespace: 'my-namespace',
-        labels: {
-          [VCENTER_TEMPORARY_LABEL]: 'true',
-        },
-      },
-      type: 'Opaque',
-      data: {
-        username: btoa('user'),
-        password: btoa('pwd'),
-        url: btoa('url'),
-      },
-    });
-  });
-  it('generates V2VVMWare object', () => {
-    const v2vvmware = getV2VVMwareObject({
-      name: 'name',
-      namespace: 'my-namespace',
-      connectionSecretName: 'secret-name',
-      isTemporary: true,
-    });
-    expect(v2vvmware).toMatchObject({
-      kind: V2VVMwareModel.kind,
-      apiVersion: `${V2VVMwareModel.apiGroup}/${V2VVMwareModel.apiVersion}`,
-      metadata: {
-        generateName: 'name',
-        namespace: 'my-namespace',
-        labels: {
-          [VCENTER_TEMPORARY_LABEL]: 'true',
-        },
-      },
-      spec: {
-        connection: 'secret-name',
-      },
-    });
-  });
-});
diff --git a/src/components/Wizard/CreateVmWizard/providers/v2vvmwareController.js b/src/components/Wizard/CreateVmWizard/providers/v2vvmwareController.js
deleted file mode 100644
index 0e479c2f3..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/v2vvmwareController.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import { DeploymentModel, RoleModel, ServiceAccountModel, RoleBindingModel } from '../../../../models';
-import { buildServiceAccount, buildServiceAccountRoleBinding } from '../../../../k8s/objects';
-import { buildVmWareRole, buildVmWareDeployment } from '../../../../k8s/objects/v2v/vmware';
-import { V2VVMWARE_DEPLOYMENT_NAME } from '../../../../k8s/requests/v2v/constants';
-
-const { info, warn } = console;
-
-const rejectLogger = title => reason => warn(`Failed to create ${title}, reason`, reason);
-
-// The controller is namespace-scoped, especially due to security reasons
-// Let's make sure its started within the desired namespace (which is not by default).
-// The V2VVmware CRD is expected to be already created within the cluster (by Web UI installation)
-export const startV2VVMWareController = async ({ k8sCreate, k8sGet, namespace }) => {
-  try {
-    await k8sGet(DeploymentModel, V2VVMWARE_DEPLOYMENT_NAME, namespace);
-  } catch {
-    // Deployment does not exist or does not have permissions to see Deployments in this namespace
-    // TODO: notify the user in other way not just the console.log
-
-    info('V2V VMWare controller deployment not found, so creating one ...');
-    const params = { k8sCreate, namespace, name: V2VVMWARE_DEPLOYMENT_NAME };
-
-    createServiceAccount(params).catch(rejectLogger('Service Account'));
-    createRole(params).catch(rejectLogger('Role'));
-    createRoleBinding(params).catch(rejectLogger('Role Binding'));
-    createOperator(params).catch(rejectLogger('V2V VMWare controller'));
-  }
-};
-
-const createServiceAccount = ({ k8sCreate, ...params }) => k8sCreate(ServiceAccountModel, buildServiceAccount(params));
-
-const createRole = ({ k8sCreate, ...params }) => k8sCreate(RoleModel, buildVmWareRole(params));
-
-const createRoleBinding = ({ k8sCreate, name, namespace }) =>
-  k8sCreate(
-    RoleBindingModel,
-    buildServiceAccountRoleBinding({
-      name,
-      namespace,
-      serviceAccountName: name,
-      roleName: name,
-    })
-  );
-
-// TODO: Do not use Deployment, just run the pod directly to simplify upgrades
-const createOperator = ({ k8sCreate, ...params }) => k8sCreate(DeploymentModel, buildVmWareDeployment(params));
diff --git a/src/components/Wizard/CreateVmWizard/providers/vmware.js b/src/components/Wizard/CreateVmWizard/providers/vmware.js
deleted file mode 100644
index 2316ebe0d..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/vmware.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import { isImportProviderType, settingsValue } from '../../../../k8s/selectors';
-import { CONNECT_TO_NEW_INSTANCE, PROVIDER_SELECT_VM } from '../strings';
-import { validateVmwareURL } from '../../../../utils/validations';
-
-import {
-  PROVIDER_VMWARE,
-  PROVIDER_VMWARE_STATUS_KEY,
-  PROVIDER_VMWARE_HOSTNAME_KEY,
-  PROVIDER_VMWARE_USER_NAME_KEY,
-  PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY,
-  PROVIDER_VMWARE_USER_PWD_REMEMBER_KEY,
-  PROVIDER_VMWARE_VCENTER_KEY,
-  PROVIDER_VMWARE_VM_KEY,
-} from '../constants';
-
-import VMWarePasswordAndCheck from './VMWarePasswordAndCheck';
-import VMWareProviderStatus, { hasConnection } from './VMWareProviderStatus';
-import VCenterInstances from './VCenterInstances';
-import { onVCenterInstanceSelected, onVmwareCheckConnection, onVCenterVmSelectedConnected } from './vmwareActions';
-import VCenterVms from './VCenterVms';
-import { CHECKBOX, CUSTOM } from '../../../Form';
-
-export const isVmwareNewInstance = basicSettings =>
-  settingsValue(basicSettings, PROVIDER_VMWARE_VCENTER_KEY) === CONNECT_TO_NEW_INSTANCE;
-export const isNewVmwareInstanceSelected = basicVmSettings =>
-  isVmwareProvider(basicVmSettings) && isVmwareNewInstance(basicVmSettings);
-
-export const isVmwareProvider = basicVmSettings => isImportProviderType(basicVmSettings, PROVIDER_VMWARE);
-
-const getVMWareNewConnectionSection = (basicSettings, WithResources, k8sCreate) => ({
-  [PROVIDER_VMWARE_HOSTNAME_KEY]: {
-    id: 'vcenter-hostname-dropdown',
-    title: 'vCenter Hostname',
-    required: true,
-    isVisible: isNewVmwareInstanceSelected,
-    validate: settings => validateVmwareURL(settingsValue(settings, PROVIDER_VMWARE_HOSTNAME_KEY)),
-    defaultValue: 'https://host:port/',
-    help:
-      'Address to be used for connection to a vCenter instance. The "https://" protocol will be added automatically. Example: "my.domain.com:1234".',
-  },
-  [PROVIDER_VMWARE_USER_NAME_KEY]: {
-    id: 'vcenter-username',
-    title: 'vCenter User Name',
-    required: true,
-    isVisible: isNewVmwareInstanceSelected,
-    help: 'User name to be used for connection to a vCenter instance.',
-  },
-  [PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY]: {
-    id: 'vcenter-userpwd',
-    title: 'vCenter Password',
-    type: CUSTOM,
-    CustomComponent: VMWarePasswordAndCheck,
-    extraProps: {
-      onCheckConnection: onConnectionStateChanged =>
-        onVmwareCheckConnection(basicSettings, onConnectionStateChanged, k8sCreate),
-      WithResources,
-      basicSettings,
-    },
-    required: true,
-    isVisible: isNewVmwareInstanceSelected,
-    // validate: settings => validateVmwareConnection(settingsValue(settings, PROVIDER_VMWARE_CONNECTION)),
-    help: 'User password to be used for connection to a vCenter instance.',
-  },
-  [PROVIDER_VMWARE_USER_PWD_REMEMBER_KEY]: {
-    id: 'vcenter-remember-credentials',
-    title: 'Remember vCenter credentials',
-    type: CHECKBOX,
-    isVisible: isNewVmwareInstanceSelected,
-    help: 'If checked, new secret keeping connection details will be created for later use.', // text is recently not rendered
-  },
-});
-
-export const getVMWareSection = (basicSettings, operatingSystems, WithResources, k8sCreate, k8sGet, k8sPatch) => ({
-  [PROVIDER_VMWARE_VCENTER_KEY]: {
-    id: 'vcenter-instance-dropdown',
-    title: 'vCenter Instance',
-    type: CUSTOM,
-    CustomComponent: VCenterInstances,
-    extraProps: {
-      WithResources,
-      basicSettings,
-    },
-    onChange: (...props) => onVCenterInstanceSelected(k8sCreate, ...props),
-    required: true,
-    isVisible: isVmwareProvider,
-    defaultValue: '--- Select vCenter Instance Secret ---',
-    help: 'Select secret containing connection details for a vCenter instance.',
-  },
-  ...getVMWareNewConnectionSection(basicSettings, WithResources, k8sCreate),
-  [PROVIDER_VMWARE_STATUS_KEY]: {
-    id: 'vcenter-status',
-    type: CUSTOM,
-    title: ' ',
-    CustomComponent: VMWareProviderStatus,
-    extraProps: {
-      onCheckConnection: onConnectionStateChanged =>
-        onVmwareCheckConnection(basicSettings, onConnectionStateChanged, k8sCreate),
-      WithResources,
-      basicSettings,
-    },
-    isVisible: settings => isVmwareProvider(settings) && hasConnection(settings),
-  },
-  [PROVIDER_VMWARE_VM_KEY]: {
-    id: 'vcenter-vm-dropdown',
-    title: 'VM to Import',
-    type: CUSTOM,
-    CustomComponent: VCenterVms,
-    extraProps: {
-      WithResources,
-      k8sGet,
-      basicSettings,
-      operatingSystems,
-    },
-    onChange: (...props) => onVCenterVmSelectedConnected(k8sCreate, k8sGet, k8sPatch, ...props),
-    required: true,
-    isVisible: isVmwareProvider,
-    defaultValue: PROVIDER_SELECT_VM,
-    help:
-      'Select a vCenter virtual machine to import. Loading of their list might take some time. The list will be enabled for selection once data are loaded.',
-  },
-});
diff --git a/src/components/Wizard/CreateVmWizard/providers/vmwareActions.js b/src/components/Wizard/CreateVmWizard/providers/vmwareActions.js
deleted file mode 100644
index 2220903ec..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/vmwareActions.js
+++ /dev/null
@@ -1,184 +0,0 @@
-import { get } from 'lodash';
-
-import { SecretModel, V2VVMwareModel } from '../../../../models';
-import { getImportProviderSecretObject, getDefaultSecretName, getV2VVMwareObject } from './vmwareProviderPod';
-
-import {
-  NAMESPACE_KEY,
-  PROVIDER_STATUS_CONNECTING,
-  PROVIDER_STATUS_CONNECTION_FAILED,
-  PROVIDER_VMWARE_HOSTNAME_KEY,
-  PROVIDER_VMWARE_USER_NAME_KEY,
-  PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY,
-  PROVIDER_VMWARE_USER_PWD_KEY,
-  PROVIDER_VMWARE_CONNECTION,
-} from '../constants';
-
-import { CONNECT_TO_NEW_INSTANCE } from '../strings';
-import { settingsValue, getV2VVmwareName } from '../../../../k8s/selectors';
-import { getName } from '../../../../selectors';
-
-export const onVmwareCheckConnection = async (basicSettings, onChange, k8sCreate) => {
-  // Note: any changes to the dialog since issuing the Check-button action till it's finish will be lost due to tight binding of the onFormChange to basicSettings set at promise creation
-  onChange({ status: PROVIDER_STATUS_CONNECTING });
-
-  const url = settingsValue(basicSettings, PROVIDER_VMWARE_HOSTNAME_KEY);
-  const username = settingsValue(basicSettings, PROVIDER_VMWARE_USER_NAME_KEY);
-  const password = get(
-    settingsValue(basicSettings, PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY),
-    PROVIDER_VMWARE_USER_PWD_KEY
-  );
-  const namespace = settingsValue(basicSettings, NAMESPACE_KEY);
-
-  try {
-    const secretName = `temp-${getDefaultSecretName({ url, username })}-`;
-    const secret = await k8sCreate(
-      SecretModel,
-      getImportProviderSecretObject({
-        url,
-        username,
-        password,
-        namespace,
-        secretName,
-        isTemporary: true, // do not list this temporary secret in the dropdown box
-      })
-    );
-
-    const v2vVmware = await k8sCreate(
-      V2VVMwareModel,
-      getV2VVMwareObject({
-        name: `check-${getDefaultSecretName({ url, username })}-`,
-        namespace,
-        connectionSecretName: getName(secret),
-        isTemporary: true, // remove this object automatically (by controller)
-      })
-    );
-
-    onChange({ V2VVmwareName: getName(v2vVmware), status: PROVIDER_STATUS_CONNECTING }); // still "connecting" here, let content in the "status" of the CR decide otherwise (set by controller)
-  } catch (err) {
-    console.warn('onVmwareCheckConnection(): Check for VMWare credentials failed, reason: ', err); // eslint-disable-line no-console
-    onChange({ status: PROVIDER_STATUS_CONNECTION_FAILED }); // The CR can not be created
-  }
-};
-
-// secret already exists, use it
-export const onVCenterInstanceSelected = async (
-  k8sCreate,
-  valueValidationPair,
-  key,
-  formValid,
-  prevBasicSettings,
-  onFormChange
-) => {
-  // hint: onFormChange = (newValue, key, formValid) => {} to update basicSettings
-  const { value } = valueValidationPair;
-  const connectionSecretName = getName(value);
-  if (!connectionSecretName || connectionSecretName === CONNECT_TO_NEW_INSTANCE) {
-    const removeConnection = () =>
-      onFormChange(
-        // empty the VMs list dropdown
-        {
-          value: {
-            [PROVIDER_VMWARE_CONNECTION]: {
-              V2VVmwareName: '',
-            },
-          },
-        },
-        PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY,
-        formValid
-      );
-    setTimeout(removeConnection, 0);
-    return;
-  }
-
-  const namespace = settingsValue(prevBasicSettings, NAMESPACE_KEY);
-
-  // ATM, Kubernetes does not support deletion of CRs with a gracefulPeriod (delayed deletion).
-  // The only object with this support are PODs.
-  // More info: https://github.com/kubernetes/kubernetes/issues/56567
-  // Workaround: handle garbage collection on our own by:
-  // - set VCENTER_TEMPORARY_LABEL label to 'true'
-  // - controller will set deletionTimestamp label with RFC 3339 timestamp
-  // - controller will remove the object after the timeStamp
-  // - can be easily extended for delaying the deletionTimestamp (recently not needed, so not implemented)
-
-  const v2vVmware = await k8sCreate(
-    V2VVMwareModel,
-    getV2VVMwareObject({
-      name: `v2vvmware-${connectionSecretName}-`,
-      namespace,
-      connectionSecretName,
-      isTemporary: true, // remove this object automatically (by controller)
-    })
-  );
-
-  // reuse PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY for storing reference to the just created V2VVMWare object (onVmwareCheckConnection())
-  onFormChange(
-    {
-      value: {
-        [PROVIDER_VMWARE_CONNECTION]: {
-          V2VVmwareName: getName(v2vVmware),
-          status: PROVIDER_STATUS_CONNECTING, // useless value
-        },
-      },
-    },
-    PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY,
-    formValid
-  );
-};
-
-export const onVCenterVmSelectedConnected = async (
-  k8sCreate,
-  k8sGet,
-  k8sPatch,
-  valueValidationPair,
-  key,
-  formValid,
-  prevBasicSettings,
-  onFormChange
-) => {
-  const { value } = valueValidationPair; // name of VM to be imported
-  const namespace = settingsValue(prevBasicSettings, NAMESPACE_KEY);
-
-  // see onVCenterInstanceSelected()
-  const V2VVmwareName = getV2VVmwareName(prevBasicSettings);
-  const vmName = (value || '').trim();
-
-  try {
-    // The V2VVMWare object can be reused from the VCenterVmsConnected component or re-queried here. The later option helps to minimize conflicts.
-    const v2vvmware = await k8sGet(V2VVMwareModel, V2VVmwareName, namespace);
-
-    // Strategic merge patches seem not to work, so let's do mapping via positional arrays.
-    // Probably not a big deal as the controller is designed to avoid VMs list refresh
-    const index = get(v2vvmware, 'spec.vms', []).findIndex(vm => vm.name === vmName);
-    if (index >= 0) {
-      const patch = [
-        {
-          op: get(v2vvmware, ['spec', 'vms', `[${index}]`, 'detailRequest']) ? 'replace' : 'add',
-          path: `/spec/vms/${index}/detailRequest`,
-          value: true,
-        },
-      ];
-      await k8sPatch(V2VVMwareModel, v2vvmware, patch); // the controller will supply details for the selected VM
-    } else {
-      // eslint-disable-next-line no-console
-      console.warn(
-        'onVCenterVmSelectedConnected: The retrieved V2VVMware object is missing desired VM: "',
-        vmName,
-        '", ',
-        v2vvmware
-      );
-    }
-  } catch (reason) {
-    // TODO: notify user
-    // eslint-disable-next-line no-console
-    console.warn(
-      'onVCenterVmSelectedConnected: Failed to patch the V2VVMWare object to query VM details: "',
-      vmName,
-      '", namespace: "',
-      namespace,
-      '", reason: ',
-      reason
-    );
-  }
-};
diff --git a/src/components/Wizard/CreateVmWizard/providers/vmwareProviderPod.js b/src/components/Wizard/CreateVmWizard/providers/vmwareProviderPod.js
deleted file mode 100644
index 34d75a7f6..000000000
--- a/src/components/Wizard/CreateVmWizard/providers/vmwareProviderPod.js
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Based on V2V Provider Pod manifest.yaml
- */
-
-import { SecretModel, V2VVMwareModel } from '../../../../models';
-import { VCENTER_TYPE_LABEL, VCENTER_TEMPORARY_LABEL } from '../../../../constants';
-
-export const getDefaultSecretName = ({ username, url }) => {
-  if (!url) {
-    throw new Error('VMWare URL can not be empty.');
-  }
-
-  if (!url.startsWith('https://') && !url.startsWith('http://')) {
-    url = `https://${url}`;
-  }
-  const u = new URL(url);
-  const host = u.host || 'nohost';
-
-  username = username || 'nousername';
-  const user = username.replace('@', '-at-');
-  return `${host}-${user}`;
-};
-
-export const getImportProviderSecretObject = ({
-  url,
-  username,
-  password,
-  secretName,
-  namespace,
-  isTemporary = false,
-}) => {
-  const _secretName = secretName || `${getDefaultSecretName({ username, url })}-`;
-  const labels = {
-    [VCENTER_TYPE_LABEL]: 'true',
-  };
-  if (isTemporary) {
-    // if set, the Secret is not listed for selection within the dropdown box and is automatically garbage-collected (by controller)
-    labels[VCENTER_TEMPORARY_LABEL] = 'true'; // will be automatically garbage-collected by the controller
-  }
-
-  const secret = {
-    kind: SecretModel.kind,
-    apiVersion: SecretModel.apiVersion,
-    metadata: {
-      generateName: _secretName,
-      namespace,
-      labels,
-    },
-    type: 'Opaque',
-    data: {
-      username: btoa(username),
-      password: btoa(password),
-      url: btoa(url),
-    },
-  };
-
-  return secret;
-};
-
-export const getV2VVMwareObject = ({ name, namespace, connectionSecretName, isTemporary = false }) => {
-  const labels = {};
-  if (isTemporary) {
-    // if set, the Secret is not listed for selection within the dropdown box and is automatically garbage-collected (by controller)
-    labels[VCENTER_TEMPORARY_LABEL] = 'true'; // will be automatically garbage-collected by the controller
-  }
-
-  return {
-    apiVersion: `${V2VVMwareModel.apiGroup}/${V2VVMwareModel.apiVersion}`,
-    kind: V2VVMwareModel.kind,
-    metadata: {
-      generateName: name,
-      namespace,
-      labels,
-    },
-    spec: {
-      connection: connectionSecretName,
-    },
-  };
-};
diff --git a/src/components/Wizard/CreateVmWizard/stateUpdate/index.js b/src/components/Wizard/CreateVmWizard/stateUpdate/index.js
new file mode 100644
index 000000000..f090936d5
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/stateUpdate/index.js
@@ -0,0 +1 @@
+export * from './stateUpdate';
diff --git a/src/components/Wizard/CreateVmWizard/stateUpdate/networksTabStateUpdate.js b/src/components/Wizard/CreateVmWizard/stateUpdate/networksTabStateUpdate.js
new file mode 100644
index 000000000..fe5c84c60
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/stateUpdate/networksTabStateUpdate.js
@@ -0,0 +1,60 @@
+import { findIndex } from 'lodash';
+
+import { VM_SETTINGS_TAB_KEY, NETWORKS_TAB_KEY, USER_TEMPLATE_KEY } from '../constants';
+import { getTemplateInterfaces, getUserTemplate, hasAutoAttachPodInterface, objectMerge } from '../../../../utils';
+import { podNetwork } from '../initialState/networksTabInitialState';
+import { settingsValue } from '../../../../k8s/selectors';
+import { hasVmSettingsChanged } from '../utils/vmSettingsTabUtils';
+
+export const getNetworksTabStateUpdate = (prevProps, prevState, props, state) => {
+  const networksTabData = state.stepData[NETWORKS_TAB_KEY];
+
+  let resultRows;
+
+  if (hasVmSettingsChanged(prevState, state, USER_TEMPLATE_KEY)) {
+    const rows = networksTabData.value;
+    resultRows = onUserTemplateChanged(prevProps, prevState, props, state, rows);
+  }
+
+  if (!resultRows) {
+    return null;
+  }
+
+  return objectMerge({}, state, {
+    stepData: {
+      [NETWORKS_TAB_KEY]: {
+        ...networksTabData,
+        value: resultRows,
+      },
+    },
+  });
+};
+
+const onUserTemplateChanged = (prevProps, prevState, props, state, oldRows) => {
+  const newUserTemplateName = settingsValue(state.stepData[VM_SETTINGS_TAB_KEY].value, USER_TEMPLATE_KEY);
+  const newUserTemplate = newUserTemplateName ? getUserTemplate(props.templates, newUserTemplateName) : null;
+
+  const withoutDiscardedTemplateNetworks = oldRows.filter(network => !network.templateNetwork);
+
+  const rows = [...withoutDiscardedTemplateNetworks];
+  if (!rows.find(row => row.rootNetwork)) {
+    rows.push(podNetwork);
+  }
+
+  if (newUserTemplate) {
+    const templateInterfaces = getTemplateInterfaces(newUserTemplate);
+    const networks = templateInterfaces.map(i => ({
+      templateNetwork: i,
+    }));
+
+    // do not add root interface if there already is one or autoAttachPodInterface is set to false
+    if (networks.some(network => network.templateNetwork.network.pod) || !hasAutoAttachPodInterface(newUserTemplate)) {
+      const index = findIndex(rows, network => network.rootNetwork);
+      rows.splice(index, 1);
+    }
+
+    rows.push(...networks);
+  }
+
+  return rows;
+};
diff --git a/src/components/Wizard/CreateVmWizard/stateUpdate/providers/prefillVmStateUpdate.js b/src/components/Wizard/CreateVmWizard/stateUpdate/providers/prefillVmStateUpdate.js
new file mode 100644
index 000000000..e01779404
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/stateUpdate/providers/prefillVmStateUpdate.js
@@ -0,0 +1,153 @@
+import { get } from 'lodash';
+
+import {
+  CPU_KEY,
+  DESCRIPTION_KEY,
+  FLAVOR_KEY,
+  MEMORY_KEY,
+  NAME_KEY,
+  NETWORKS_TAB_KEY,
+  OPERATING_SYSTEM_KEY,
+  STORAGE_TAB_KEY,
+  STORAGE_TYPE_EXTERNAL_IMPORT,
+  STORAGE_TYPE_EXTERNAL_V2V_TEMP,
+  STORAGE_TYPE_EXTERNAL_V2V_VDDK,
+  VM_SETTINGS_TAB_KEY,
+} from '../../constants';
+import { getVmwareAttribute } from '../../providers/VMwareImportProvider/selectors';
+import { getVmSettingAttribute } from '../../utils/vmSettingsTabUtils';
+import { PROVIDER_VMWARE_VM_KEY } from '../../providers/VMwareImportProvider/constants';
+import { CONVERSION_POD_TEMP_MOUNT_PATH, CONVERSION_POD_VDDK_MOUNT_PATH } from '../../../../../k8s/requests/v2v';
+import { CUSTOM_FLAVOR } from '../../../../../constants';
+
+/**
+ * Provides mapping from VMWare GuesId to common-templates operating system.
+ *
+ * https://code.vmware.com/docs/4206/vsphere-web-services-api-reference#/doc/vim.vm.GuestOsDescriptor.GuestOsIdentifier.html
+ *
+ * The vmwareToKubevirtOsConfigMap is usually created by the web-ui-operator and can be missing.
+ */
+// update checks done in vmWareStateUpdate
+export const prefilUpdateCreator = (prevProps, prevState, props, state) => {
+  const vm = getVmwareAttribute(state, PROVIDER_VMWARE_VM_KEY, 'vm');
+
+  const vmwareToKubevirtOsConfigMap = getVmwareAttribute(state, PROVIDER_VMWARE_VM_KEY, 'vmwareToKubevirtOsConfigMap');
+
+  const { raw } = vm.detail;
+
+  const parsedVm = JSON.parse(raw);
+
+  const memory = get(parsedVm, ['Config', 'Hardware', 'MemoryMB']);
+  const guestId = get(parsedVm, ['Config', 'GuestId']);
+  const kubevirtId = get(vmwareToKubevirtOsConfigMap, ['data', guestId]);
+  const os = getVmSettingAttribute(state, OPERATING_SYSTEM_KEY, 'operatingSystems', []).find(o => o.id === kubevirtId);
+
+  return {
+    stepData: {
+      [VM_SETTINGS_TAB_KEY]: {
+        value: {
+          [NAME_KEY]: {
+            value: get(parsedVm, ['Config', 'Name']),
+          },
+          [DESCRIPTION_KEY]: {
+            value: get(parsedVm, ['Config', 'Annotation']),
+          },
+          [MEMORY_KEY]: {
+            value: memory ? memory / 1024 : undefined,
+          },
+          [CPU_KEY]: {
+            value: get(parsedVm, ['Config', 'Hardware', 'NumCPU']),
+          },
+          [OPERATING_SYSTEM_KEY]: {
+            value: undefined || os,
+            guestFullName: get(parsedVm, ['Config', 'GuestFullName']),
+          },
+          [FLAVOR_KEY]: {
+            value: CUSTOM_FLAVOR,
+          },
+        },
+      },
+
+      [NETWORKS_TAB_KEY]: {
+        value: getNics(parsedVm),
+      },
+      [STORAGE_TAB_KEY]: {
+        value: getDisks(parsedVm),
+      },
+    },
+  };
+};
+
+export const getNics = parsedVm => {
+  const devices = get(parsedVm, ['Config', 'Hardware', 'Device']);
+
+  // If the device is a network card, it has "MacAddress" present
+  // Source:
+  //   - https://www.vmware.com/support/developer/converter-sdk/conv50_apireference/vim.vm.device.VirtualDevice.BackingInfo.html
+  //   - https://www.vmware.com/support/developer/converter-sdk/conv50_apireference/vim.vm.device.VirtualDevice.html
+  const networkDevices = (devices || []).filter(device => device.hasOwnProperty('MacAddress'));
+  return networkDevices.map(device => ({
+    name: get(device, ['DeviceInfo', 'Label']),
+    mac: device.MacAddress,
+    id: device.Key, // TODO: verify once the Conversion pod is implemented
+  }));
+};
+
+export const getDisks = parsedVm => {
+  const devices = get(parsedVm, ['Config', 'Hardware', 'Device']);
+
+  // if the device is a disk, it has "capacityInKB" present
+  // Alternatively:
+  //   diskObjectId - since vSphere API 5.5
+  //   capacityInBytes - since vSphere API 5.5
+  //   capacityInKB - deprecated since vSphere API 5.5
+  // https://www.vmware.com/support/developer/converter-sdk/conv50_apireference/vim.vm.device.VirtualDisk.html
+  // TODO: what about CDROM, Floppy, VirtualSCSIPassthrough,
+  const diskDevices = (devices || []).filter(
+    device => device.hasOwnProperty('CapacityInKB') || device.hasOwnProperty('CapacityInBytes')
+  );
+
+  const diskRows = diskDevices.map((device, idx) => {
+    const capacityKib = device.CapacityInBytes / 1024 || device.CapacityInKB;
+
+    return {
+      id: idx,
+      storageType: STORAGE_TYPE_EXTERNAL_IMPORT,
+      name: get(device, ['DeviceInfo', 'Label']),
+      size: capacityKib / (1024 * 1024),
+      storageClass: undefined, // Let the user select proper mapping
+      isBootable: idx === 0, // TODO get and set the real boot order
+      data: {
+        fileName: get(device, ['Backing', 'FileName']),
+        mountPath: `/data/vm/disk${idx + 1}`, // hardcoded
+      },
+    };
+  });
+
+  // temp disk needed for conversion pod
+  diskRows.push({
+    id: diskRows.length,
+    storageType: STORAGE_TYPE_EXTERNAL_V2V_TEMP,
+    name: 'v2v-conversion-temp',
+    size: 2,
+    storageClass: undefined,
+    data: {
+      mountPath: CONVERSION_POD_TEMP_MOUNT_PATH,
+    },
+  });
+
+  // TODO: make vddk configurable or move setup to somewhere else
+  // vddk pvc must be present in the same namespace as the VM
+  diskRows.push({
+    editable: false,
+    id: diskRows.length,
+    storageType: STORAGE_TYPE_EXTERNAL_V2V_VDDK,
+    name: 'vddk-pvc',
+    storageClass: undefined,
+    data: {
+      mountPath: CONVERSION_POD_VDDK_MOUNT_PATH,
+    },
+  });
+
+  return diskRows;
+};
diff --git a/src/components/Wizard/CreateVmWizard/stateUpdate/providers/vmWareStateUpdate.js b/src/components/Wizard/CreateVmWizard/stateUpdate/providers/vmWareStateUpdate.js
new file mode 100644
index 000000000..e81150366
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/stateUpdate/providers/vmWareStateUpdate.js
@@ -0,0 +1,386 @@
+import { get } from 'lodash';
+
+import {
+  VM_SETTINGS_TAB_KEY,
+  DESCRIPTION_KEY,
+  FLAVOR_KEY,
+  NAME_KEY,
+  NAMESPACE_KEY,
+  OPERATING_SYSTEM_KEY,
+  PROVIDER_KEY,
+  PROVIDERS_DATA_KEY,
+  PROVISION_SOURCE_TYPE_KEY,
+  USE_CLOUD_INIT_KEY,
+  WORKLOAD_PROFILE_KEY,
+  MEMORY_KEY,
+  CPU_KEY,
+} from '../../constants';
+import { objectMerge } from '../../../../../utils/utils';
+import { startV2VVMWareController } from '../../../../../k8s/requests/v2v';
+import { getName } from '../../../../../selectors';
+import { EnhancedK8sMethods } from '../../../../../k8s/util';
+import { cleanupAndGetResults, errorsFirstSort } from '../../../../../k8s/util/k8sMethodsUtils';
+import {
+  getVmwareAttribute,
+  getVmwareField,
+  getVmwareValue,
+  hasVmWareSettingsChanged,
+  hasVmWareSettingsValuesChanged,
+  isVmwareNewInstanceSecret,
+  isVmwareProvider,
+} from '../../providers/VMwareImportProvider/selectors';
+import {
+  asDisabled,
+  asHidden,
+  asRequired,
+  getVmSettingValue,
+  hasVmSettingsChanged,
+  VMWARE_PROVIDER_METADATA_ID,
+} from '../../utils/vmSettingsTabUtils';
+import {
+  PROVIDER_VMWARE,
+  PROVIDER_VMWARE_CHECK_CONNECTION_KEY,
+  PROVIDER_VMWARE_HOSTNAME_KEY,
+  PROVIDER_VMWARE_V2V_NAME_KEY,
+  PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY,
+  PROVIDER_VMWARE_STATUS_KEY,
+  PROVIDER_VMWARE_USER_NAME_KEY,
+  PROVIDER_VMWARE_USER_PASSWORD_KEY,
+  PROVIDER_VMWARE_VCENTER_KEY,
+  PROVIDER_VMWARE_VM_KEY,
+} from '../../providers/VMwareImportProvider/constants';
+import { vmSettingsCreator } from '../vmSettingsTabStateUpdate';
+import {
+  createV2VvmwareObject,
+  createV2VvmwareObjectWithSecret,
+} from '../../../../../k8s/requests/v2v/createV2VvmwareObject';
+import { requestVmDetail } from '../../../../../k8s/requests/v2v/requestVmDetail';
+import { prefilUpdateCreator } from './prefillVmStateUpdate';
+import { getSimpleV2vVMwareStatus } from '../../../../../utils/status/v2vVMware/v2vVMwareStatus';
+import { V2V_WMWARE_STATUS_ALL_OK, V2V_WMWARE_STATUS_UNKNOWN } from '../../../../../utils/status/v2vVMware';
+
+const { info, warn, error } = console;
+
+export const vmWareSettingsCreator = updateCreator => (...args) => {
+  const update = updateCreator(...args);
+  return (
+    update && {
+      stepData: {
+        [VM_SETTINGS_TAB_KEY]: {
+          value: {
+            [PROVIDERS_DATA_KEY]: {
+              [PROVIDER_VMWARE]: update,
+            },
+          },
+        },
+      },
+    }
+  );
+};
+
+export const getVmwareProviderStateUpdate = (prevProps, prevState, props, state, extra) =>
+  [
+    ...[providerUpdateCreator].map(creator => vmSettingsCreator(creator)),
+    ...[
+      secretUpdateCreator,
+      secretValueUpdateCreator,
+      checkConnectionUpdateCreator,
+      vmwareNameChangedUpdateCreator,
+      vmChangedUpdateCreator,
+    ].map(creator => vmWareSettingsCreator(creator)),
+    vmLoadedUpdateCreator,
+  ].reduce((intermediaryState, updater) => {
+    const update = updater && updater(prevProps, prevState, props, intermediaryState, extra);
+    return update && update !== intermediaryState ? objectMerge({}, intermediaryState, update) : intermediaryState;
+  }, state);
+
+export const providerUpdateCreator = (prevProps, prevState, props, state) => {
+  if (
+    !(
+      hasVmSettingsChanged(prevState, state, PROVISION_SOURCE_TYPE_KEY, PROVIDER_KEY, NAMESPACE_KEY) ||
+      hasVmWareSettingsChanged(prevState, state, PROVIDER_VMWARE_STATUS_KEY)
+    )
+  ) {
+    return null;
+  }
+
+  const namespace = getVmSettingValue(state, NAMESPACE_KEY);
+  const selectedVm = getVmwareValue(state, PROVIDER_VMWARE_VM_KEY);
+  const status = getVmwareValue(state, PROVIDER_VMWARE_STATUS_KEY);
+
+  const hasVM = !!selectedVm;
+  const isVmWareProvider = isVmwareProvider(state);
+  const isOkStatus = V2V_WMWARE_STATUS_ALL_OK.includes(status);
+
+  const hiddenMetadata = {
+    isHidden: asHidden(!isVmWareProvider, VMWARE_PROVIDER_METADATA_ID),
+    isDisabled: asDisabled(!namespace, VMWARE_PROVIDER_METADATA_ID),
+  };
+
+  const requiredMetadata = {
+    ...hiddenMetadata,
+    isRequired: asRequired(isVmWareProvider, VMWARE_PROVIDER_METADATA_ID),
+  };
+
+  const isEditingDisabled = isVmWareProvider && (!hasVM || !isOkStatus);
+  const needsValuesReset = isVmWareProvider && !hasVM;
+
+  if (namespace && isVmWareProvider) {
+    startV2VVMWareControllerWithCleanup(props, { namespace }); // fire side effect
+  }
+
+  const vmFieldUpdate = {
+    isDisabled: asDisabled(isEditingDisabled, VMWARE_PROVIDER_METADATA_ID),
+    value: needsValuesReset ? null : undefined,
+  };
+
+  return {
+    [NAME_KEY]: vmFieldUpdate,
+    [DESCRIPTION_KEY]: vmFieldUpdate,
+    [OPERATING_SYSTEM_KEY]: vmFieldUpdate,
+    [FLAVOR_KEY]: vmFieldUpdate,
+    [MEMORY_KEY]: vmFieldUpdate,
+    [CPU_KEY]: vmFieldUpdate,
+    [WORKLOAD_PROFILE_KEY]: vmFieldUpdate,
+    [USE_CLOUD_INIT_KEY]: vmFieldUpdate,
+    [PROVIDERS_DATA_KEY]: {
+      [PROVIDER_VMWARE]: {
+        [PROVIDER_VMWARE_VCENTER_KEY]: requiredMetadata,
+        [PROVIDER_VMWARE_HOSTNAME_KEY]: hiddenMetadata,
+        [PROVIDER_VMWARE_USER_NAME_KEY]: hiddenMetadata,
+        [PROVIDER_VMWARE_USER_PASSWORD_KEY]: hiddenMetadata,
+        [PROVIDER_VMWARE_CHECK_CONNECTION_KEY]: hiddenMetadata,
+        [PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY]: hiddenMetadata,
+        [PROVIDER_VMWARE_VM_KEY]: {
+          isHidden: asHidden(!isVmWareProvider, VMWARE_PROVIDER_METADATA_ID),
+          isRequired: asRequired(isVmWareProvider, VMWARE_PROVIDER_METADATA_ID),
+          isDisabled: asDisabled(!isOkStatus, VMWARE_PROVIDER_METADATA_ID),
+        },
+        [PROVIDER_VMWARE_STATUS_KEY]: {
+          isHidden: asHidden(
+            !isVmWareProvider || [...V2V_WMWARE_STATUS_ALL_OK, V2V_WMWARE_STATUS_UNKNOWN].includes(status),
+            VMWARE_PROVIDER_METADATA_ID
+          ),
+        },
+      },
+    },
+  };
+};
+
+export const secretUpdateCreator = (prevProps, prevState, props, state, extra) => {
+  if (
+    !hasVmWareSettingsChanged(
+      prevState,
+      state,
+      PROVIDER_VMWARE_VCENTER_KEY,
+      PROVIDER_VMWARE_HOSTNAME_KEY,
+      PROVIDER_VMWARE_USER_NAME_KEY,
+      PROVIDER_VMWARE_USER_PASSWORD_KEY
+    )
+  ) {
+    return null;
+  }
+
+  const isNewInstanceSecret = isVmwareNewInstanceSecret(state);
+
+  const hasPrerequisiteValues =
+    isNewInstanceSecret &&
+    getVmwareValue(state, PROVIDER_VMWARE_HOSTNAME_KEY) &&
+    getVmwareValue(state, PROVIDER_VMWARE_USER_NAME_KEY) &&
+    getVmwareValue(state, PROVIDER_VMWARE_USER_PASSWORD_KEY);
+
+  const hiddenMetadata = {
+    isHidden: asHidden(!isNewInstanceSecret, PROVIDER_VMWARE_VCENTER_KEY),
+  };
+
+  const metadata = {
+    ...hiddenMetadata,
+    isRequired: asRequired(isNewInstanceSecret, PROVIDER_VMWARE_VCENTER_KEY),
+  };
+
+  return {
+    [PROVIDER_VMWARE_HOSTNAME_KEY]: metadata,
+    [PROVIDER_VMWARE_USER_NAME_KEY]: metadata,
+    [PROVIDER_VMWARE_USER_PASSWORD_KEY]: metadata,
+    [PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY]: hiddenMetadata,
+    [PROVIDER_VMWARE_CHECK_CONNECTION_KEY]: {
+      ...hiddenMetadata,
+      isDisabled: asDisabled(!hasPrerequisiteValues, PROVIDER_VMWARE_VCENTER_KEY),
+    },
+  };
+};
+
+export const secretValueUpdateCreator = (prevProps, prevState, props, state, extra) => {
+  if (!hasVmWareSettingsValuesChanged(prevState, state, PROVIDER_VMWARE_VCENTER_KEY)) {
+    return null;
+  }
+
+  const connectionSecretName = getVmwareValue(state, PROVIDER_VMWARE_VCENTER_KEY);
+  const isNewInstanceSecret = isVmwareNewInstanceSecret(state);
+
+  if (!isNewInstanceSecret && connectionSecretName) {
+    // side effect
+    createConnectionObjects(
+      props,
+      {
+        namespace: getVmSettingValue(state, NAMESPACE_KEY),
+        connectionSecretName,
+      },
+      extra
+    );
+  }
+
+  return {
+    [PROVIDER_VMWARE_V2V_NAME_KEY]: isNewInstanceSecret || !connectionSecretName ? null : undefined,
+  };
+};
+
+export const checkConnectionUpdateCreator = (prevProps, prevState, props, state, extra) => {
+  const oldConnect = !!getVmwareValue(prevState, PROVIDER_VMWARE_CHECK_CONNECTION_KEY);
+  const connect = !!getVmwareValue(state, PROVIDER_VMWARE_CHECK_CONNECTION_KEY);
+  if (oldConnect || !connect) {
+    // oldConnect is still pending
+    return null;
+  }
+
+  const metadata = { isDisabled: asDisabled(true, PROVIDER_VMWARE_CHECK_CONNECTION_KEY) };
+  const afterMetadata = { isDisabled: asDisabled(false, PROVIDER_VMWARE_CHECK_CONNECTION_KEY) };
+
+  const afterData = {
+    [PROVIDER_VMWARE_CHECK_CONNECTION_KEY]: afterMetadata,
+    [PROVIDER_VMWARE_HOSTNAME_KEY]: afterMetadata,
+    [PROVIDER_VMWARE_USER_NAME_KEY]: afterMetadata,
+    [PROVIDER_VMWARE_USER_PASSWORD_KEY]: afterMetadata,
+    [PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY]: afterMetadata,
+    [PROVIDER_VMWARE_CHECK_CONNECTION_KEY]: {
+      ...afterMetadata,
+      value: false, // must be here if the update completes before this return
+    },
+  };
+
+  // side effect
+  createConnectionObjects(
+    props,
+    {
+      namespace: getVmSettingValue(state, NAMESPACE_KEY),
+      url: getVmwareValue(state, PROVIDER_VMWARE_HOSTNAME_KEY),
+      username: getVmwareValue(state, PROVIDER_VMWARE_USER_NAME_KEY),
+      password: getVmwareValue(state, PROVIDER_VMWARE_USER_PASSWORD_KEY),
+    },
+    extra,
+    afterData
+  );
+
+  return {
+    [PROVIDER_VMWARE_CHECK_CONNECTION_KEY]: {
+      ...metadata,
+      value: false,
+    },
+    [PROVIDER_VMWARE_STATUS_KEY]: {
+      value: getSimpleV2vVMwareStatus(null, { isConnecting: true }),
+    },
+    [PROVIDER_VMWARE_HOSTNAME_KEY]: metadata,
+    [PROVIDER_VMWARE_USER_NAME_KEY]: metadata,
+    [PROVIDER_VMWARE_USER_PASSWORD_KEY]: metadata,
+    [PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY]: metadata,
+    [PROVIDER_VMWARE_CHECK_CONNECTION_KEY]: metadata,
+  };
+};
+
+export const vmwareNameChangedUpdateCreator = (prevProps, prevState, props, state) => {
+  if (!hasVmWareSettingsChanged(prevState, state, PROVIDER_VMWARE_V2V_NAME_KEY)) {
+    return null;
+  }
+
+  const v2vName = getVmwareField(state, PROVIDER_VMWARE_V2V_NAME_KEY);
+
+  return {
+    [PROVIDER_VMWARE_VM_KEY]: {
+      isDisabled: asDisabled(!v2vName, PROVIDER_VMWARE_VM_KEY),
+    },
+  };
+};
+
+export const vmChangedUpdateCreator = (prevProps, prevState, props, state, extra) => {
+  if (!hasVmWareSettingsValuesChanged(prevState, state, PROVIDER_VMWARE_VM_KEY)) {
+    return null;
+  }
+
+  const params = {
+    namespace: getVmSettingValue(state, NAMESPACE_KEY),
+    v2vwmwareName: getVmwareField(state, PROVIDER_VMWARE_V2V_NAME_KEY),
+    vmName: getVmwareValue(state, PROVIDER_VMWARE_VM_KEY),
+  };
+
+  requestVmDetails(props, params); // side effect
+
+  return null;
+};
+
+export const vmLoadedUpdateCreator = (prevProps, prevState, props, state, extra) => {
+  const vmName = getVmwareValue(state, PROVIDER_VMWARE_VM_KEY);
+  const vm = getVmwareAttribute(state, PROVIDER_VMWARE_VM_KEY, 'vm');
+  const prevVm = getVmwareAttribute(prevState, PROVIDER_VMWARE_VM_KEY, 'vm');
+
+  if (!vm || vm.name !== vmName || get(prevVm, 'name') === get(vm, 'name')) {
+    return null;
+  }
+
+  return prefilUpdateCreator(prevProps, prevState, props, state, extra);
+};
+
+const requestVmDetails = (props, params) => {
+  info('requesting vm detail');
+  requestVmDetail(params, props).catch(reason => {
+    // eslint-disable-next-line no-console
+    console.warn(
+      'onVCenterVmSelectedConnected: Failed to patch the V2VVMWare object to query VM details: ',
+      params,
+      ', reason: ',
+      reason
+    );
+  });
+};
+
+const setVmWareData = (safeSetState, vmWareData) =>
+  safeSetState(state => objectMerge({}, state, vmWareSettingsCreator(() => vmWareData)()));
+
+const createConnectionObjects = (props, params, { safeSetState }, afterData) => {
+  const create = params.connectionSecretName ? createV2VvmwareObject : createV2VvmwareObjectWithSecret;
+
+  info('creating v2vvmware object');
+  create(params, props)
+    .then(v2vVmware =>
+      setVmWareData(safeSetState, {
+        ...afterData,
+        [PROVIDER_VMWARE_STATUS_KEY]: {
+          // still "connecting" here, let content in the "status" of the CR decide otherwise (set by controller)
+          value: getSimpleV2vVMwareStatus(null, { isConnecting: true }),
+        },
+        [PROVIDER_VMWARE_V2V_NAME_KEY]: getName(v2vVmware),
+      })
+    )
+    .catch(err => {
+      warn('onVmwareCheckConnection(): Check for VMWare credentials failed, reason: ', err);
+      setVmWareData(safeSetState, {
+        ...afterData,
+        [PROVIDER_VMWARE_STATUS_KEY]: {
+          // The CR can not be created
+          value: getSimpleV2vVMwareStatus(null, { hasConnectionFailed: true }),
+        },
+      });
+    });
+};
+
+const startV2VVMWareControllerWithCleanup = (props, { namespace }) => {
+  const enhancedK8sMethods = new EnhancedK8sMethods(props);
+
+  startV2VVMWareController({ namespace }, enhancedK8sMethods)
+    .catch(e =>
+      // eslint-disable-next-line promise/no-nesting
+      cleanupAndGetResults(enhancedK8sMethods, e).then(({ results }) =>
+        errorsFirstSort(results).forEach(o => warn(o.title, o.content))
+      )
+    )
+    .catch(le => error(le));
+};
diff --git a/src/components/Wizard/CreateVmWizard/stateUpdate/stateUpdate.js b/src/components/Wizard/CreateVmWizard/stateUpdate/stateUpdate.js
new file mode 100644
index 000000000..2a5b9c8fb
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/stateUpdate/stateUpdate.js
@@ -0,0 +1,21 @@
+import { VM_SETTINGS_TAB_KEY, NETWORKS_TAB_KEY, STORAGE_TAB_KEY } from '../constants';
+import { getVmSettingsTabStateUpdate } from './vmSettingsTabStateUpdate';
+import { getNetworksTabStateUpdate } from './networksTabStateUpdate';
+import { geStorageTabStateUpdate } from './storageTabStateUpdate';
+
+const stateUpdateGetterResolver = {
+  [VM_SETTINGS_TAB_KEY]: getVmSettingsTabStateUpdate,
+  [NETWORKS_TAB_KEY]: getNetworksTabStateUpdate,
+  [STORAGE_TAB_KEY]: geStorageTabStateUpdate,
+};
+
+export const getUpdatedState = (tabKey, prevProps, prevState, props, state, extra) => {
+  const updateGetter = stateUpdateGetterResolver[tabKey];
+
+  let update;
+  if (updateGetter) {
+    update = updateGetter(prevProps, prevState, props, state, extra);
+  }
+
+  return update;
+};
diff --git a/src/components/Wizard/CreateVmWizard/stateUpdate/storageTabStateUpdate.js b/src/components/Wizard/CreateVmWizard/stateUpdate/storageTabStateUpdate.js
new file mode 100644
index 000000000..f62d9fdaa
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/stateUpdate/storageTabStateUpdate.js
@@ -0,0 +1,123 @@
+import {
+  VM_SETTINGS_TAB_KEY,
+  PROVISION_SOURCE_TYPE_KEY,
+  STORAGE_TAB_KEY,
+  STORAGE_TYPE_CONTAINER,
+  STORAGE_TYPE_DATAVOLUME,
+  USER_TEMPLATE_KEY,
+} from '../constants';
+import { getTemplateStorages, getUserTemplate, objectMerge } from '../../../../utils';
+import {
+  PROVISION_SOURCE_CLONED_DISK,
+  PROVISION_SOURCE_CONTAINER,
+  PROVISION_SOURCE_IMPORT,
+  PROVISION_SOURCE_PXE,
+  PROVISION_SOURCE_URL,
+} from '../../../../constants';
+import { settingsValue } from '../../../../k8s/selectors';
+import { hasVmSettingsChanged } from '../utils/vmSettingsTabUtils';
+
+// left intentionally empty
+const TEMPLATE_ROOT_STORAGE = {};
+
+const rootDisk = {
+  rootStorage: {},
+  name: 'rootdisk',
+  isBootable: true,
+};
+export const rootContainerDisk = {
+  ...rootDisk,
+  storageType: STORAGE_TYPE_CONTAINER,
+};
+export const rootDataVolumeDisk = {
+  ...rootDisk,
+  storageType: STORAGE_TYPE_DATAVOLUME,
+  size: 10,
+};
+const getInitialDisk = provisionSource => {
+  switch (provisionSource) {
+    case PROVISION_SOURCE_URL:
+      return rootDataVolumeDisk;
+    case PROVISION_SOURCE_CONTAINER:
+      return rootContainerDisk;
+    case PROVISION_SOURCE_PXE:
+    case PROVISION_SOURCE_CLONED_DISK:
+    case PROVISION_SOURCE_IMPORT:
+      return null;
+    default:
+      // eslint-disable-next-line
+      console.warn(`Unknown provision source ${provisionSource}`);
+      return null;
+  }
+};
+
+export const geStorageTabStateUpdate = (prevProps, prevState, props, state) => {
+  const storageTabData = state.stepData[STORAGE_TAB_KEY];
+
+  let resultRows;
+
+  if (hasVmSettingsChanged(prevState, state, USER_TEMPLATE_KEY)) {
+    const rows = storageTabData.value;
+    resultRows = onUserTemplateChanged(prevProps, prevState, props, state, rows);
+  }
+
+  if (hasVmSettingsChanged(prevState, state, PROVISION_SOURCE_TYPE_KEY)) {
+    const rows = storageTabData.value;
+    resultRows = onProvisionSourceTypeChanged(prevProps, prevState, props, state, resultRows || rows);
+  }
+
+  if (!resultRows) {
+    return null;
+  }
+
+  return objectMerge({}, state, {
+    stepData: {
+      [STORAGE_TAB_KEY]: {
+        ...storageTabData,
+        value: resultRows,
+      },
+    },
+  });
+};
+
+const onUserTemplateChanged = (prevProps, prevState, props, state, oldRows) => {
+  const vmSettings = state.stepData[VM_SETTINGS_TAB_KEY].value;
+  const { dataVolumes } = props;
+
+  const newUserTemplateName = settingsValue(vmSettings, USER_TEMPLATE_KEY);
+  const newUserTemplate = newUserTemplateName ? getUserTemplate(props.templates, newUserTemplateName) : null;
+
+  const withoutDiscardedTemplateStorage = oldRows.filter(storage => !(storage.templateStorage || storage.rootStorage));
+
+  const rows = [...withoutDiscardedTemplateStorage];
+
+  if (newUserTemplate) {
+    const templateStorages = getTemplateStorages(newUserTemplate, dataVolumes).map(storage => ({
+      templateStorage: storage,
+      rootStorage: storage.disk.bootOrder === 1 ? TEMPLATE_ROOT_STORAGE : undefined,
+    }));
+    rows.push(...templateStorages);
+  } else {
+    const storage = getInitialDisk(settingsValue(vmSettings, PROVISION_SOURCE_TYPE_KEY));
+    if (storage) {
+      rows.push(storage);
+    }
+  }
+
+  return rows;
+};
+
+const onProvisionSourceTypeChanged = (prevProps, prevState, props, state, oldRows) => {
+  const filteredStorage = oldRows.filter(storage => storage.templateStorage || !storage.rootStorage);
+
+  const rows = [...filteredStorage];
+  const vmSettings = state.stepData[VM_SETTINGS_TAB_KEY].value;
+
+  if (!settingsValue(vmSettings, USER_TEMPLATE_KEY)) {
+    const storage = getInitialDisk(settingsValue(vmSettings, PROVISION_SOURCE_TYPE_KEY));
+    if (storage) {
+      rows.push(storage);
+    }
+  }
+  return rows;
+};
diff --git a/src/components/Wizard/CreateVmWizard/stateUpdate/vmSettingsTabStateUpdate.js b/src/components/Wizard/CreateVmWizard/stateUpdate/vmSettingsTabStateUpdate.js
new file mode 100644
index 000000000..854849743
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/stateUpdate/vmSettingsTabStateUpdate.js
@@ -0,0 +1,352 @@
+import { get, isEqual } from 'lodash';
+
+import { getProviders, getProviderStateUpdater } from '../providers';
+import {
+  CUSTOM_FLAVOR,
+  PROVISION_SOURCE_CONTAINER,
+  PROVISION_SOURCE_IMPORT,
+  PROVISION_SOURCE_URL,
+  TEMPLATE_TYPE_VM,
+} from '../../../../constants';
+import {
+  selectVm,
+  getFlavors,
+  getOperatingSystems,
+  getTemplateFlavors,
+  getTemplateOperatingSystems,
+  getTemplateWorkloadProfiles,
+  getWorkloadProfiles,
+} from '../../../../k8s/selectors';
+import { getCloudInitUserData, getCpu, getMemory, getName } from '../../../../selectors';
+import { objectMerge } from '../../../../utils/utils';
+import { getTemplateProvisionSource, getTemplate } from '../../../../utils';
+
+import {
+  AUTHKEYS_KEY,
+  CLOUD_INIT_CUSTOM_SCRIPT_KEY,
+  CONTAINER_IMAGE_KEY,
+  CPU_KEY,
+  FLAVOR_KEY,
+  HOST_NAME_KEY,
+  IMAGE_URL_KEY,
+  MEMORY_KEY,
+  NAMESPACE_KEY,
+  OPERATING_SYSTEM_KEY,
+  PROVIDER_KEY,
+  PROVISION_SOURCE_TYPE_KEY,
+  START_VM_KEY,
+  USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY,
+  USE_CLOUD_INIT_KEY,
+  USER_TEMPLATE_KEY,
+  VM_SETTINGS_TAB_KEY,
+  WORKLOAD_PROFILE_KEY,
+} from '../constants';
+import {
+  asDisabled,
+  asHidden,
+  asRequired,
+  asValueObject,
+  hasVmSettingsChanged,
+  getVmSettingAttribute,
+  getVmSettingValue,
+  didPropChange,
+} from '../utils/vmSettingsTabUtils';
+
+// TODO: rather manage with immutable/redux/saga
+export const getVmSettingsTabStateUpdate = (prevProps, prevState, props, state, extra) =>
+  [
+    ...getProviders().map(provider => getProviderStateUpdater(provider)),
+    ...[
+      selectedNamespaceUpdateCreator,
+      useCloudInitUpdateCreator,
+      useCloudInitCustomScriptUpdateCreator,
+      selectedUserTemplateUpdateCreator,
+      provisioningSourceUpdateCreator,
+      providerUpdateCreator,
+      userTemplateUpdateCreator,
+      templatesDataUpdateCreator,
+      flavorUpdateCreator,
+    ].map(creator => vmSettingsCreator(creator)),
+  ].reduce((intermediaryState, updater) => {
+    const update = updater && updater(prevProps, prevState, props, intermediaryState, extra);
+    return update && update !== intermediaryState ? objectMerge({}, intermediaryState, update) : intermediaryState;
+  }, state);
+
+export const vmSettingsCreator = updateCreator => (...args) => {
+  const update = updateCreator(...args);
+  return (
+    update && {
+      stepData: {
+        [VM_SETTINGS_TAB_KEY]: {
+          value: update,
+        },
+      },
+    }
+  );
+};
+
+export const selectedNamespaceUpdateCreator = (prevProps, prevState, props, state) => {
+  if (!didPropChange(prevProps, props, 'selectedNamespace', getName)) {
+    return null;
+  }
+
+  const selectedNamespaceName = getName(props.selectedNamespace);
+  const hasNamespace = !!selectedNamespaceName;
+
+  return {
+    [NAMESPACE_KEY]: {
+      value: hasNamespace ? selectedNamespaceName : undefined,
+      isHidden: asHidden(hasNamespace, 'SELECTED_NAMESPACE'),
+    },
+  };
+};
+
+export const flavorUpdateCreator = (prevProps, prevState, props, state) => {
+  if (!hasVmSettingsChanged(prevState, state, FLAVOR_KEY)) {
+    return null;
+  }
+  const flavor = getVmSettingValue(state, FLAVOR_KEY);
+  const flavors = getVmSettingAttribute(state, FLAVOR_KEY, 'flavors', []);
+
+  const isHidden = asHidden(flavor !== CUSTOM_FLAVOR, FLAVOR_KEY);
+  const isRequired = asRequired(flavor === CUSTOM_FLAVOR, FLAVOR_KEY);
+
+  const update = {
+    [MEMORY_KEY]: {
+      isHidden,
+      isRequired,
+    },
+    [CPU_KEY]: {
+      isHidden,
+      isRequired,
+    },
+    [FLAVOR_KEY]: {
+      isDisabled: asDisabled(flavors.length <= 1),
+    },
+  };
+
+  if (flavors.length === 1) {
+    const [firstFlavor] = flavors;
+    update[FLAVOR_KEY].value = firstFlavor;
+  }
+  return update;
+};
+
+export const provisioningSourceUpdateCreator = (prevProps, prevState, props, state) => {
+  if (!hasVmSettingsChanged(prevState, state, PROVISION_SOURCE_TYPE_KEY)) {
+    return null;
+  }
+  const source = getVmSettingValue(state, PROVISION_SOURCE_TYPE_KEY);
+  const isContainer = source === PROVISION_SOURCE_CONTAINER;
+  const isUrl = source === PROVISION_SOURCE_URL;
+  const isImport = source === PROVISION_SOURCE_IMPORT;
+
+  return {
+    [CONTAINER_IMAGE_KEY]: {
+      value: isUrl ? null : undefined,
+      isRequired: asRequired(isContainer, PROVISION_SOURCE_TYPE_KEY),
+      isHidden: asHidden(!isContainer, PROVISION_SOURCE_TYPE_KEY),
+    },
+    [IMAGE_URL_KEY]: {
+      value: isContainer ? null : undefined,
+      isRequired: asRequired(isUrl, PROVISION_SOURCE_TYPE_KEY),
+      isHidden: asHidden(!isUrl, PROVISION_SOURCE_TYPE_KEY),
+    },
+    [PROVIDER_KEY]: {
+      value: isImport ? undefined : null,
+      isRequired: asRequired(isImport, PROVISION_SOURCE_TYPE_KEY),
+      isHidden: asHidden(!isImport, PROVISION_SOURCE_TYPE_KEY),
+    },
+    [USER_TEMPLATE_KEY]: {
+      value: isImport ? null : undefined,
+      isHidden: asHidden(isImport, PROVISION_SOURCE_TYPE_KEY),
+    },
+    [START_VM_KEY]: {
+      value: isImport ? false : undefined,
+      isHidden: asHidden(isImport, PROVISION_SOURCE_TYPE_KEY),
+    },
+  };
+};
+
+const providerUpdateCreator = (prevProps, prevState, props, state) => {
+  if (!hasVmSettingsChanged(prevState, state, PROVISION_SOURCE_TYPE_KEY, NAMESPACE_KEY)) {
+    return null;
+  }
+
+  const isDisabled =
+    getVmSettingValue(state, PROVISION_SOURCE_TYPE_KEY) === PROVISION_SOURCE_IMPORT &&
+    !getVmSettingValue(state, NAMESPACE_KEY);
+
+  return {
+    [PROVIDER_KEY]: {
+      isDisabled: asDisabled(isDisabled, PROVIDER_KEY),
+    },
+  };
+};
+
+export const userTemplateUpdateCreator = (prevProps, prevState, props, state) => {
+  if (!hasVmSettingsChanged(prevState, state, USER_TEMPLATE_KEY)) {
+    return null;
+  }
+
+  const userTemplate = getVmSettingValue(state, USER_TEMPLATE_KEY);
+
+  const isDisabled = asDisabled(userTemplate != null, USER_TEMPLATE_KEY);
+  return {
+    [PROVISION_SOURCE_TYPE_KEY]: { isDisabled },
+    [CONTAINER_IMAGE_KEY]: { isDisabled },
+    [IMAGE_URL_KEY]: { isDisabled },
+    [OPERATING_SYSTEM_KEY]: { isDisabled },
+    [WORKLOAD_PROFILE_KEY]: { isDisabled },
+  };
+};
+
+export const useCloudInitUpdateCreator = (prevProps, prevState, props, state) => {
+  if (!hasVmSettingsChanged(prevState, state, USE_CLOUD_INIT_KEY)) {
+    return null;
+  }
+
+  const useCloudInit = getVmSettingValue(state, USE_CLOUD_INIT_KEY);
+  const isHidden = asHidden(!useCloudInit, USE_CLOUD_INIT_KEY);
+  const resetValue = !useCloudInit ? null : undefined;
+  return {
+    [USE_CLOUD_INIT_KEY]: { value: useCloudInit },
+    [USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY]: { isHidden, value: !useCloudInit ? false : undefined },
+    [HOST_NAME_KEY]: { isHidden, value: resetValue },
+    [AUTHKEYS_KEY]: { isHidden, value: resetValue },
+    [CLOUD_INIT_CUSTOM_SCRIPT_KEY]: { isHidden, value: resetValue },
+  };
+};
+
+export const useCloudInitCustomScriptUpdateCreator = (prevProps, prevState, props, state) => {
+  if (!hasVmSettingsChanged(prevState, state, USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY)) {
+    return null;
+  }
+
+  const useCloudInitCustomScript = getVmSettingValue(state, USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY);
+  const isHidden = asHidden(useCloudInitCustomScript, USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY);
+  const resetValue = useCloudInitCustomScript ? null : undefined;
+  return {
+    [USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY]: { value: useCloudInitCustomScript },
+    [HOST_NAME_KEY]: { isHidden, value: resetValue },
+    [AUTHKEYS_KEY]: { isHidden, value: resetValue },
+    [CLOUD_INIT_CUSTOM_SCRIPT_KEY]: {
+      isHidden: asHidden(!useCloudInitCustomScript, USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY),
+      value: !useCloudInitCustomScript ? null : undefined,
+    },
+  };
+};
+
+export const templatesDataUpdateCreator = (prevProps, prevState, props, state) => {
+  if (
+    !(
+      hasVmSettingsChanged(
+        prevState,
+        state,
+        USER_TEMPLATE_KEY,
+        FLAVOR_KEY,
+        WORKLOAD_PROFILE_KEY,
+        OPERATING_SYSTEM_KEY
+      ) ||
+      // leaks a lot of updates
+      get(prevProps, 'templates') !== get(props, 'templates')
+    )
+  ) {
+    return null;
+  }
+
+  const { templates } = props;
+  const params = {
+    userTemplate: getVmSettingValue(state, USER_TEMPLATE_KEY),
+    flavor: getVmSettingValue(state, FLAVOR_KEY),
+    workload: getVmSettingValue(state, WORKLOAD_PROFILE_KEY),
+    os: getVmSettingValue(state, OPERATING_SYSTEM_KEY),
+  };
+
+  const update = {
+    [FLAVOR_KEY]: { flavors: getFlavors(params, templates) },
+    [OPERATING_SYSTEM_KEY]: { operatingSystems: getOperatingSystems(params, templates) },
+    [WORKLOAD_PROFILE_KEY]: { workloadProfiles: getWorkloadProfiles(params, templates) },
+  };
+
+  const oldUpdate = {
+    [FLAVOR_KEY]: { flavors: getVmSettingAttribute(state, FLAVOR_KEY, 'flavors') },
+    [OPERATING_SYSTEM_KEY]: {
+      operatingSystems: getVmSettingAttribute(state, OPERATING_SYSTEM_KEY, 'operatingSystems'),
+    },
+    [WORKLOAD_PROFILE_KEY]: {
+      workloadProfiles: getVmSettingAttribute(state, WORKLOAD_PROFILE_KEY, 'workloadProfiles'),
+    },
+  };
+
+  // compare if we got any update from templates
+  if (isEqual(update, oldUpdate)) {
+    return null;
+  }
+
+  return update;
+};
+
+// used by user template; currently we do not support PROVISION_SOURCE_IMPORT
+const provisionSourceDataFieldResolver = {
+  [PROVISION_SOURCE_CONTAINER]: CONTAINER_IMAGE_KEY,
+  [PROVISION_SOURCE_URL]: IMAGE_URL_KEY,
+};
+
+export const selectedUserTemplateUpdateCreator = (prevProps, prevState, props, state) => {
+  if (!hasVmSettingsChanged(prevState, state, USER_TEMPLATE_KEY)) {
+    return null;
+  }
+  const { templates, dataVolumes } = props;
+
+  const allTemplates = getTemplate(templates, TEMPLATE_TYPE_VM);
+  const userTemplateName = getVmSettingValue(state, USER_TEMPLATE_KEY);
+  const userTemplate = allTemplates.find(template => template.metadata.name === userTemplateName);
+  const update = {};
+
+  if (!userTemplate) {
+    return update;
+  }
+
+  const vm = selectVm(userTemplate.objects);
+
+  // update flavor
+  const [flavor] = getTemplateFlavors([userTemplate]);
+  update[FLAVOR_KEY] = asValueObject(flavor);
+  if (flavor === CUSTOM_FLAVOR) {
+    update.cpu = asValueObject(getCpu(vm));
+    const memory = getMemory(vm);
+    update.memory = memory ? asValueObject(parseInt(memory, 10)) : null;
+  }
+
+  // update os
+  const [os] = getTemplateOperatingSystems([userTemplate]);
+  update[OPERATING_SYSTEM_KEY] = asValueObject(os);
+
+  // update workload profile
+  const [workload] = getTemplateWorkloadProfiles([userTemplate]);
+  update[WORKLOAD_PROFILE_KEY] = asValueObject(workload);
+
+  // update cloud-init
+  const cloudInitUserData = getCloudInitUserData(vm);
+  if (cloudInitUserData) {
+    update[USE_CLOUD_INIT_KEY] = asValueObject(true);
+    update[USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY] = asValueObject(true);
+    update[CLOUD_INIT_CUSTOM_SCRIPT_KEY] = asValueObject(cloudInitUserData || '');
+  } else if (get(update[USE_CLOUD_INIT_KEY], 'value')) {
+    update[USE_CLOUD_INIT_KEY] = asValueObject(false);
+    update[USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY] = asValueObject(false);
+  }
+
+  // update provision source
+  const provisionSource = getTemplateProvisionSource(userTemplate, dataVolumes);
+  if (provisionSource) {
+    update[PROVISION_SOURCE_TYPE_KEY] = asValueObject(provisionSource.type);
+    const dataFieldName = provisionSourceDataFieldResolver[provisionSource.type];
+    if (dataFieldName) {
+      update[dataFieldName] = asValueObject(provisionSource.source);
+    }
+  }
+
+  return update;
+};
diff --git a/src/components/Wizard/CreateVmWizard/strings.js b/src/components/Wizard/CreateVmWizard/strings.js
index 28ab62afa..618e7e968 100644
--- a/src/components/Wizard/CreateVmWizard/strings.js
+++ b/src/components/Wizard/CreateVmWizard/strings.js
@@ -1,9 +1,9 @@
 import {
-  PROVISION_SOURCE_CONTAINER,
   PROVISION_SOURCE_CLONED_DISK,
+  PROVISION_SOURCE_CONTAINER,
+  PROVISION_SOURCE_IMPORT,
   PROVISION_SOURCE_PXE,
   PROVISION_SOURCE_URL,
-  PROVISION_SOURCE_IMPORT,
 } from '../../../constants';
 
 export const CREATE_VM = 'Create Virtual Machine';
@@ -17,7 +17,7 @@ export const ERROR_EMPTY_ENTITY = 'Empty entity';
 export const ERROR_EMPTY_NAME = 'Name is empty';
 export const ERROR_IS_REQUIRED = 'is required';
 
-// BasicSettingsTab
+// VmSettingsTab
 export const NO_TEMPLATE = '--- No Template ---';
 export const HELP_CPU = 'The number of virtual CPU cores that will be dedicated to the virtual machine.';
 export const HELP_MEMORY = 'The amount of memory that will be dedicated to the virtual machine.';
@@ -72,13 +72,6 @@ export const CREATE_DISK_BUTTON = 'Create Disk';
 export const BOOTABLE_DISK = 'Bootable Disk';
 export const SELECT_BOOTABLE_DISK = '--- Select Bootable Disk ---';
 
-export const ERROR = 'Error';
-export const CREATED = 'created';
-export const CREATED_WITH_FAILED_CLEANUP = 'created & failed to clean up';
-export const CREATED_WITH_CLEANUP = 'created & cleaned up';
-export const FAILED_TO_CREATE = 'failed to create';
-export const FAILED_TO_PATCH = 'failed to patch';
-
 export const getNoBootableError = sourceType =>
   sourceType === PROVISION_SOURCE_CLONED_DISK ? ERROR_NO_BOOTABLE_ATTACHED_DISK : ERROR_NO_BOOTABLE_DISK;
 
diff --git a/src/components/Wizard/CreateVmWizard/tests/BasicSettingsTab.test.js b/src/components/Wizard/CreateVmWizard/tests/BasicSettingsTab.test.js
deleted file mode 100644
index 58d6fe8d2..000000000
--- a/src/components/Wizard/CreateVmWizard/tests/BasicSettingsTab.test.js
+++ /dev/null
@@ -1,545 +0,0 @@
-import React from 'react';
-import { shallow, mount } from 'enzyme';
-import { MenuItem } from 'patternfly-react';
-
-import { BasicSettingsTab, getFormFields, onCloseBasic } from '../BasicSettingsTab';
-import { namespaces } from '../fixtures/CreateVmWizard.fixture';
-import { baseTemplates } from '../../../../k8s/objects/template';
-import { validBasicSettings } from '../fixtures/BasicSettingsTab.fixture';
-import { DNS1123_START_ERROR } from '../../../../utils/strings';
-import { getValidationObject } from '../../../../utils/validations';
-import { getName, getMemory, getCpu, getCloudInitUserData } from '../../../../selectors';
-import { getTemplateProvisionSource } from '../../../../utils/templates';
-import { Dropdown } from '../../../Form';
-import { NO_TEMPLATE } from '../strings';
-import { selectVm } from '../../../../k8s/selectors';
-import { callerContext } from '../../../../tests/k8s';
-
-import { basicSettingsImportVmwareNewConnection } from '../../../../tests/forms_mocks/basicSettings.mock';
-
-import {
-  userTemplates,
-  urlTemplate,
-  containerTemplate,
-  pxeTemplate,
-  containerCloudTemplate,
-  urlCustomFlavorTemplate,
-} from '../../../../tests/mocks/user_template';
-
-import {
-  NAME_KEY,
-  USER_TEMPLATE_KEY,
-  PROVISION_SOURCE_TYPE_KEY,
-  IMAGE_URL_KEY,
-  CONTAINER_IMAGE_KEY,
-  CLOUD_INIT_KEY,
-  USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY,
-  CLOUD_INIT_CUSTOM_SCRIPT_KEY,
-  CPU_KEY,
-  FLAVOR_KEY,
-  MEMORY_KEY,
-} from '../constants';
-
-import {
-  PROVISION_SOURCE_PXE,
-  PROVISION_SOURCE_CONTAINER,
-  PROVISION_SOURCE_URL,
-  CUSTOM_FLAVOR,
-} from '../../../../constants';
-import { urlTemplateDataVolume } from '../../../../tests/mocks/user_template/url.mock';
-
-const templates = [...baseTemplates, ...userTemplates];
-
-const testBasicSettingsTab = (basicSettings = {}, onChange = null, selectedNamespace = undefined, template = false) => (
-  <BasicSettingsTab
-    templates={templates}
-    namespaces={namespaces}
-    selectedNamespace={selectedNamespace}
-    basicSettings={basicSettings}
-    onChange={onChange || jest.fn()}
-    createVmTemplate={template}
-    dataVolumes={[urlTemplateDataVolume]}
-    {...callerContext}
-  />
-);
-
-const expectMockToBeCalledWith = (fn, a, b, call = 0) => {
-  expect(fn.mock.calls[call][0]).toEqual(a);
-  expect(fn.mock.calls[call][1]).toEqual(b);
-};
-
-const testFormChange = (what, value, result, valid) => {
-  const onChange = jest.fn();
-  const component = mount(testBasicSettingsTab({}, onChange));
-
-  onFormChange(component, value, what);
-
-  expectMockToBeCalledWith(onChange, result, valid);
-};
-
-const onFormChange = (component, value, what) => {
-  const formFields = getFormFields(validBasicSettings, namespaces, templates);
-
-  const field = component.find(`#${formFields[what].id}`);
-  if (formFields[what].type === 'dropdown') {
-    field
-      .find(MenuItem)
-      .findWhere(item => item.text() === value)
-      .find('a')
-      .simulate('click');
-  } else {
-    field.find('input').simulate('change', { target: { value } });
-  }
-};
-
-const checkDisabledDropdown = (component, template, disabled) => {
-  component.setProps({
-    basicSettings: {
-      ...component.props().basicSettings,
-      [USER_TEMPLATE_KEY]: {
-        value: getName(template),
-      },
-    },
-  });
-
-  expect(
-    component
-      .find({ id: 'image-source-type-dropdown' })
-      .find(Dropdown)
-      .props().disabled
-  ).toEqual(disabled.image);
-  expect(
-    component
-      .find({ id: 'operating-system-dropdown' })
-      .find(Dropdown)
-      .props().disabled
-  ).toEqual(disabled.os);
-  expect(
-    component
-      .find({ id: 'flavor-dropdown' })
-      .find(Dropdown)
-      .props().disabled
-  ).toEqual(disabled.flavor);
-  expect(
-    component
-      .find({ id: 'workload-profile-dropdown' })
-      .find(Dropdown)
-      .props().disabled
-  ).toEqual(disabled.workload);
-};
-
-const clickOnUserTemplate = (component, templateName) => {
-  const templatesDropdown = component.find('#template-dropdown').find(Dropdown);
-  const userTemplateItem = templatesDropdown
-    .find(MenuItem)
-    .findWhere(i => i.text() === templateName)
-    .find(MenuItem);
-  expect(userTemplateItem.exists()).toBeTruthy();
-
-  userTemplateItem.find('a').simulate('click');
-};
-
-describe('<BasicSettingsTab />', () => {
-  it('renders correctly', () => {
-    const component = shallow(testBasicSettingsTab());
-    expect(component).toMatchSnapshot();
-  });
-
-  it('defaults to selectedNamespace', () => {
-    const onChange = jest.fn();
-    const namespace = namespaces[1];
-    shallow(testBasicSettingsTab({}, onChange, namespace));
-
-    expectMockToBeCalledWith(
-      onChange,
-      {
-        namespace: {
-          validation: undefined,
-          value: namespace.metadata.name,
-        },
-      },
-      false
-    );
-  });
-
-  it('changes selectedNamespace on prop change', () => {
-    const onChange = jest.fn();
-    const basicSettings = {};
-    const selectedNamespace = namespaces[1];
-
-    const component = shallow(testBasicSettingsTab(basicSettings, onChange));
-
-    expect(onChange).not.toHaveBeenCalled();
-
-    component.setProps({
-      templates,
-      namespaces,
-      selectedNamespace,
-      basicSettings,
-      onChange,
-    });
-
-    expectMockToBeCalledWith(
-      onChange,
-      {
-        namespace: {
-          validation: undefined,
-          value: selectedNamespace.metadata.name,
-        },
-      },
-      false
-    );
-  });
-
-  it('validates incomplete form', () => {
-    testFormChange(
-      'name',
-      'somename',
-      {
-        name: {
-          validation: null,
-          value: 'somename',
-        },
-      },
-      false
-    );
-  });
-
-  it('validates name field', () => {
-    testFormChange(
-      'name',
-      'somename',
-      {
-        name: {
-          validation: null,
-          value: 'somename',
-        },
-      },
-      false
-    );
-    testFormChange(
-      'name',
-      '_name',
-      {
-        name: {
-          validation: getValidationObject(`Name ${DNS1123_START_ERROR}`),
-          value: '_name',
-        },
-      },
-      false
-    );
-  });
-
-  it('is valid when all required fields are filled', () => {
-    const onChange = jest.fn();
-    const component = mount(testBasicSettingsTab(validBasicSettings, onChange));
-    onFormChange(component, validBasicSettings.name.value, 'name'); // trigger validation
-
-    expectMockToBeCalledWith(
-      onChange,
-      {
-        ...validBasicSettings,
-        flavor: {
-          value: 'small',
-          validation: undefined,
-        },
-        name: {
-          ...validBasicSettings.name,
-          validation: null,
-        },
-      },
-      true
-    );
-  });
-
-  it('required property is validated', () => {
-    testFormChange(
-      'name',
-      '',
-      {
-        name: {
-          validation: getValidationObject('Name is required'),
-          value: '',
-        },
-      },
-      false
-    );
-  });
-
-  it('is invalid when one required fields is missing', () => {
-    const onChange = jest.fn();
-    const component = mount(testBasicSettingsTab(validBasicSettings, onChange));
-
-    onFormChange(component, '', NAME_KEY);
-
-    expectMockToBeCalledWith(
-      onChange,
-      {
-        ...validBasicSettings,
-        flavor: {
-          value: 'small',
-          validation: undefined,
-        },
-        name: {
-          validation: getValidationObject('Name is required'),
-          value: '',
-        },
-      },
-      false
-    );
-  });
-
-  it('reads provision source from user template', () => {
-    const onChange = jest.fn();
-    const component = mount(testBasicSettingsTab(validBasicSettings, onChange));
-
-    onFormChange(component, getName(urlTemplate), USER_TEMPLATE_KEY);
-    expectMockToBeCalledWith(
-      onChange,
-      {
-        ...validBasicSettings,
-        [USER_TEMPLATE_KEY]: {
-          value: getName(urlTemplate),
-          validation: undefined,
-        },
-        [PROVISION_SOURCE_TYPE_KEY]: {
-          validation: undefined,
-          value: PROVISION_SOURCE_URL,
-        },
-        [IMAGE_URL_KEY]: {
-          validation: undefined,
-          value: getTemplateProvisionSource(urlTemplate, [urlTemplateDataVolume]).source,
-        },
-      },
-      true
-    );
-
-    onFormChange(component, getName(containerTemplate), USER_TEMPLATE_KEY);
-    expectMockToBeCalledWith(
-      onChange,
-      {
-        ...validBasicSettings,
-        [USER_TEMPLATE_KEY]: {
-          value: getName(containerTemplate),
-          validation: undefined,
-        },
-        [PROVISION_SOURCE_TYPE_KEY]: {
-          validation: undefined,
-          value: PROVISION_SOURCE_CONTAINER,
-        },
-        [CONTAINER_IMAGE_KEY]: {
-          validation: undefined,
-          value: getTemplateProvisionSource(containerTemplate, [urlTemplateDataVolume]).source,
-        },
-      },
-      true,
-      1
-    );
-
-    onFormChange(component, getName(pxeTemplate), USER_TEMPLATE_KEY);
-    expectMockToBeCalledWith(
-      onChange,
-      {
-        ...validBasicSettings,
-        [USER_TEMPLATE_KEY]: {
-          value: getName(pxeTemplate),
-          validation: undefined,
-        },
-        [PROVISION_SOURCE_TYPE_KEY]: {
-          validation: undefined,
-          value: PROVISION_SOURCE_PXE,
-        },
-      },
-      true,
-      2
-    );
-  });
-
-  it('reads cloud init settings from user template', () => {
-    const onChange = jest.fn();
-    const component = mount(testBasicSettingsTab(validBasicSettings, onChange));
-
-    onFormChange(component, getName(containerCloudTemplate), USER_TEMPLATE_KEY);
-    expectMockToBeCalledWith(
-      onChange,
-      {
-        ...validBasicSettings,
-        [USER_TEMPLATE_KEY]: {
-          value: getName(containerCloudTemplate),
-          validation: undefined,
-        },
-        [PROVISION_SOURCE_TYPE_KEY]: {
-          validation: undefined,
-          value: PROVISION_SOURCE_CONTAINER,
-        },
-        [CONTAINER_IMAGE_KEY]: {
-          value: 'fooContainer',
-          validation: undefined,
-        },
-        [CLOUD_INIT_KEY]: {
-          validation: undefined,
-          value: true,
-        },
-        [USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY]: {
-          validation: undefined,
-          value: true,
-        },
-        [CLOUD_INIT_CUSTOM_SCRIPT_KEY]: {
-          validation: undefined,
-          value: getCloudInitUserData(selectVm(containerCloudTemplate.objects)),
-        },
-      },
-      true
-    );
-  });
-
-  it('reads flavor from user template', () => {
-    const onChange = jest.fn();
-    const component = mount(testBasicSettingsTab(validBasicSettings, onChange));
-
-    onFormChange(component, getName(containerCloudTemplate), USER_TEMPLATE_KEY);
-
-    expectMockToBeCalledWith(
-      onChange,
-      {
-        ...validBasicSettings,
-        [USER_TEMPLATE_KEY]: {
-          value: getName(containerCloudTemplate),
-          validation: undefined,
-        },
-        [PROVISION_SOURCE_TYPE_KEY]: {
-          validation: undefined,
-          value: PROVISION_SOURCE_CONTAINER,
-        },
-        [CONTAINER_IMAGE_KEY]: {
-          value: getTemplateProvisionSource(containerCloudTemplate, [urlTemplateDataVolume]).source,
-          validation: undefined,
-        },
-        [CLOUD_INIT_KEY]: {
-          validation: undefined,
-          value: true,
-        },
-        [USE_CLOUD_INIT_CUSTOM_SCRIPT_KEY]: {
-          validation: undefined,
-          value: true,
-        },
-        [CLOUD_INIT_CUSTOM_SCRIPT_KEY]: {
-          validation: undefined,
-          value: getCloudInitUserData(selectVm(containerCloudTemplate.objects)),
-        },
-      },
-      true
-    );
-
-    onFormChange(component, getName(urlCustomFlavorTemplate), USER_TEMPLATE_KEY);
-
-    expectMockToBeCalledWith(
-      onChange,
-      {
-        ...validBasicSettings,
-        [USER_TEMPLATE_KEY]: {
-          value: getName(urlCustomFlavorTemplate),
-          validation: undefined,
-        },
-        [PROVISION_SOURCE_TYPE_KEY]: {
-          validation: undefined,
-          value: PROVISION_SOURCE_URL,
-        },
-        [IMAGE_URL_KEY]: {
-          value: getTemplateProvisionSource(urlCustomFlavorTemplate, [urlTemplateDataVolume]).source,
-          validation: undefined,
-        },
-        [FLAVOR_KEY]: {
-          value: CUSTOM_FLAVOR,
-          validation: undefined,
-        },
-        [CPU_KEY]: {
-          value: getCpu(urlCustomFlavorTemplate.objects[0]),
-          validation: undefined,
-        },
-        [MEMORY_KEY]: {
-          value: parseInt(getMemory(urlCustomFlavorTemplate.objects[0]), 10),
-          validation: undefined,
-        },
-      },
-      true,
-      1
-    );
-  });
-
-  it('provides no user template choice', () => {
-    const onChange = jest.fn();
-    const component = mount(testBasicSettingsTab(validBasicSettings, onChange));
-
-    clickOnUserTemplate(component, getName(userTemplates[0]));
-
-    expectMockToBeCalledWith(
-      onChange,
-      {
-        ...validBasicSettings,
-        [USER_TEMPLATE_KEY]: {
-          value: getName(userTemplates[0]),
-          validation: undefined,
-        },
-        [CONTAINER_IMAGE_KEY]: {
-          value: 'fooContainer',
-        },
-      },
-      true
-    );
-
-    clickOnUserTemplate(component, NO_TEMPLATE);
-
-    expectMockToBeCalledWith(
-      onChange,
-      {
-        ...validBasicSettings,
-        [USER_TEMPLATE_KEY]: {
-          value: undefined,
-          validation: undefined,
-        },
-      },
-      true,
-      1
-    );
-  });
-
-  it('disables provision source, workload and os for user template', () => {
-    const component = mount(testBasicSettingsTab(validBasicSettings));
-
-    checkDisabledDropdown(component, containerTemplate, {
-      image: true,
-      os: true,
-      flavor: false,
-      workload: true,
-    });
-
-    checkDisabledDropdown(component, urlCustomFlavorTemplate, {
-      image: true,
-      os: true,
-      flavor: true,
-      workload: true,
-    });
-
-    checkDisabledDropdown(component, undefined, {
-      image: false,
-      os: false,
-      flavor: false,
-      workload: false,
-    });
-  });
-
-  it('removes temporary v2vvmware', async () => {
-    const k8sKill = jest.fn();
-    await onCloseBasic(basicSettingsImportVmwareNewConnection, { k8sKill });
-    expect(k8sKill.mock.calls).toHaveLength(1);
-    expect(k8sKill.mock.calls[0][1].metadata.name).toEqual('v2vvmware-object-name');
-  });
-});
-
-describe('<BasicSettingsTab /> for Create VM Template', () => {
-  it('renders correctly', () => {
-    const component = shallow(testBasicSettingsTab({}, null, null, true));
-    expect(component).toMatchSnapshot();
-  });
-});
diff --git a/src/components/Wizard/CreateVmWizard/tests/CreateVmWizard.test.js b/src/components/Wizard/CreateVmWizard/tests/CreateVmWizard.test.js
index 08bb68f8c..8c28aaf45 100644
--- a/src/components/Wizard/CreateVmWizard/tests/CreateVmWizard.test.js
+++ b/src/components/Wizard/CreateVmWizard/tests/CreateVmWizard.test.js
@@ -3,13 +3,13 @@ import { shallow, mount } from 'enzyme';
 import { findIndex } from 'lodash';
 import { WizardPattern } from 'patternfly-react';
 
-import { CreateVmWizard, onVmwareVmChanged } from '../CreateVmWizard';
+import { CreateVmWizard } from '../CreateVmWizard';
 import { Loading } from '../../../Loading';
-import { validBasicSettings } from '../fixtures/BasicSettingsTab.fixture';
+import { validVmSettings } from '../fixtures/VmSettingsTab.fixture';
 import { createVm, createVmTemplate } from '../../../../k8s/request';
 import { CREATE_VM, NEXT, CREATE_VM_TEMPLATE } from '../strings';
 import CreateVmWizardFixutre from '../fixtures/CreateVmWizard.fixture';
-import { BasicSettingsTab } from '../BasicSettingsTab';
+import { VmSettingsTab } from '../VmSettingsTab';
 import { NetworksTab } from '../NetworksTab';
 import { StorageTab } from '../StorageTab';
 import { ResultTab } from '../ResultTab';
@@ -19,16 +19,15 @@ import { getTemplateInterfaces } from '../../../../utils/templates';
 
 import {
   NETWORKS_TAB_KEY,
-  BASIC_SETTINGS_TAB_KEY,
+  VM_SETTINGS_TAB_KEY,
   STORAGE_TAB_KEY,
   RESULT_TAB_KEY,
   USER_TEMPLATE_KEY,
   PROVISION_SOURCE_TYPE_KEY,
   STORAGE_TYPE_CONTAINER,
   STORAGE_TYPE_DATAVOLUME,
-  INTERMEDIARY_NETWORKS_TAB_KEY,
-  INTERMEDIARY_STORAGE_TAB_KEY,
-  STORAGE_TYPE_EXTERNAL_IMPORT,
+  IMAGE_URL_KEY,
+  CONTAINER_IMAGE_KEY,
 } from '../constants';
 
 import {
@@ -45,6 +44,7 @@ import {
   PROVISION_SOURCE_CLONED_DISK,
 } from '../../../../constants';
 import { getButton } from '../../../../tests/enzyme';
+import { VM_SETTINGS_METADATA_ID } from '../utils/vmSettingsTabUtils';
 
 jest.mock('../../../../k8s/request');
 
@@ -104,7 +104,7 @@ const testWalkThrough = (template = false, createText = CREATE_VM, templatesDrop
   expect(component.find('.modal-title').text()).toEqual(createText);
 
   expect(component.find(Loading)).toHaveLength(1);
-  expect(component.find(BasicSettingsTab)).toHaveLength(0);
+  expect(component.find(VmSettingsTab)).toHaveLength(0);
 
   const namespaces = [...CreateVmWizardFixutre[0].props.namespaces];
   const templates = [...CreateVmWizardFixutre[0].props.templates];
@@ -112,11 +112,11 @@ const testWalkThrough = (template = false, createText = CREATE_VM, templatesDrop
   component.setProps({ namespaces, templates, dataVolumes });
 
   expect(component.find(Loading)).toHaveLength(0);
-  expect(component.find(BasicSettingsTab)).toHaveLength(1);
+  expect(component.find(VmSettingsTab)).toHaveLength(1);
 
   expect(component.find('#template-dropdown').exists()).toEqual(templatesDropdown);
 
-  component.instance().onStepDataChanged(BASIC_SETTINGS_TAB_KEY, validBasicSettings, true);
+  component.instance().onStepDataChanged(VM_SETTINGS_TAB_KEY, validVmSettings, true);
   component.update();
   expect(component.find(WizardPattern).props().nextStepDisabled).toBeFalsy();
 
@@ -142,15 +142,15 @@ const testWalkThrough = (template = false, createText = CREATE_VM, templatesDrop
   component.update();
 
   expect(component.state().activeStepIndex).toEqual(
-    getStepIndex(component.instance().wizardStepsNewVM, BASIC_SETTINGS_TAB_KEY)
+    getStepIndex(component.instance().wizardStepsNewVM, VM_SETTINGS_TAB_KEY)
   );
-  expect(component.find(BasicSettingsTab)).toHaveLength(1);
+  expect(component.find(VmSettingsTab)).toHaveLength(1);
   expect(component.find(NetworksTab)).toHaveLength(0);
 
   getNextButton(component).simulate('click');
   component.update();
 
-  expect(component.find(BasicSettingsTab)).toHaveLength(0);
+  expect(component.find(VmSettingsTab)).toHaveLength(0);
   expect(component.find(NetworksTab)).toHaveLength(1);
   expect(getNextButton(component).text()).toEqual(NEXT);
 
@@ -252,22 +252,29 @@ describe('<CreateVmWizard />', () => {
   it('changes next step disability', () => {
     const component = shallow(testCreateVmWizard());
 
-    component.instance().onStepDataChanged(BASIC_SETTINGS_TAB_KEY, validBasicSettings, true);
-    expect(component.state().stepData[BASIC_SETTINGS_TAB_KEY].value).toEqual(validBasicSettings);
-    expect(component.state().stepData[BASIC_SETTINGS_TAB_KEY].valid).toBeTruthy();
+    component.instance().onStepDataChanged(VM_SETTINGS_TAB_KEY, validVmSettings, true);
+    expect(component.state().stepData[VM_SETTINGS_TAB_KEY].value).toMatchSnapshot();
+    expect(component.state().stepData[VM_SETTINGS_TAB_KEY].valid).toBeTruthy();
     expect(component.find(WizardPattern).props().nextStepDisabled).toBeFalsy();
 
     // new required field will become visible
-    component.instance().onStepDataChanged(
-      BASIC_SETTINGS_TAB_KEY,
-      {
-        ...validBasicSettings,
-        [PROVISION_SOURCE_TYPE_KEY]: {
-          value: 'URL',
+    component.instance().onStepDataChanged(VM_SETTINGS_TAB_KEY, {
+      ...validVmSettings,
+      [PROVISION_SOURCE_TYPE_KEY]: {
+        value: PROVISION_SOURCE_URL,
+        validation: undefined,
+      },
+      [IMAGE_URL_KEY]: {
+        isRequired: {
+          [VM_SETTINGS_METADATA_ID]: true,
         },
       },
-      false
-    );
+      [CONTAINER_IMAGE_KEY]: {
+        isRequired: {
+          [VM_SETTINGS_METADATA_ID]: false,
+        },
+      },
+    });
     expect(component.find(WizardPattern).props().nextStepDisabled).toBeTruthy();
   });
 
@@ -294,7 +301,7 @@ describe('<CreateVmWizard />', () => {
         value: PROVISION_SOURCE_CONTAINER,
       },
     };
-    component.instance().onStepDataChanged(BASIC_SETTINGS_TAB_KEY, userTemplateSource, true);
+    component.instance().onStepDataChanged(VM_SETTINGS_TAB_KEY, userTemplateSource, true);
     checkRootStorageExists(component, STORAGE_TYPE_CONTAINER);
 
     let withTemplateSource = {
@@ -307,7 +314,7 @@ describe('<CreateVmWizard />', () => {
       },
     };
 
-    component.instance().onStepDataChanged(BASIC_SETTINGS_TAB_KEY, withTemplateSource, true);
+    component.instance().onStepDataChanged(VM_SETTINGS_TAB_KEY, withTemplateSource, true);
     checkStorages(component, containerTemplate);
 
     withTemplateSource = {
@@ -320,7 +327,7 @@ describe('<CreateVmWizard />', () => {
       },
     };
 
-    component.instance().onStepDataChanged(BASIC_SETTINGS_TAB_KEY, withTemplateSource, true);
+    component.instance().onStepDataChanged(VM_SETTINGS_TAB_KEY, withTemplateSource, true);
     checkStorages(component, pxeDataVolumeTemplate);
 
     withTemplateSource = {
@@ -333,7 +340,7 @@ describe('<CreateVmWizard />', () => {
       },
     };
 
-    component.instance().onStepDataChanged(BASIC_SETTINGS_TAB_KEY, withTemplateSource, true);
+    component.instance().onStepDataChanged(VM_SETTINGS_TAB_KEY, withTemplateSource, true);
     expect(component.state('stepData')[STORAGE_TAB_KEY].value).toHaveLength(0);
 
     withTemplateSource = {
@@ -346,7 +353,7 @@ describe('<CreateVmWizard />', () => {
       },
     };
 
-    component.instance().onStepDataChanged(BASIC_SETTINGS_TAB_KEY, withTemplateSource, true);
+    component.instance().onStepDataChanged(VM_SETTINGS_TAB_KEY, withTemplateSource, true);
     checkRootStorageExists(component, STORAGE_TYPE_DATAVOLUME);
 
     withTemplateSource = {
@@ -359,7 +366,7 @@ describe('<CreateVmWizard />', () => {
       },
     };
 
-    component.instance().onStepDataChanged(BASIC_SETTINGS_TAB_KEY, withTemplateSource, true);
+    component.instance().onStepDataChanged(VM_SETTINGS_TAB_KEY, withTemplateSource, true);
     checkStorages(component, pvcTemplate);
   });
 
@@ -375,7 +382,7 @@ describe('<CreateVmWizard />', () => {
         value: PROVISION_SOURCE_PXE,
       },
     };
-    component.instance().onStepDataChanged(BASIC_SETTINGS_TAB_KEY, noTemplateSource, true);
+    component.instance().onStepDataChanged(VM_SETTINGS_TAB_KEY, noTemplateSource, true);
     checkRootNetworkExists(component);
 
     const podNetworkTemplateSource = {
@@ -383,7 +390,7 @@ describe('<CreateVmWizard />', () => {
         value: getName(containerTemplate),
       },
     };
-    component.instance().onStepDataChanged(BASIC_SETTINGS_TAB_KEY, podNetworkTemplateSource, true);
+    component.instance().onStepDataChanged(VM_SETTINGS_TAB_KEY, podNetworkTemplateSource, true);
     checkNetworks(component, containerTemplate);
 
     const multusNetworkTemplateSource = {
@@ -391,7 +398,7 @@ describe('<CreateVmWizard />', () => {
         value: getName(containerMultusTemplate),
       },
     };
-    component.instance().onStepDataChanged(BASIC_SETTINGS_TAB_KEY, multusNetworkTemplateSource, true);
+    component.instance().onStepDataChanged(VM_SETTINGS_TAB_KEY, multusNetworkTemplateSource, true);
     checkNetworks(component, containerMultusTemplate);
 
     const noPodNetworkTemplateSource = {
@@ -399,107 +406,14 @@ describe('<CreateVmWizard />', () => {
         value: getName(urlNoNetworkTemplate),
       },
     };
-    component.instance().onStepDataChanged(BASIC_SETTINGS_TAB_KEY, noPodNetworkTemplateSource, true);
+    component.instance().onStepDataChanged(VM_SETTINGS_TAB_KEY, noPodNetworkTemplateSource, true);
     checkNetworks(component, urlNoNetworkTemplate);
 
-    component.instance().onStepDataChanged(BASIC_SETTINGS_TAB_KEY, noTemplateSource, true);
+    component.instance().onStepDataChanged(VM_SETTINGS_TAB_KEY, noTemplateSource, true);
     checkRootNetworkExists(component);
   });
 
-  it('prefills networks when importing - no networks', () => {
-    const props = undefined;
-    const stepData = {
-      [BASIC_SETTINGS_TAB_KEY]: {
-        value: {
-          [INTERMEDIARY_NETWORKS_TAB_KEY]: {
-            value: [],
-          },
-        },
-      },
-      [NETWORKS_TAB_KEY]: {
-        value: [],
-      },
-    };
-    const result = onVmwareVmChanged(props, stepData);
-    expect(result[NETWORKS_TAB_KEY].value).toHaveLength(0);
-  });
-
-  it('prefills networks when importing', () => {
-    const props = undefined;
-    const stepData = {
-      [BASIC_SETTINGS_TAB_KEY]: {
-        value: {
-          [INTERMEDIARY_NETWORKS_TAB_KEY]: {
-            value: [
-              {
-                name: 'nic0',
-                id: 'id0',
-                mac: 'some:mac:address:0',
-              },
-              {
-                name: 'nic1',
-                id: 'id1',
-                mac: 'some:mac:address:1',
-              },
-            ],
-          },
-        },
-      },
-      [NETWORKS_TAB_KEY]: {
-        value: [],
-      },
-    };
-    const result = onVmwareVmChanged(props, stepData);
-    expect(result[NETWORKS_TAB_KEY].value).toHaveLength(2);
-    expect(result[NETWORKS_TAB_KEY].value[0].importSourceId).toBe('id0');
-    expect(result[NETWORKS_TAB_KEY].value[0].name).toBe('nic0');
-    expect(result[NETWORKS_TAB_KEY].value[0].mac).toBe('some:mac:address:0');
-    expect(result[NETWORKS_TAB_KEY].value[0].network).toBe(undefined);
-  });
-
-  it('prefills disks when importing', () => {
-    const props = undefined;
-    const stepData = {
-      [BASIC_SETTINGS_TAB_KEY]: {
-        value: {
-          [INTERMEDIARY_STORAGE_TAB_KEY]: {
-            value: [
-              {
-                name: 'disk0',
-                isBootable: true,
-                storageType: STORAGE_TYPE_EXTERNAL_IMPORT,
-                id: '0',
-                data: {
-                  fileName: 'filename0',
-                  mountPath: '/test/mount/path/1',
-                },
-                size: 1,
-              },
-              {
-                name: 'disk1',
-                id: '1',
-                storageType: STORAGE_TYPE_EXTERNAL_IMPORT,
-                data: {
-                  fileName: 'filename1',
-                  mountPath: '/test/mount/path/2',
-                },
-                size: 2,
-              },
-            ],
-          },
-        },
-      },
-      [STORAGE_TAB_KEY]: {
-        value: [],
-      },
-    };
-    const result = onVmwareVmChanged(props, stepData);
-    expect(result[STORAGE_TAB_KEY].value).toHaveLength(2);
-    expect(result[STORAGE_TAB_KEY].value[0].id).toBe('0');
-    expect(result[STORAGE_TAB_KEY].value[0].name).toBe('disk0');
-    expect(result[STORAGE_TAB_KEY].value[0].size).toBe(1);
-    expect(result[STORAGE_TAB_KEY].value[0].storageClass).toBe(undefined);
-  });
+  // TODO: add 2v2 tests
 });
 
 describe('<CreateVmWizard /> for Create VM Template', () => {
diff --git a/src/components/Wizard/CreateVmWizard/tests/VmSettingsTab.test.js b/src/components/Wizard/CreateVmWizard/tests/VmSettingsTab.test.js
new file mode 100644
index 000000000..122869a04
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/tests/VmSettingsTab.test.js
@@ -0,0 +1,38 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+
+import { VmSettingsTab } from '../VmSettingsTab';
+import { namespaces } from '../fixtures/CreateVmWizard.fixture';
+import { baseTemplates } from '../../../../k8s/objects/template';
+import { callerContext } from '../../../../tests/k8s';
+
+import { userTemplates } from '../../../../tests/mocks/user_template';
+
+import { urlTemplateDataVolume } from '../../../../tests/mocks/user_template/url.mock';
+
+const templates = [...baseTemplates, ...userTemplates];
+
+const testVmSettingsTab = (vmSettings, onChange = null, selectedNamespace = undefined, template = false) => (
+  <VmSettingsTab
+    templates={templates}
+    namespaces={namespaces}
+    onChange={onChange || jest.fn()}
+    dataVolumes={[urlTemplateDataVolume]}
+    {...callerContext}
+  />
+);
+
+describe('<VmSettingsTab />', () => {
+  it('renders correctly', () => {
+    const component = shallow(testVmSettingsTab());
+    expect(component).toMatchSnapshot();
+  });
+  // TODO: add tests
+});
+
+describe('<VmSettingsTab /> for Create VM Template', () => {
+  it('renders correctly', () => {
+    const component = shallow(testVmSettingsTab({}, null, null, true));
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/src/components/Wizard/CreateVmWizard/tests/__snapshots__/BasicSettingsTab.test.js.snap b/src/components/Wizard/CreateVmWizard/tests/__snapshots__/BasicSettingsTab.test.js.snap
deleted file mode 100644
index 944ff82fb..000000000
--- a/src/components/Wizard/CreateVmWizard/tests/__snapshots__/BasicSettingsTab.test.js.snap
+++ /dev/null
@@ -1,771 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<BasicSettingsTab /> for Create VM Template renders correctly 1`] = `
-<FormFactory
-  controlSize={5}
-  fields={
-    Object {
-      "authKeys": Object {
-        "id": "cloud-init-ssh",
-        "isVisible": [Function],
-        "title": "Authenticated SSH Keys",
-        "type": "textarea",
-      },
-      "cloudInit": Object {
-        "id": "use-cloud-init",
-        "title": "Use cloud-init",
-        "type": "checkbox",
-      },
-      "cloudInitCustomScript": Object {
-        "className": "kubevirt-create-vm-wizard__custom-cloud-script-textarea",
-        "id": "cloud-init-custom-script",
-        "isVisible": [Function],
-        "title": "Custom Script",
-        "type": "textarea",
-      },
-      "containerImage": Object {
-        "disabled": false,
-        "id": "provision-source-container",
-        "isVisible": [Function],
-        "required": true,
-        "title": "Container Image",
-        "validate": [Function],
-      },
-      "cpu": Object {
-        "help": "The number of virtual CPU cores that will be dedicated to the virtual machine.",
-        "id": "resources-cpu",
-        "isVisible": [Function],
-        "required": true,
-        "title": "CPUs",
-        "type": "positive-number",
-      },
-      "description": Object {
-        "id": "vm-description",
-        "title": "Description",
-        "type": "textarea",
-      },
-      "flavor": Object {
-        "choices": Array [
-          "small",
-          "medium",
-          "Custom",
-        ],
-        "defaultValue": "--- Select Flavor ---",
-        "disabled": false,
-        "help": "The combination of processing power and memory that will be provided to the virtual machine.",
-        "id": "flavor-dropdown",
-        "required": true,
-        "title": "Flavor",
-        "type": "dropdown",
-      },
-      "hostname": Object {
-        "id": "cloud-init-hostname",
-        "isVisible": [Function],
-        "title": "Hostname",
-      },
-      "imageURL": Object {
-        "disabled": false,
-        "id": "provision-source-url",
-        "isVisible": [Function],
-        "required": true,
-        "title": "URL",
-        "validate": [Function],
-      },
-      "memory": Object {
-        "help": "The amount of memory that will be dedicated to the virtual machine.",
-        "id": "resources-memory",
-        "isVisible": [Function],
-        "required": true,
-        "title": "Memory (GB)",
-        "type": "positive-number",
-      },
-      "name": Object {
-        "id": "vm-name",
-        "required": true,
-        "title": "Name",
-        "validate": [Function],
-      },
-      "namespace": Object {
-        "choices": Array [
-          "default",
-          "myproject",
-        ],
-        "defaultValue": "--- Select Namespace ---",
-        "id": "namespace-dropdown",
-        "required": true,
-        "title": "Namespace",
-        "type": "dropdown",
-      },
-      "operatingSystem": Object {
-        "choices": Array [
-          Object {
-            "id": "fedora29",
-            "name": "Fedora 29",
-          },
-          Object {
-            "id": "fedora28",
-            "name": "Fedora 28",
-          },
-          Object {
-            "id": "fedora27",
-            "name": "Fedora 27",
-          },
-          Object {
-            "id": "fedora26",
-            "name": "Fedora 26",
-          },
-          Object {
-            "id": "fedora25",
-            "name": "Fedora 25",
-          },
-          Object {
-            "id": "fedora24",
-            "name": "Fedora 24",
-          },
-          Object {
-            "id": "fedora23",
-            "name": "Fedora 23",
-          },
-          Object {
-            "id": "rhel7.0",
-            "name": "Red Hat Enterprise Linux 7.0",
-          },
-          Object {
-            "id": "ubuntu18.04",
-            "name": "Ubuntu 18.04 LTS",
-          },
-          Object {
-            "id": "win2k12r2",
-            "name": "Microsoft Windows Server 2012 R2",
-          },
-          Object {
-            "id": "win2k8r2",
-            "name": "Microsoft Windows Server 2008 R2",
-          },
-          Object {
-            "id": "win2k8",
-            "name": "Microsoft Windows Server 2008",
-          },
-          Object {
-            "id": "win10",
-            "name": "Microsoft Windows 10",
-          },
-        ],
-        "defaultValue": "--- Select Operating System ---",
-        "disabled": false,
-        "help": "The primary operating system that will run on the virtual machine.",
-        "id": "operating-system-dropdown",
-        "required": true,
-        "title": "Operating System",
-        "type": "dropdown",
-      },
-      "provider": Object {
-        "choices": Array [
-          "VMWare",
-        ],
-        "defaultValue": "--- Select Provider ---",
-        "help": null,
-        "id": "provider-dropdown",
-        "isVisible": [Function],
-        "onChange": [Function],
-        "required": true,
-        "title": "Provider",
-        "type": "dropdown",
-      },
-      "provisionSourceType": Object {
-        "choices": Array [
-          "PXE",
-          "URL",
-          "Container",
-          "Cloned Disk",
-          "Import",
-        ],
-        "defaultValue": "--- Select Provision Source ---",
-        "disabled": false,
-        "help": undefined,
-        "id": "image-source-type-dropdown",
-        "required": true,
-        "title": "Provision Source",
-        "type": "dropdown",
-      },
-      "rememberVmwareCredentials": Object {
-        "help": "If checked, new secret keeping connection details will be created for later use.",
-        "id": "vcenter-remember-credentials",
-        "isVisible": [Function],
-        "title": "Remember vCenter credentials",
-        "type": "checkbox",
-      },
-      "startVM": Object {
-        "id": "start-vm",
-        "isVisible": [Function],
-        "noBottom": true,
-        "title": "Start virtual machine on creation",
-        "type": "checkbox",
-      },
-      "useCloudInitCustomScript": Object {
-        "id": "use-cloud-init-custom-script",
-        "isVisible": [Function],
-        "title": "Use custom script",
-        "type": "checkbox",
-      },
-      "userTemplate": Object {
-        "choices": Array [
-          "container-template",
-          "container-template-cloud-init",
-          "container-template-multus",
-          "pvc-template",
-          "pxe-template",
-          "pxe-template-dv",
-          "pxe-template-pvc",
-          "url-template",
-          "url-template-custom-flavor",
-          "url-template-nonetwork",
-          "--- No Template ---",
-        ],
-        "defaultValue": "--- Select Template ---",
-        "id": "template-dropdown",
-        "title": "Template",
-        "type": "dropdown",
-      },
-      "vCenterInstance": Object {
-        "CustomComponent": [Function],
-        "defaultValue": "--- Select vCenter Instance Secret ---",
-        "extraProps": Object {
-          "WithResources": [Function],
-          "basicSettings": Object {},
-        },
-        "help": "Select secret containing connection details for a vCenter instance.",
-        "id": "vcenter-instance-dropdown",
-        "isVisible": [Function],
-        "onChange": [Function],
-        "required": true,
-        "title": "vCenter Instance",
-        "type": "custom",
-      },
-      "vmwareHostname": Object {
-        "defaultValue": "https://host:port/",
-        "help": "Address to be used for connection to a vCenter instance. The \\"https://\\" protocol will be added automatically. Example: \\"my.domain.com:1234\\".",
-        "id": "vcenter-hostname-dropdown",
-        "isVisible": [Function],
-        "required": true,
-        "title": "vCenter Hostname",
-        "validate": [Function],
-      },
-      "vmwareNamespaceAlert": Object {
-        "CustomComponent": [Function],
-        "id": "vcenter-namespace-alert",
-        "isVisible": [Function],
-        "title": " ",
-        "type": "custom",
-      },
-      "vmwareStatus": Object {
-        "CustomComponent": [Function],
-        "extraProps": Object {
-          "WithResources": [Function],
-          "basicSettings": Object {},
-          "onCheckConnection": [Function],
-        },
-        "id": "vcenter-status",
-        "isVisible": [Function],
-        "title": " ",
-        "type": "custom",
-      },
-      "vmwareUserName": Object {
-        "help": "User name to be used for connection to a vCenter instance.",
-        "id": "vcenter-username",
-        "isVisible": [Function],
-        "required": true,
-        "title": "vCenter User Name",
-      },
-      "vmwareUserPwdCheck": Object {
-        "CustomComponent": [Function],
-        "extraProps": Object {
-          "WithResources": [Function],
-          "basicSettings": Object {},
-          "onCheckConnection": [Function],
-        },
-        "help": "User password to be used for connection to a vCenter instance.",
-        "id": "vcenter-userpwd",
-        "isVisible": [Function],
-        "required": true,
-        "title": "vCenter Password",
-        "type": "custom",
-      },
-      "vmwareVm": Object {
-        "CustomComponent": [Function],
-        "defaultValue": "--- Select VM ---",
-        "extraProps": Object {
-          "WithResources": [Function],
-          "basicSettings": Object {},
-          "k8sGet": [Function],
-          "operatingSystems": Array [
-            Object {
-              "id": "fedora29",
-              "name": "Fedora 29",
-            },
-            Object {
-              "id": "fedora28",
-              "name": "Fedora 28",
-            },
-            Object {
-              "id": "fedora27",
-              "name": "Fedora 27",
-            },
-            Object {
-              "id": "fedora26",
-              "name": "Fedora 26",
-            },
-            Object {
-              "id": "fedora25",
-              "name": "Fedora 25",
-            },
-            Object {
-              "id": "fedora24",
-              "name": "Fedora 24",
-            },
-            Object {
-              "id": "fedora23",
-              "name": "Fedora 23",
-            },
-            Object {
-              "id": "rhel7.0",
-              "name": "Red Hat Enterprise Linux 7.0",
-            },
-            Object {
-              "id": "ubuntu18.04",
-              "name": "Ubuntu 18.04 LTS",
-            },
-            Object {
-              "id": "win2k12r2",
-              "name": "Microsoft Windows Server 2012 R2",
-            },
-            Object {
-              "id": "win2k8r2",
-              "name": "Microsoft Windows Server 2008 R2",
-            },
-            Object {
-              "id": "win2k8",
-              "name": "Microsoft Windows Server 2008",
-            },
-            Object {
-              "id": "win10",
-              "name": "Microsoft Windows 10",
-            },
-          ],
-        },
-        "help": "Select a vCenter virtual machine to import. Loading of their list might take some time. The list will be enabled for selection once data are loaded.",
-        "id": "vcenter-vm-dropdown",
-        "isVisible": [Function],
-        "onChange": [Function],
-        "required": true,
-        "title": "VM to Import",
-        "type": "custom",
-      },
-      "workloadProfile": Object {
-        "choices": Array [
-          "generic",
-          "high-performance",
-        ],
-        "defaultValue": "--- Select Workload Profile ---",
-        "disabled": false,
-        "help": "The category of workload that this virtual machine will be used for.",
-        "id": "workload-profile-dropdown",
-        "required": true,
-        "title": "Workload Profile",
-        "type": "dropdown",
-      },
-    }
-  }
-  fieldsValues={Object {}}
-  horizontal={true}
-  labelSize={3}
-  onFormChange={[Function]}
-  showLabels={true}
-  textPosition="text-right"
-/>
-`;
-
-exports[`<BasicSettingsTab /> renders correctly 1`] = `
-<FormFactory
-  controlSize={5}
-  fields={
-    Object {
-      "authKeys": Object {
-        "id": "cloud-init-ssh",
-        "isVisible": [Function],
-        "title": "Authenticated SSH Keys",
-        "type": "textarea",
-      },
-      "cloudInit": Object {
-        "id": "use-cloud-init",
-        "title": "Use cloud-init",
-        "type": "checkbox",
-      },
-      "cloudInitCustomScript": Object {
-        "className": "kubevirt-create-vm-wizard__custom-cloud-script-textarea",
-        "id": "cloud-init-custom-script",
-        "isVisible": [Function],
-        "title": "Custom Script",
-        "type": "textarea",
-      },
-      "containerImage": Object {
-        "disabled": false,
-        "id": "provision-source-container",
-        "isVisible": [Function],
-        "required": true,
-        "title": "Container Image",
-        "validate": [Function],
-      },
-      "cpu": Object {
-        "help": "The number of virtual CPU cores that will be dedicated to the virtual machine.",
-        "id": "resources-cpu",
-        "isVisible": [Function],
-        "required": true,
-        "title": "CPUs",
-        "type": "positive-number",
-      },
-      "description": Object {
-        "id": "vm-description",
-        "title": "Description",
-        "type": "textarea",
-      },
-      "flavor": Object {
-        "choices": Array [
-          "small",
-          "medium",
-          "Custom",
-        ],
-        "defaultValue": "--- Select Flavor ---",
-        "disabled": false,
-        "help": "The combination of processing power and memory that will be provided to the virtual machine.",
-        "id": "flavor-dropdown",
-        "required": true,
-        "title": "Flavor",
-        "type": "dropdown",
-      },
-      "hostname": Object {
-        "id": "cloud-init-hostname",
-        "isVisible": [Function],
-        "title": "Hostname",
-      },
-      "imageURL": Object {
-        "disabled": false,
-        "id": "provision-source-url",
-        "isVisible": [Function],
-        "required": true,
-        "title": "URL",
-        "validate": [Function],
-      },
-      "memory": Object {
-        "help": "The amount of memory that will be dedicated to the virtual machine.",
-        "id": "resources-memory",
-        "isVisible": [Function],
-        "required": true,
-        "title": "Memory (GB)",
-        "type": "positive-number",
-      },
-      "name": Object {
-        "id": "vm-name",
-        "required": true,
-        "title": "Name",
-        "validate": [Function],
-      },
-      "namespace": Object {
-        "choices": Array [
-          "default",
-          "myproject",
-        ],
-        "defaultValue": "--- Select Namespace ---",
-        "id": "namespace-dropdown",
-        "required": true,
-        "title": "Namespace",
-        "type": "dropdown",
-      },
-      "operatingSystem": Object {
-        "choices": Array [
-          Object {
-            "id": "fedora29",
-            "name": "Fedora 29",
-          },
-          Object {
-            "id": "fedora28",
-            "name": "Fedora 28",
-          },
-          Object {
-            "id": "fedora27",
-            "name": "Fedora 27",
-          },
-          Object {
-            "id": "fedora26",
-            "name": "Fedora 26",
-          },
-          Object {
-            "id": "fedora25",
-            "name": "Fedora 25",
-          },
-          Object {
-            "id": "fedora24",
-            "name": "Fedora 24",
-          },
-          Object {
-            "id": "fedora23",
-            "name": "Fedora 23",
-          },
-          Object {
-            "id": "rhel7.0",
-            "name": "Red Hat Enterprise Linux 7.0",
-          },
-          Object {
-            "id": "ubuntu18.04",
-            "name": "Ubuntu 18.04 LTS",
-          },
-          Object {
-            "id": "win2k12r2",
-            "name": "Microsoft Windows Server 2012 R2",
-          },
-          Object {
-            "id": "win2k8r2",
-            "name": "Microsoft Windows Server 2008 R2",
-          },
-          Object {
-            "id": "win2k8",
-            "name": "Microsoft Windows Server 2008",
-          },
-          Object {
-            "id": "win10",
-            "name": "Microsoft Windows 10",
-          },
-        ],
-        "defaultValue": "--- Select Operating System ---",
-        "disabled": false,
-        "help": "The primary operating system that will run on the virtual machine.",
-        "id": "operating-system-dropdown",
-        "required": true,
-        "title": "Operating System",
-        "type": "dropdown",
-      },
-      "provider": Object {
-        "choices": Array [
-          "VMWare",
-        ],
-        "defaultValue": "--- Select Provider ---",
-        "help": null,
-        "id": "provider-dropdown",
-        "isVisible": [Function],
-        "onChange": [Function],
-        "required": true,
-        "title": "Provider",
-        "type": "dropdown",
-      },
-      "provisionSourceType": Object {
-        "choices": Array [
-          "PXE",
-          "URL",
-          "Container",
-          "Cloned Disk",
-          "Import",
-        ],
-        "defaultValue": "--- Select Provision Source ---",
-        "disabled": false,
-        "help": undefined,
-        "id": "image-source-type-dropdown",
-        "required": true,
-        "title": "Provision Source",
-        "type": "dropdown",
-      },
-      "rememberVmwareCredentials": Object {
-        "help": "If checked, new secret keeping connection details will be created for later use.",
-        "id": "vcenter-remember-credentials",
-        "isVisible": [Function],
-        "title": "Remember vCenter credentials",
-        "type": "checkbox",
-      },
-      "startVM": Object {
-        "id": "start-vm",
-        "isVisible": [Function],
-        "noBottom": true,
-        "title": "Start virtual machine on creation",
-        "type": "checkbox",
-      },
-      "useCloudInitCustomScript": Object {
-        "id": "use-cloud-init-custom-script",
-        "isVisible": [Function],
-        "title": "Use custom script",
-        "type": "checkbox",
-      },
-      "userTemplate": Object {
-        "choices": Array [
-          "container-template",
-          "container-template-cloud-init",
-          "container-template-multus",
-          "pvc-template",
-          "pxe-template",
-          "pxe-template-dv",
-          "pxe-template-pvc",
-          "url-template",
-          "url-template-custom-flavor",
-          "url-template-nonetwork",
-          "--- No Template ---",
-        ],
-        "defaultValue": "--- Select Template ---",
-        "id": "template-dropdown",
-        "title": "Template",
-        "type": "dropdown",
-      },
-      "vCenterInstance": Object {
-        "CustomComponent": [Function],
-        "defaultValue": "--- Select vCenter Instance Secret ---",
-        "extraProps": Object {
-          "WithResources": [Function],
-          "basicSettings": Object {},
-        },
-        "help": "Select secret containing connection details for a vCenter instance.",
-        "id": "vcenter-instance-dropdown",
-        "isVisible": [Function],
-        "onChange": [Function],
-        "required": true,
-        "title": "vCenter Instance",
-        "type": "custom",
-      },
-      "vmwareHostname": Object {
-        "defaultValue": "https://host:port/",
-        "help": "Address to be used for connection to a vCenter instance. The \\"https://\\" protocol will be added automatically. Example: \\"my.domain.com:1234\\".",
-        "id": "vcenter-hostname-dropdown",
-        "isVisible": [Function],
-        "required": true,
-        "title": "vCenter Hostname",
-        "validate": [Function],
-      },
-      "vmwareNamespaceAlert": Object {
-        "CustomComponent": [Function],
-        "id": "vcenter-namespace-alert",
-        "isVisible": [Function],
-        "title": " ",
-        "type": "custom",
-      },
-      "vmwareStatus": Object {
-        "CustomComponent": [Function],
-        "extraProps": Object {
-          "WithResources": [Function],
-          "basicSettings": Object {},
-          "onCheckConnection": [Function],
-        },
-        "id": "vcenter-status",
-        "isVisible": [Function],
-        "title": " ",
-        "type": "custom",
-      },
-      "vmwareUserName": Object {
-        "help": "User name to be used for connection to a vCenter instance.",
-        "id": "vcenter-username",
-        "isVisible": [Function],
-        "required": true,
-        "title": "vCenter User Name",
-      },
-      "vmwareUserPwdCheck": Object {
-        "CustomComponent": [Function],
-        "extraProps": Object {
-          "WithResources": [Function],
-          "basicSettings": Object {},
-          "onCheckConnection": [Function],
-        },
-        "help": "User password to be used for connection to a vCenter instance.",
-        "id": "vcenter-userpwd",
-        "isVisible": [Function],
-        "required": true,
-        "title": "vCenter Password",
-        "type": "custom",
-      },
-      "vmwareVm": Object {
-        "CustomComponent": [Function],
-        "defaultValue": "--- Select VM ---",
-        "extraProps": Object {
-          "WithResources": [Function],
-          "basicSettings": Object {},
-          "k8sGet": [Function],
-          "operatingSystems": Array [
-            Object {
-              "id": "fedora29",
-              "name": "Fedora 29",
-            },
-            Object {
-              "id": "fedora28",
-              "name": "Fedora 28",
-            },
-            Object {
-              "id": "fedora27",
-              "name": "Fedora 27",
-            },
-            Object {
-              "id": "fedora26",
-              "name": "Fedora 26",
-            },
-            Object {
-              "id": "fedora25",
-              "name": "Fedora 25",
-            },
-            Object {
-              "id": "fedora24",
-              "name": "Fedora 24",
-            },
-            Object {
-              "id": "fedora23",
-              "name": "Fedora 23",
-            },
-            Object {
-              "id": "rhel7.0",
-              "name": "Red Hat Enterprise Linux 7.0",
-            },
-            Object {
-              "id": "ubuntu18.04",
-              "name": "Ubuntu 18.04 LTS",
-            },
-            Object {
-              "id": "win2k12r2",
-              "name": "Microsoft Windows Server 2012 R2",
-            },
-            Object {
-              "id": "win2k8r2",
-              "name": "Microsoft Windows Server 2008 R2",
-            },
-            Object {
-              "id": "win2k8",
-              "name": "Microsoft Windows Server 2008",
-            },
-            Object {
-              "id": "win10",
-              "name": "Microsoft Windows 10",
-            },
-          ],
-        },
-        "help": "Select a vCenter virtual machine to import. Loading of their list might take some time. The list will be enabled for selection once data are loaded.",
-        "id": "vcenter-vm-dropdown",
-        "isVisible": [Function],
-        "onChange": [Function],
-        "required": true,
-        "title": "VM to Import",
-        "type": "custom",
-      },
-      "workloadProfile": Object {
-        "choices": Array [
-          "generic",
-          "high-performance",
-        ],
-        "defaultValue": "--- Select Workload Profile ---",
-        "disabled": false,
-        "help": "The category of workload that this virtual machine will be used for.",
-        "id": "workload-profile-dropdown",
-        "required": true,
-        "title": "Workload Profile",
-        "type": "dropdown",
-      },
-    }
-  }
-  fieldsValues={Object {}}
-  horizontal={true}
-  labelSize={3}
-  onFormChange={[Function]}
-  showLabels={true}
-  textPosition="text-right"
-/>
-`;
diff --git a/src/components/Wizard/CreateVmWizard/tests/__snapshots__/CreateVmWizard.test.js.snap b/src/components/Wizard/CreateVmWizard/tests/__snapshots__/CreateVmWizard.test.js.snap
index d769e8e08..6f3f01c9a 100644
--- a/src/components/Wizard/CreateVmWizard/tests/__snapshots__/CreateVmWizard.test.js.snap
+++ b/src/components/Wizard/CreateVmWizard/tests/__snapshots__/CreateVmWizard.test.js.snap
@@ -1,5 +1,301 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`<CreateVmWizard /> changes next step disability 1`] = `
+Object {
+  "authKeys": Object {
+    "isHidden": Object {
+      "cloudInit": true,
+      "useCloudInitCustomScript": false,
+    },
+    "value": null,
+  },
+  "cloudInit": Object {
+    "isDisabled": Object {
+      "VMWARE_PROVIDER_METADATA_ID": false,
+    },
+    "value": undefined,
+  },
+  "cloudInitCustomScript": Object {
+    "isHidden": Object {
+      "cloudInit": true,
+      "useCloudInitCustomScript": true,
+    },
+    "value": null,
+  },
+  "containerImage": Object {
+    "isDisabled": Object {
+      "userTemplate": false,
+    },
+    "isHidden": Object {
+      "provisionSourceType": false,
+    },
+    "isRequired": Object {
+      "provisionSourceType": true,
+    },
+    "validation": null,
+    "value": "pathtoimage",
+  },
+  "cpu": Object {
+    "isDisabled": Object {
+      "VMWARE_PROVIDER_METADATA_ID": false,
+    },
+    "isHidden": Object {
+      "flavor": true,
+    },
+    "isRequired": Object {
+      "flavor": false,
+    },
+    "value": undefined,
+  },
+  "description": Object {
+    "isDisabled": Object {
+      "VMWARE_PROVIDER_METADATA_ID": false,
+    },
+    "value": undefined,
+  },
+  "flavor": Object {
+    "flavors": Array [
+      "small",
+      "Custom",
+    ],
+    "isDisabled": Object {
+      "VMWARE_PROVIDER_METADATA_ID": false,
+      "VM_SETTINGS_METADATA_ID": false,
+    },
+    "validation": undefined,
+    "value": "small",
+  },
+  "hostname": Object {
+    "isHidden": Object {
+      "cloudInit": true,
+      "useCloudInitCustomScript": false,
+    },
+    "value": null,
+  },
+  "imageURL": Object {
+    "isDisabled": Object {
+      "userTemplate": false,
+    },
+    "isHidden": Object {
+      "provisionSourceType": true,
+    },
+    "isRequired": Object {
+      "provisionSourceType": false,
+    },
+    "validation": null,
+    "value": null,
+  },
+  "memory": Object {
+    "isDisabled": Object {
+      "VMWARE_PROVIDER_METADATA_ID": false,
+    },
+    "isHidden": Object {
+      "flavor": true,
+    },
+    "isRequired": Object {
+      "flavor": false,
+    },
+    "value": undefined,
+  },
+  "name": Object {
+    "isDisabled": Object {
+      "VMWARE_PROVIDER_METADATA_ID": false,
+    },
+    "validation": null,
+    "value": "name",
+  },
+  "namespace": Object {
+    "validation": undefined,
+    "value": "namespace",
+  },
+  "operatingSystem": Object {
+    "isDisabled": Object {
+      "VMWARE_PROVIDER_METADATA_ID": false,
+      "userTemplate": false,
+    },
+    "operatingSystems": Array [
+      Object {
+        "id": "fedora29",
+        "name": "Fedora 29",
+      },
+      Object {
+        "id": "fedora28",
+        "name": "Fedora 28",
+      },
+      Object {
+        "id": "fedora27",
+        "name": "Fedora 27",
+      },
+      Object {
+        "id": "fedora26",
+        "name": "Fedora 26",
+      },
+      Object {
+        "id": "fedora25",
+        "name": "Fedora 25",
+      },
+      Object {
+        "id": "fedora24",
+        "name": "Fedora 24",
+      },
+      Object {
+        "id": "fedora23",
+        "name": "Fedora 23",
+      },
+      Object {
+        "id": "rhel7.0",
+        "name": "Red Hat Enterprise Linux 7.0",
+      },
+      Object {
+        "id": "ubuntu18.04",
+        "name": "Ubuntu 18.04 LTS",
+      },
+    ],
+    "validation": undefined,
+    "value": Object {
+      "id": "fedora29",
+      "name": "Fedora 29",
+    },
+  },
+  "provider": Object {
+    "isDisabled": Object {
+      "provider": false,
+    },
+    "isHidden": Object {
+      "provisionSourceType": true,
+    },
+    "isRequired": Object {
+      "provisionSourceType": false,
+    },
+    "validation": null,
+    "value": null,
+  },
+  "providersData": Object {
+    "VMware": Object {
+      "checkConnectionButton": Object {
+        "isDisabled": Object {
+          "VMWARE_PROVIDER_METADATA_ID": false,
+          "vCenterInstance": true,
+        },
+        "isHidden": Object {
+          "VMWARE_PROVIDER_METADATA_ID": true,
+          "vCenterInstance": true,
+        },
+      },
+      "rememberVMwareCredentials": Object {
+        "isDisabled": Object {
+          "VMWARE_PROVIDER_METADATA_ID": false,
+        },
+        "isHidden": Object {
+          "VMWARE_PROVIDER_METADATA_ID": true,
+          "vCenterInstance": true,
+        },
+      },
+      "vCenterInstance": Object {
+        "isDisabled": Object {
+          "VMWARE_PROVIDER_METADATA_ID": false,
+        },
+        "isHidden": Object {
+          "VMWARE_PROVIDER_METADATA_ID": true,
+        },
+        "isRequired": Object {
+          "VMWARE_PROVIDER_METADATA_ID": false,
+        },
+      },
+      "vmwareHostname": Object {
+        "isDisabled": Object {
+          "VMWARE_PROVIDER_METADATA_ID": false,
+        },
+        "isHidden": Object {
+          "VMWARE_PROVIDER_METADATA_ID": true,
+          "vCenterInstance": true,
+        },
+        "isRequired": Object {
+          "vCenterInstance": false,
+        },
+      },
+      "vmwarePassword": Object {
+        "isDisabled": Object {
+          "VMWARE_PROVIDER_METADATA_ID": false,
+        },
+        "isHidden": Object {
+          "VMWARE_PROVIDER_METADATA_ID": true,
+          "vCenterInstance": true,
+        },
+        "isRequired": Object {
+          "vCenterInstance": false,
+        },
+      },
+      "vmwareStatus": Object {
+        "isHidden": Object {
+          "VMWARE_PROVIDER_METADATA_ID": true,
+        },
+      },
+      "vmwareUserName": Object {
+        "isDisabled": Object {
+          "VMWARE_PROVIDER_METADATA_ID": false,
+        },
+        "isHidden": Object {
+          "VMWARE_PROVIDER_METADATA_ID": true,
+          "vCenterInstance": true,
+        },
+        "isRequired": Object {
+          "vCenterInstance": false,
+        },
+      },
+      "vmwareVm": Object {
+        "isDisabled": Object {
+          "VMWARE_PROVIDER_METADATA_ID": true,
+          "vmwareVm": true,
+        },
+        "isHidden": Object {
+          "VMWARE_PROVIDER_METADATA_ID": true,
+        },
+        "isRequired": Object {
+          "VMWARE_PROVIDER_METADATA_ID": false,
+        },
+      },
+    },
+  },
+  "provisionSourceType": Object {
+    "isDisabled": Object {
+      "userTemplate": false,
+    },
+    "validation": undefined,
+    "value": "Container",
+  },
+  "startVM": Object {
+    "isHidden": Object {
+      "provisionSourceType": false,
+    },
+    "value": undefined,
+  },
+  "useCloudInitCustomScript": Object {
+    "isHidden": Object {
+      "cloudInit": true,
+    },
+    "value": false,
+  },
+  "userTemplate": Object {
+    "isHidden": Object {
+      "provisionSourceType": false,
+    },
+    "value": undefined,
+  },
+  "workloadProfile": Object {
+    "isDisabled": Object {
+      "VMWARE_PROVIDER_METADATA_ID": false,
+      "userTemplate": false,
+    },
+    "validation": undefined,
+    "value": "generic",
+    "workloadProfiles": Array [
+      "generic",
+    ],
+  },
+}
+`;
+
 exports[`<CreateVmWizard /> renders correctly 1`] = `
 <WizardPattern
   activeStepIndex={0}
@@ -26,7 +322,7 @@ exports[`<CreateVmWizard /> renders correctly 1`] = `
   steps={
     Array [
       Object {
-        "key": "basicSettings",
+        "key": "vmSettings",
         "onCloseWizard": [Function],
         "render": [Function],
         "title": "Basic Settings",
diff --git a/src/components/Wizard/CreateVmWizard/tests/__snapshots__/NetworksTab.test.js.snap b/src/components/Wizard/CreateVmWizard/tests/__snapshots__/NetworksTab.test.js.snap
index 7b9bc780c..3772bdbbb 100644
--- a/src/components/Wizard/CreateVmWizard/tests/__snapshots__/NetworksTab.test.js.snap
+++ b/src/components/Wizard/CreateVmWizard/tests/__snapshots__/NetworksTab.test.js.snap
@@ -101,6 +101,7 @@ exports[`<NetworksTab /> renders correctly 1`] = `
       Object {
         "pxeNetwork": Object {
           "validation": Object {
+            "isEmptyError": false,
             "message": "A PXE-capable NIC could not be found",
             "type": "error",
           },
diff --git a/src/components/Wizard/CreateVmWizard/tests/__snapshots__/StorageTab.test.js.snap b/src/components/Wizard/CreateVmWizard/tests/__snapshots__/StorageTab.test.js.snap
index 2e61f1d9e..f336baa4c 100644
--- a/src/components/Wizard/CreateVmWizard/tests/__snapshots__/StorageTab.test.js.snap
+++ b/src/components/Wizard/CreateVmWizard/tests/__snapshots__/StorageTab.test.js.snap
@@ -96,6 +96,7 @@ exports[`<StorageTab /> renders correctly 1`] = `
       Object {
         "bootableDisk": Object {
           "validation": Object {
+            "isEmptyError": false,
             "message": "A bootable disk could not be found",
             "type": "error",
           },
diff --git a/src/components/Wizard/CreateVmWizard/tests/__snapshots__/VmSettingsTab.test.js.snap b/src/components/Wizard/CreateVmWizard/tests/__snapshots__/VmSettingsTab.test.js.snap
new file mode 100644
index 000000000..622ee7f80
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/tests/__snapshots__/VmSettingsTab.test.js.snap
@@ -0,0 +1,891 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<VmSettingsTab /> for Create VM Template renders correctly 1`] = `
+<Form
+  bsClass="form"
+  componentClass="form"
+  horizontal={true}
+  inline={false}
+>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="name"
+    labelSize={3}
+    textPosition="text-right"
+    title="Name"
+    validation={Object {}}
+  >
+    <Text
+      disabled={false}
+      id="vm-name"
+      onBlur={[Function]}
+      onChange={[Function]}
+      type="text"
+      value=""
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="description"
+    labelSize={3}
+    textPosition="text-right"
+    title="Description"
+    validation={Object {}}
+  >
+    <TextArea
+      disabled={false}
+      id="vm-description"
+      onBlur={[Function]}
+      onChange={[Function]}
+      value=""
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="namespace"
+    labelSize={3}
+    textPosition="text-right"
+    title="Namespace"
+    validation={Object {}}
+  >
+    <Dropdown
+      choices={
+        Array [
+          "default",
+          "myproject",
+        ]
+      }
+      disabled={false}
+      id="namespace-dropdown"
+      onChange={[Function]}
+      value="--- Select Namespace ---"
+      withTooltips={false}
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="userTemplate"
+    labelSize={3}
+    textPosition="text-right"
+    title="Template"
+    validation={Object {}}
+  >
+    <Dropdown
+      choices={
+        Array [
+          "container-template",
+          "container-template-cloud-init",
+          "container-template-multus",
+          "pvc-template",
+          "pxe-template",
+          "pxe-template-dv",
+          "pxe-template-pvc",
+          "url-template",
+          "url-template-custom-flavor",
+          "url-template-nonetwork",
+          "--- No Template ---",
+        ]
+      }
+      disabled={false}
+      id="template-dropdown"
+      onChange={[Function]}
+      value="--- Select Template ---"
+      withTooltips={false}
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help=""
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="provisionSourceType"
+    labelSize={3}
+    textPosition="text-right"
+    title="Provision Source"
+    validation={Object {}}
+  >
+    <Dropdown
+      choices={Array []}
+      disabled={false}
+      id="image-source-type-dropdown"
+      onChange={[Function]}
+      value="--- Select Provision Source ---"
+      withTooltips={false}
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help=""
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="provider"
+    labelSize={3}
+    textPosition="text-right"
+    title="Provider"
+    validation={Object {}}
+  >
+    <Dropdown
+      choices={Array []}
+      disabled={false}
+      id="provider-dropdown"
+      onChange={[Function]}
+      value="--- Select Provider ---"
+      withTooltips={false}
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="containerImage"
+    labelSize={3}
+    textPosition="text-right"
+    title="Container Image"
+    validation={Object {}}
+  >
+    <TextArea
+      disabled={false}
+      id="provision-source-container"
+      onBlur={[Function]}
+      onChange={[Function]}
+      value=""
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="imageURL"
+    labelSize={3}
+    textPosition="text-right"
+    title="URL"
+    validation={Object {}}
+  >
+    <TextArea
+      disabled={false}
+      id="provision-source-url"
+      onBlur={[Function]}
+      onChange={[Function]}
+      value=""
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help="The primary operating system that will run on the virtual machine."
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="operatingSystem"
+    labelSize={3}
+    textPosition="text-right"
+    title="Operating System"
+    validation={Object {}}
+  >
+    <Dropdown
+      choices={Array []}
+      disabled={false}
+      id="operating-system-dropdown"
+      onChange={[Function]}
+      value="--- Select Operating System ---"
+      withTooltips={false}
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help="The combination of processing power and memory that will be provided to the virtual machine."
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="flavor"
+    labelSize={3}
+    textPosition="text-right"
+    title="Flavor"
+    validation={Object {}}
+  >
+    <Dropdown
+      choices={Array []}
+      disabled={false}
+      id="flavor-dropdown"
+      onChange={[Function]}
+      value="--- Select Flavor ---"
+      withTooltips={false}
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help="The amount of memory that will be dedicated to the virtual machine."
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="memory"
+    labelSize={3}
+    textPosition="text-right"
+    title="Memory (GB)"
+    validation={Object {}}
+  >
+    <Integer
+      disabled={false}
+      id="resources-memory"
+      nonNegative={false}
+      onBlur={[Function]}
+      onChange={[Function]}
+      positive={true}
+      value=""
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help="The number of virtual CPU cores that will be dedicated to the virtual machine."
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="cpu"
+    labelSize={3}
+    textPosition="text-right"
+    title="CPUs"
+    validation={Object {}}
+  >
+    <Integer
+      disabled={false}
+      id="resources-cpu"
+      nonNegative={false}
+      onBlur={[Function]}
+      onChange={[Function]}
+      positive={true}
+      value=""
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help="The category of workload that this virtual machine will be used for."
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="workloadProfile"
+    labelSize={3}
+    textPosition="text-right"
+    title="Workload Profile"
+    validation={Object {}}
+  >
+    <Dropdown
+      choices={Array []}
+      disabled={false}
+      id="workload-profile-dropdown"
+      onChange={[Function]}
+      value="--- Select Workload Profile ---"
+      withTooltips={false}
+    />
+  </FormRow>
+  <FormRow
+    className="kubevirt-form-group--no-bottom"
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="startVM"
+    labelSize={3}
+    textPosition="text-right"
+    title=""
+    validation={Object {}}
+  >
+    <Checkbox
+      checked={false}
+      disabled={false}
+      id="start-vm"
+      onBlur={[Function]}
+      onChange={[Function]}
+      title="Start virtual machine on creation"
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="cloudInit"
+    labelSize={3}
+    textPosition="text-right"
+    title=""
+    validation={Object {}}
+  >
+    <Checkbox
+      checked={false}
+      disabled={false}
+      id="use-cloud-init"
+      onBlur={[Function]}
+      onChange={[Function]}
+      title="Use cloud-init"
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="useCloudInitCustomScript"
+    labelSize={3}
+    textPosition="text-right"
+    title=""
+    validation={Object {}}
+  >
+    <Checkbox
+      checked={false}
+      disabled={false}
+      id="use-cloud-init-custom-script"
+      onBlur={[Function]}
+      onChange={[Function]}
+      title="Use custom script"
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="hostname"
+    labelSize={3}
+    textPosition="text-right"
+    title="Hostname"
+    validation={Object {}}
+  >
+    <Text
+      disabled={false}
+      id="cloud-init-hostname"
+      onBlur={[Function]}
+      onChange={[Function]}
+      type="text"
+      value=""
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="authKeys"
+    labelSize={3}
+    textPosition="text-right"
+    title="Authenticated SSH Keys"
+    validation={Object {}}
+  >
+    <TextArea
+      disabled={false}
+      id="cloud-init-ssh"
+      onBlur={[Function]}
+      onChange={[Function]}
+      value=""
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="cloudInitCustomScript"
+    labelSize={3}
+    textPosition="text-right"
+    title="Custom Script"
+    validation={Object {}}
+  >
+    <TextArea
+      className="kubevirt-create-vm-wizard__custom-cloud-script-textarea"
+      disabled={false}
+      id="cloud-init-custom-script"
+      onBlur={[Function]}
+      onChange={[Function]}
+      value=""
+    />
+  </FormRow>
+</Form>
+`;
+
+exports[`<VmSettingsTab /> renders correctly 1`] = `
+<Form
+  bsClass="form"
+  componentClass="form"
+  horizontal={true}
+  inline={false}
+>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="name"
+    labelSize={3}
+    textPosition="text-right"
+    title="Name"
+    validation={Object {}}
+  >
+    <Text
+      disabled={false}
+      id="vm-name"
+      onBlur={[Function]}
+      onChange={[Function]}
+      type="text"
+      value=""
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="description"
+    labelSize={3}
+    textPosition="text-right"
+    title="Description"
+    validation={Object {}}
+  >
+    <TextArea
+      disabled={false}
+      id="vm-description"
+      onBlur={[Function]}
+      onChange={[Function]}
+      value=""
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="namespace"
+    labelSize={3}
+    textPosition="text-right"
+    title="Namespace"
+    validation={Object {}}
+  >
+    <Dropdown
+      choices={
+        Array [
+          "default",
+          "myproject",
+        ]
+      }
+      disabled={false}
+      id="namespace-dropdown"
+      onChange={[Function]}
+      value="--- Select Namespace ---"
+      withTooltips={false}
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="userTemplate"
+    labelSize={3}
+    textPosition="text-right"
+    title="Template"
+    validation={Object {}}
+  >
+    <Dropdown
+      choices={
+        Array [
+          "container-template",
+          "container-template-cloud-init",
+          "container-template-multus",
+          "pvc-template",
+          "pxe-template",
+          "pxe-template-dv",
+          "pxe-template-pvc",
+          "url-template",
+          "url-template-custom-flavor",
+          "url-template-nonetwork",
+          "--- No Template ---",
+        ]
+      }
+      disabled={false}
+      id="template-dropdown"
+      onChange={[Function]}
+      value="--- Select Template ---"
+      withTooltips={false}
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help=""
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="provisionSourceType"
+    labelSize={3}
+    textPosition="text-right"
+    title="Provision Source"
+    validation={Object {}}
+  >
+    <Dropdown
+      choices={Array []}
+      disabled={false}
+      id="image-source-type-dropdown"
+      onChange={[Function]}
+      value="--- Select Provision Source ---"
+      withTooltips={false}
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help=""
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="provider"
+    labelSize={3}
+    textPosition="text-right"
+    title="Provider"
+    validation={Object {}}
+  >
+    <Dropdown
+      choices={Array []}
+      disabled={false}
+      id="provider-dropdown"
+      onChange={[Function]}
+      value="--- Select Provider ---"
+      withTooltips={false}
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="containerImage"
+    labelSize={3}
+    textPosition="text-right"
+    title="Container Image"
+    validation={Object {}}
+  >
+    <TextArea
+      disabled={false}
+      id="provision-source-container"
+      onBlur={[Function]}
+      onChange={[Function]}
+      value=""
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="imageURL"
+    labelSize={3}
+    textPosition="text-right"
+    title="URL"
+    validation={Object {}}
+  >
+    <TextArea
+      disabled={false}
+      id="provision-source-url"
+      onBlur={[Function]}
+      onChange={[Function]}
+      value=""
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help="The primary operating system that will run on the virtual machine."
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="operatingSystem"
+    labelSize={3}
+    textPosition="text-right"
+    title="Operating System"
+    validation={Object {}}
+  >
+    <Dropdown
+      choices={Array []}
+      disabled={false}
+      id="operating-system-dropdown"
+      onChange={[Function]}
+      value="--- Select Operating System ---"
+      withTooltips={false}
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help="The combination of processing power and memory that will be provided to the virtual machine."
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="flavor"
+    labelSize={3}
+    textPosition="text-right"
+    title="Flavor"
+    validation={Object {}}
+  >
+    <Dropdown
+      choices={Array []}
+      disabled={false}
+      id="flavor-dropdown"
+      onChange={[Function]}
+      value="--- Select Flavor ---"
+      withTooltips={false}
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help="The amount of memory that will be dedicated to the virtual machine."
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="memory"
+    labelSize={3}
+    textPosition="text-right"
+    title="Memory (GB)"
+    validation={Object {}}
+  >
+    <Integer
+      disabled={false}
+      id="resources-memory"
+      nonNegative={false}
+      onBlur={[Function]}
+      onChange={[Function]}
+      positive={true}
+      value=""
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help="The number of virtual CPU cores that will be dedicated to the virtual machine."
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="cpu"
+    labelSize={3}
+    textPosition="text-right"
+    title="CPUs"
+    validation={Object {}}
+  >
+    <Integer
+      disabled={false}
+      id="resources-cpu"
+      nonNegative={false}
+      onBlur={[Function]}
+      onChange={[Function]}
+      positive={true}
+      value=""
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help="The category of workload that this virtual machine will be used for."
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="workloadProfile"
+    labelSize={3}
+    textPosition="text-right"
+    title="Workload Profile"
+    validation={Object {}}
+  >
+    <Dropdown
+      choices={Array []}
+      disabled={false}
+      id="workload-profile-dropdown"
+      onChange={[Function]}
+      value="--- Select Workload Profile ---"
+      withTooltips={false}
+    />
+  </FormRow>
+  <FormRow
+    className="kubevirt-form-group--no-bottom"
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="startVM"
+    labelSize={3}
+    textPosition="text-right"
+    title=""
+    validation={Object {}}
+  >
+    <Checkbox
+      checked={false}
+      disabled={false}
+      id="start-vm"
+      onBlur={[Function]}
+      onChange={[Function]}
+      title="Start virtual machine on creation"
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="cloudInit"
+    labelSize={3}
+    textPosition="text-right"
+    title=""
+    validation={Object {}}
+  >
+    <Checkbox
+      checked={false}
+      disabled={false}
+      id="use-cloud-init"
+      onBlur={[Function]}
+      onChange={[Function]}
+      title="Use cloud-init"
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="useCloudInitCustomScript"
+    labelSize={3}
+    textPosition="text-right"
+    title=""
+    validation={Object {}}
+  >
+    <Checkbox
+      checked={false}
+      disabled={false}
+      id="use-cloud-init-custom-script"
+      onBlur={[Function]}
+      onChange={[Function]}
+      title="Use custom script"
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="hostname"
+    labelSize={3}
+    textPosition="text-right"
+    title="Hostname"
+    validation={Object {}}
+  >
+    <Text
+      disabled={false}
+      id="cloud-init-hostname"
+      onBlur={[Function]}
+      onChange={[Function]}
+      type="text"
+      value=""
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="authKeys"
+    labelSize={3}
+    textPosition="text-right"
+    title="Authenticated SSH Keys"
+    validation={Object {}}
+  >
+    <TextArea
+      disabled={false}
+      id="cloud-init-ssh"
+      onBlur={[Function]}
+      onChange={[Function]}
+      value=""
+    />
+  </FormRow>
+  <FormRow
+    className={null}
+    controlSize={5}
+    help={null}
+    id={null}
+    isHidden={false}
+    isRequired={false}
+    key="cloudInitCustomScript"
+    labelSize={3}
+    textPosition="text-right"
+    title="Custom Script"
+    validation={Object {}}
+  >
+    <TextArea
+      className="kubevirt-create-vm-wizard__custom-cloud-script-textarea"
+      disabled={false}
+      id="cloud-init-custom-script"
+      onBlur={[Function]}
+      onChange={[Function]}
+      value=""
+    />
+  </FormRow>
+</Form>
+`;
diff --git a/src/components/Wizard/CreateVmWizard/utils/vmSettingsTabUtils.js b/src/components/Wizard/CreateVmWizard/utils/vmSettingsTabUtils.js
new file mode 100644
index 000000000..b01805b28
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/utils/vmSettingsTabUtils.js
@@ -0,0 +1,39 @@
+import { get, isEqual } from 'lodash';
+
+import { hasObjectTruthyValue } from '../../../../utils';
+import { PROVIDER_KEY, VM_SETTINGS_TAB_KEY } from '../constants';
+import { settingsValue } from '../../../..';
+import { cleanupProvider } from '../providers';
+
+export const VM_SETTINGS_METADATA_ID = 'VM_SETTINGS_METADATA_ID';
+export const VMWARE_PROVIDER_METADATA_ID = 'VMWARE_PROVIDER_METADATA_ID';
+
+export const asValueObject = value => ({ value });
+
+export const isFieldRequired = field => hasObjectTruthyValue(get(field, 'isRequired'));
+export const isFieldHidden = field => hasObjectTruthyValue(get(field, 'isHidden'));
+export const isFieldDisabled = field => hasObjectTruthyValue(get(field, 'isDisabled'));
+
+export const asRequired = (value, key = VM_SETTINGS_METADATA_ID) => ({ [key]: !!value });
+export const asHidden = (value, key = VM_SETTINGS_METADATA_ID) => ({ [key]: !!value });
+export const asDisabled = (value, key = VM_SETTINGS_METADATA_ID) => ({ [key]: !!value });
+
+export const hasVmSettingsChanged = (prevState, state, ...keys) =>
+  keys.find(key => !isEqual(getVmSetting(prevState, key), getVmSetting(state, key)));
+
+export const didPropChange = (prevProps, props, key, getCompareValue) =>
+  !isEqual(getCompareValue(get(prevProps, key)), getCompareValue(get(props, key)));
+
+export const getVmSettings = state => get(state, ['stepData', VM_SETTINGS_TAB_KEY, 'value']) || state;
+
+export const getVmSetting = (state, path, defaultValue) => get(getVmSettings(state), path, defaultValue);
+export const getVmSettingAttribute = (state, key, attribute = 'value', defaultValue) =>
+  getVmSetting(state, [key, attribute], defaultValue);
+
+export const getVmSettingValue = (state, key, defaultValue) => getVmSettingAttribute(state, key, 'value', defaultValue);
+
+// Do clean-up
+export const onCloseVmSettings = async (vmSettings, callerContext) => {
+  const provider = settingsValue(vmSettings, PROVIDER_KEY);
+  cleanupProvider(provider, vmSettings, callerContext);
+};
diff --git a/src/components/Wizard/CreateVmWizard/validations/index.js b/src/components/Wizard/CreateVmWizard/validations/index.js
new file mode 100644
index 000000000..011b41e03
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/validations/index.js
@@ -0,0 +1 @@
+export * from './validators';
diff --git a/src/components/Wizard/CreateVmWizard/validations/providers/vmWareValidation.js b/src/components/Wizard/CreateVmWizard/validations/providers/vmWareValidation.js
new file mode 100644
index 000000000..542719261
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/validations/providers/vmWareValidation.js
@@ -0,0 +1,86 @@
+import { get, isObject } from 'lodash';
+
+import { validateVmwareURL } from '../../../../../utils/validations';
+import { VALIDATION_ERROR_TYPE, VALIDATION_INFO_TYPE } from '../../../../../constants';
+import { objectMerge } from '../../../../../utils/utils';
+import { settingsValue } from '../../../../../k8s/selectors';
+import { isFieldRequired } from '../../utils/vmSettingsTabUtils';
+import { PROVIDER_VMWARE, PROVIDER_VMWARE_HOSTNAME_KEY } from '../../providers/VMwareImportProvider/constants';
+import { asUpdateValidator, asGenericFieldValidator } from '../utils';
+import { OPERATING_SYSTEM_KEY, PROVIDERS_DATA_KEY } from '../../constants';
+import { getVmwareOsString } from '../../strings';
+
+const operatingSystemValidator = (key, vmSettings) => {
+  const os = vmSettings[key] || {};
+  const { value, guestFullName } = os;
+
+  return {
+    validation:
+      value || !guestFullName
+        ? null
+        : {
+            message: getVmwareOsString(guestFullName),
+            type: VALIDATION_INFO_TYPE,
+          },
+  };
+};
+
+const validateResolver = {
+  [OPERATING_SYSTEM_KEY]: operatingSystemValidator,
+};
+
+// TODO extract getFieldTitle from vmWareInitialState to prevent circular dependencies
+const validateVMwareResolver = {
+  [PROVIDER_VMWARE_HOSTNAME_KEY]: asGenericFieldValidator(
+    asUpdateValidator(validateVmwareURL),
+    () => 'vCenter Hostname'
+  ),
+};
+
+export const validateVmwareProvider = vmSettings => {
+  const update = {
+    [PROVIDERS_DATA_KEY]: {},
+  };
+
+  Object.keys(vmSettings).forEach(key => {
+    const validator = validateResolver[key];
+    if (validator) {
+      update[key] = validator(key, vmSettings);
+    }
+  });
+
+  update[PROVIDERS_DATA_KEY][PROVIDER_VMWARE] = validateVmwareDataProvider(
+    get(vmSettings, PROVIDERS_DATA_KEY, PROVIDER_VMWARE)
+  );
+
+  return update; // do not merge send as update with vmSettings validation
+};
+
+export const validateVmwareDataProvider = providerData => {
+  const update = {};
+
+  Object.keys(providerData).forEach(key => {
+    const validator = validateVMwareResolver[key];
+    if (validator) {
+      update[key] = validator(key, providerData);
+    }
+  });
+
+  return objectMerge({}, providerData, update);
+};
+
+export const isVmwareProviderValid = (providerData, vmSettings) => {
+  const keys = Object.keys(providerData);
+
+  // check if all required fields are defined
+  let valid = keys
+    .filter(key => isObject(providerData[key]) && isFieldRequired(providerData[key]))
+    .every(key => settingsValue(providerData, key));
+
+  if (valid) {
+    // check if all fields are valid
+    valid = keys.every(key => get(providerData, [key, 'validation', 'type']) !== VALIDATION_ERROR_TYPE);
+  }
+
+  return valid;
+};
diff --git a/src/components/Wizard/CreateVmWizard/validations/utils.js b/src/components/Wizard/CreateVmWizard/validations/utils.js
new file mode 100644
index 000000000..d898c6f1d
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/validations/utils.js
@@ -0,0 +1,28 @@
+import { get } from 'lodash';
+
+export const asGenericFieldValidator = (customValidator, getFieldTitle) => (key, vmSettings) => {
+  const field = vmSettings[key] || {};
+  const { validation, ...rest } = customValidator && customValidator(field.value, vmSettings);
+  let val = validation;
+
+  // next step is disabled by isValid so empty errors do not need to be shown
+  if (get(val, 'isEmptyError')) {
+    val = null;
+  }
+
+  if (val) {
+    const title = getFieldTitle(key);
+    if (title) {
+      val.message = `${getFieldTitle(key)} ${val.message}`;
+    }
+  }
+
+  return {
+    ...rest,
+    validation: val === undefined ? null : val,
+  };
+};
+
+export const asUpdateValidator = customValidator => (...values) => ({
+  validation: customValidator(...values),
+});
diff --git a/src/components/Wizard/CreateVmWizard/validations/validators.js b/src/components/Wizard/CreateVmWizard/validations/validators.js
new file mode 100644
index 000000000..008c06a8d
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/validations/validators.js
@@ -0,0 +1,28 @@
+import { VM_SETTINGS_TAB_KEY } from '../constants';
+import { isVmSettingsTabValid, validateVmSettings } from './vmSettingsTabValidation';
+
+const validateTabResolver = {
+  [VM_SETTINGS_TAB_KEY]: validateVmSettings,
+};
+
+const isTabValidResolver = {
+  [VM_SETTINGS_TAB_KEY]: isVmSettingsTabValid,
+};
+
+export const validateTabData = (tabKey, data, valid) => {
+  const dataValidator = validateTabResolver[tabKey];
+  const tabValidator = isTabValidResolver[tabKey];
+
+  if (dataValidator) {
+    data = dataValidator(data);
+  }
+
+  if (tabValidator) {
+    valid = tabValidator(data);
+  }
+
+  return {
+    value: data,
+    valid,
+  };
+};
diff --git a/src/components/Wizard/CreateVmWizard/validations/vmSettingsTabValidation.js b/src/components/Wizard/CreateVmWizard/validations/vmSettingsTabValidation.js
new file mode 100644
index 000000000..3adf66995
--- /dev/null
+++ b/src/components/Wizard/CreateVmWizard/validations/vmSettingsTabValidation.js
@@ -0,0 +1,86 @@
+import { get } from 'lodash';
+
+import { isFieldRequired } from '../utils/vmSettingsTabUtils';
+import {
+  getValidationObject,
+  validateContainer,
+  validateDNS1123SubdomainValue,
+  validateURL,
+} from '../../../../utils/validations';
+import { objectMerge } from '../../../../utils/utils';
+import { settingsValue } from '../../../../k8s/selectors';
+import { PROVISION_SOURCE_IMPORT, VALIDATION_ERROR_TYPE } from '../../../../constants';
+import {
+  CONTAINER_IMAGE_KEY,
+  IMAGE_URL_KEY,
+  NAME_KEY,
+  NAMESPACE_KEY,
+  PROVIDER_KEY,
+  PROVIDERS_DATA_KEY,
+  PROVISION_SOURCE_TYPE_KEY,
+} from '../constants';
+import { NAMESPACE_MUST_BE_SELECTED } from '../../../../utils/strings';
+import { isProviderValid, validateProvider } from '../providers';
+import { asUpdateValidator, asGenericFieldValidator } from './utils';
+import { getFieldTitle } from '../initialState/vmSettingsTabInitialState';
+
+const validateProviderDropdown = (key, vmSettings) => {
+  let validation = null;
+  if (
+    settingsValue(vmSettings, PROVISION_SOURCE_TYPE_KEY) === PROVISION_SOURCE_IMPORT &&
+    !settingsValue(vmSettings, NAMESPACE_KEY)
+  ) {
+    validation = getValidationObject(NAMESPACE_MUST_BE_SELECTED);
+  }
+
+  return {
+    validation,
+  };
+};
+
+const asVmSettingsValidator = validator => asGenericFieldValidator(asUpdateValidator(validator), getFieldTitle);
+
+const validateResolver = {
+  [NAME_KEY]: asVmSettingsValidator(validateDNS1123SubdomainValue),
+  [CONTAINER_IMAGE_KEY]: asVmSettingsValidator(validateContainer),
+  [IMAGE_URL_KEY]: asVmSettingsValidator(validateURL),
+  [PROVIDER_KEY]: validateProviderDropdown,
+};
+
+export const validateVmSettings = vmSettings => {
+  const update = {};
+
+  Object.keys(vmSettings).forEach(key => {
+    const validator = validateResolver[key];
+    if (validator) {
+      update[key] = validator(key, vmSettings);
+    }
+  });
+
+  const provider = settingsValue(vmSettings, PROVIDER_KEY);
+  const providerUpdate = validateProvider(provider, vmSettings);
+
+  return objectMerge({}, vmSettings, update, providerUpdate);
+};
+
+export const isVmSettingsTabValid = newVmSettings => {
+  const keys = Object.keys(newVmSettings);
+
+  // check if all required fields are defined
+  let valid = keys.filter(key => isFieldRequired(newVmSettings[key])).every(key => settingsValue(newVmSettings, key));
+
+  if (valid) {
+    const provider = settingsValue(newVmSettings, PROVIDER_KEY);
+    if (provider) {
+      const providersData = newVmSettings[PROVIDERS_DATA_KEY];
+      valid = isProviderValid(provider, providersData[provider], newVmSettings);
+    }
+  }
+
+  if (valid) {
+    // check if all fields are valid
+    valid = keys.every(key => get(newVmSettings, [key, 'validation', 'type']) !== VALIDATION_ERROR_TYPE);
+  }
+
+  return valid;
+};
diff --git a/src/components/Wizard/LoadingTab/LoadingTab.js b/src/components/Wizard/LoadingTab/LoadingTab.js
new file mode 100644
index 000000000..c87b05c63
--- /dev/null
+++ b/src/components/Wizard/LoadingTab/LoadingTab.js
@@ -0,0 +1,18 @@
+import React from 'react';
+
+import PropTypes from 'prop-types';
+
+import { Loading } from '../../Loading';
+
+export const LoadingTab = ({ children, text, ...loadingData }) =>
+  Object.keys(loadingData).every(dataKey => loadingData[dataKey]) ? children : <Loading key="loading" text={text} />;
+
+LoadingTab.defaultProps = {
+  text: 'Loading Page',
+  children: null,
+};
+
+LoadingTab.propTypes = {
+  text: PropTypes.string,
+  children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+};
diff --git a/src/components/Wizard/LoadingTab/fixtures/LoadingTab.fixture.js b/src/components/Wizard/LoadingTab/fixtures/LoadingTab.fixture.js
new file mode 100644
index 000000000..f90b47064
--- /dev/null
+++ b/src/components/Wizard/LoadingTab/fixtures/LoadingTab.fixture.js
@@ -0,0 +1,7 @@
+import { LoadingTab } from '../LoadingTab';
+
+export default [
+  {
+    component: LoadingTab,
+  },
+];
diff --git a/src/components/Wizard/LoadingTab/index.js b/src/components/Wizard/LoadingTab/index.js
new file mode 100644
index 000000000..8119dd15a
--- /dev/null
+++ b/src/components/Wizard/LoadingTab/index.js
@@ -0,0 +1 @@
+export { LoadingTab } from './LoadingTab';
diff --git a/src/components/Wizard/LoadingTab/tests/LoadingTab.test.js b/src/components/Wizard/LoadingTab/tests/LoadingTab.test.js
new file mode 100644
index 000000000..acc049e9c
--- /dev/null
+++ b/src/components/Wizard/LoadingTab/tests/LoadingTab.test.js
@@ -0,0 +1,13 @@
+import React from 'react';
+import { mount } from 'enzyme';
+
+import { LoadingTab } from '../LoadingTab';
+
+const testLoadingTab = () => <LoadingTab>data</LoadingTab>;
+
+describe('<LoadingTab />', () => {
+  it('renders correctly', () => {
+    const component = mount(testLoadingTab());
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/src/components/Wizard/LoadingTab/tests/__snapshots__/LoadingTab.test.js.snap b/src/components/Wizard/LoadingTab/tests/__snapshots__/LoadingTab.test.js.snap
new file mode 100644
index 000000000..6f9d2b8d0
--- /dev/null
+++ b/src/components/Wizard/LoadingTab/tests/__snapshots__/LoadingTab.test.js.snap
@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<LoadingTab /> renders correctly 1`] = `
+<LoadingTab
+  text="Loading Page"
+>
+  data
+</LoadingTab>
+`;
diff --git a/src/components/Wizard/loadingWizardTab.js b/src/components/Wizard/loadingWizardTab.js
deleted file mode 100644
index 94412c2c6..000000000
--- a/src/components/Wizard/loadingWizardTab.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-
-import { Loading } from '../Loading';
-
-/* eslint-disable react/prop-types */
-export const loadingWizardTab = WizardPage => props =>
-  Object.keys(props.loadingData).every(dataKey => props.loadingData[dataKey]) ? (
-    <WizardPage {...props} {...props.loadingData} />
-  ) : (
-    <Loading text="Loading Page" />
-  );
diff --git a/src/components/Wizard/tests/loadingWizardTab.test.js b/src/components/Wizard/tests/loadingWizardTab.test.js
deleted file mode 100644
index d919c2e8d..000000000
--- a/src/components/Wizard/tests/loadingWizardTab.test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react';
-import { shallow } from 'enzyme';
-
-import { loadingWizardTab } from '../loadingWizardTab';
-import { Loading } from '../../Loading';
-
-const DummyComponent = () => {};
-
-test('loadingWizardTab', () => {
-  const LoadingDummyComponent = loadingWizardTab(DummyComponent);
-  const loadingProps = {
-    loadingData: {
-      foo: undefined,
-      foo1: undefined,
-    },
-    otherProp: 'prop',
-  };
-
-  const component = shallow(<LoadingDummyComponent {...loadingProps} />);
-  expect(component.find(Loading)).toHaveLength(1);
-  expect(component.find(DummyComponent)).toHaveLength(0);
-
-  const loadingData = {
-    foo: 'foo',
-    foo1: 'foo1',
-  };
-
-  component.setProps({ loadingData });
-  expect(component.find(Loading)).toHaveLength(0);
-  expect(component.find(DummyComponent)).toHaveLength(1);
-  expect(component.find(DummyComponent).props().otherProp).toEqual(loadingProps.otherProp);
-  expect(component.find(DummyComponent).props().foo).toEqual(loadingData.foo);
-  expect(component.find(DummyComponent).props().foo1).toEqual(loadingData.foo1);
-});
diff --git a/src/config/index.js b/src/config/index.js
index 1a9593b9b..c241a33d9 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -1,2 +1,4 @@
+export const VMWARE_TO_KUBEVIRT_OS_CONFIG_MAP_NAMESPACE = 'kube-public'; // note: common-templates are in the "openshift" namespace
+export const VMWARE_TO_KUBEVIRT_OS_CONFIG_MAP_NAME = 'vmware-to-kubevirt-os'; // single configMap per cluster, contains mapping of vmware guestId to common-templates OS ID
 export const KUBEVIRT_V2V_CONVERSION_CONTAINER_IMAGE = 'quay.io/nyoxi/kubevirt-v2v-conversion:1.12.1-1-gf665c0a';
 export const KUBEVIRT_V2V_VMWARE_CONTAINER_IMAGE = 'quay.io/nyoxi/kubevirt-vmware:1.12.1-1';
diff --git a/src/constants/index.js b/src/constants/index.js
index eb312f57e..1e3188cd3 100644
--- a/src/constants/index.js
+++ b/src/constants/index.js
@@ -69,7 +69,4 @@ export const STORAGE_IMPORT_PVC_NAME = 'storage.import.importPvcName';
 export const VCENTER_TYPE_LABEL = 'kubevirt.io/vcenter';
 export const VCENTER_TEMPORARY_LABEL = 'kubevirt.io/temporary';
 
-export const VMWARE_TO_KUBEVIRT_OS_CONFIG_MAP_NAMESPACE = 'kube-public'; // note: common-templates are in the "openshift" namespace
-export const VMWARE_TO_KUBEVIRT_OS_CONFIG_MAP_NAME = 'vmware-to-kubevirt-os'; // single OnfigMap per cluster, contains mapping of vmware guestId to common-templates OS ID
-
 export const VIRT_LAUNCHER_POD_PREFIX = 'virt-launcher-';
diff --git a/src/k8s/objects/v2v/vmware/index.js b/src/k8s/objects/v2v/vmware/index.js
index bc1f7bb45..2d15064d3 100644
--- a/src/k8s/objects/v2v/vmware/index.js
+++ b/src/k8s/objects/v2v/vmware/index.js
@@ -3,3 +3,5 @@ export * from './conversionPodSecret';
 export * from './conversionPodRole';
 export * from './vmWareRole';
 export * from './vmWareDeployment';
+export * from './vmWareObject';
+export * from './vmWareSecret';
diff --git a/src/k8s/objects/v2v/vmware/vmWareDeployment.js b/src/k8s/objects/v2v/vmware/vmWareDeployment.js
index bdb972143..3acc1bdb2 100644
--- a/src/k8s/objects/v2v/vmware/vmWareDeployment.js
+++ b/src/k8s/objects/v2v/vmware/vmWareDeployment.js
@@ -1,7 +1,7 @@
 import { KUBEVIRT_V2V_VMWARE_CONTAINER_IMAGE } from '../../../../config';
 import { DeploymentModel } from '../../../../models';
 
-export const buildVmWareDeployment = ({ k8sCreate, name, namespace }) => ({
+export const buildVmWareDeployment = ({ name, namespace }) => ({
   apiVersion: `${DeploymentModel.apiGroup}/${DeploymentModel.apiVersion}`,
   kind: DeploymentModel.kind,
   metadata: {
diff --git a/src/k8s/objects/v2v/vmware/vmWareObject.js b/src/k8s/objects/v2v/vmware/vmWareObject.js
new file mode 100644
index 000000000..68c539325
--- /dev/null
+++ b/src/k8s/objects/v2v/vmware/vmWareObject.js
@@ -0,0 +1,23 @@
+import { V2VVMwareModel } from '../../../../models';
+import { VCENTER_TEMPORARY_LABEL } from '../../../../constants';
+
+export const buildV2VVMwareObject = ({ generateName, namespace, connectionSecretName, isTemporary = false }) => {
+  const labels = {};
+  if (isTemporary) {
+    // if set, the Secret is not listed for selection within the dropdown box and is automatically garbage-collected (by controller)
+    labels[VCENTER_TEMPORARY_LABEL] = 'true'; // will be automatically garbage-collected by the controller
+  }
+
+  return {
+    apiVersion: `${V2VVMwareModel.apiGroup}/${V2VVMwareModel.apiVersion}`,
+    kind: V2VVMwareModel.kind,
+    metadata: {
+      generateName,
+      namespace,
+      labels,
+    },
+    spec: {
+      connection: connectionSecretName,
+    },
+  };
+};
diff --git a/src/k8s/objects/v2v/vmware/vmWareSecret.js b/src/k8s/objects/v2v/vmware/vmWareSecret.js
new file mode 100644
index 000000000..edfd0b5e3
--- /dev/null
+++ b/src/k8s/objects/v2v/vmware/vmWareSecret.js
@@ -0,0 +1,30 @@
+import { SecretModel } from '../../../../models';
+import { VCENTER_TEMPORARY_LABEL, VCENTER_TYPE_LABEL } from '../../../../constants';
+import { getDefaultSecretName } from '../../../requests/v2v/utils';
+
+export const buildVMwareSecret = ({ url, username, password, secretName, namespace, isTemporary = false }) => {
+  const _secretName = secretName || `${getDefaultSecretName({ username, url })}-`;
+  const labels = {
+    [VCENTER_TYPE_LABEL]: 'true',
+  };
+  if (isTemporary) {
+    // if set, the Secret is not listed for selection within the dropdown box and is automatically garbage-collected (by controller)
+    labels[VCENTER_TEMPORARY_LABEL] = 'true'; // will be automatically garbage-collected by the controller
+  }
+
+  return {
+    kind: SecretModel.kind,
+    apiVersion: SecretModel.apiVersion,
+    metadata: {
+      generateName: _secretName,
+      namespace,
+      labels,
+    },
+    type: 'Opaque',
+    data: {
+      username: btoa(username),
+      password: btoa(password),
+      url: btoa(url),
+    },
+  };
+};
diff --git a/src/k8s/request.js b/src/k8s/request.js
index 2198cb9e8..709c4a1c9 100644
--- a/src/k8s/request.js
+++ b/src/k8s/request.js
@@ -42,7 +42,7 @@ import {
 import {
   AUTHKEYS_KEY,
   CLOUD_INIT_CUSTOM_SCRIPT_KEY,
-  CLOUD_INIT_KEY,
+  USE_CLOUD_INIT_KEY,
   CPU_KEY,
   DATA_VOLUME_SOURCE_BLANK,
   DATA_VOLUME_SOURCE_URL,
@@ -72,7 +72,6 @@ import {
   getOsLabel,
   getTemplateAnnotations,
   getWorkloadLabel,
-  isVmwareImport,
   selectVm,
   settingsValue,
 } from './selectors';
@@ -103,6 +102,7 @@ import {
 
 import { importVmwareVm } from './requests/v2v';
 import { buildAddOwnerReferencesPatch, buildOwnerReference } from './util/utils';
+import { isVmwareProvider } from '../components/Wizard/CreateVmWizard/providers/VMwareImportProvider/selectors';
 
 export * from './requests/hosts';
 
@@ -115,7 +115,7 @@ const FALLBACK_DISK = {
 export const createVmTemplate = async (
   { k8sCreate, getActualState },
   templates,
-  basicSettings,
+  vmSettings,
   networks,
   storage,
   persistentVolumeClaims
@@ -127,25 +127,18 @@ export const createVmTemplate = async (
       case DESCRIPTION_KEY:
         return undefined;
       default:
-        return settingsValue(basicSettings, param);
+        return settingsValue(vmSettings, param);
     }
   };
-  const template = getModifiedVmTemplate(
-    templates,
-    basicSettings,
-    getSetting,
-    networks,
-    storage,
-    persistentVolumeClaims
-  );
+  const template = getModifiedVmTemplate(templates, vmSettings, getSetting, networks, storage, persistentVolumeClaims);
   const vmTemplate = createTemplateObject(
-    settingsValue.bind(undefined, basicSettings),
+    settingsValue.bind(undefined, vmSettings),
     selectVm(template.objects),
     template
   );
 
   let bootDataVolume;
-  if (settingsValue(basicSettings, PROVISION_SOURCE_TYPE_KEY) === PROVISION_SOURCE_URL) {
+  if (settingsValue(vmSettings, PROVISION_SOURCE_TYPE_KEY) === PROVISION_SOURCE_URL) {
     const bootStorage = storage.find(s => s.isBootable);
     const vm = selectVm(template.objects);
 
@@ -156,11 +149,11 @@ export const createVmTemplate = async (
     const newDataVolumeTemplates = dataVolumeTemplates.filter(t => getName(t) !== bootVolume.dataVolume.name);
     vm.spec.dataVolumeTemplates = newDataVolumeTemplates;
 
-    const newDataVolumeName = generateDiskName(settingsValue(basicSettings, NAME_KEY), bootStorage.name);
+    const newDataVolumeName = generateDiskName(settingsValue(vmSettings, NAME_KEY), bootStorage.name);
     bootVolume.dataVolume.name = newDataVolumeName;
 
     bootDataVolume.metadata.name = newDataVolumeName;
-    bootDataVolume.metadata.namespace = settingsValue(basicSettings, NAMESPACE_KEY);
+    bootDataVolume.metadata.namespace = settingsValue(vmSettings, NAMESPACE_KEY);
     bootDataVolume.apiVersion = `${DataVolumeModel.apiGroup}/${DataVolumeModel.apiVersion}`;
     bootDataVolume.kind = DataVolumeModel.kind;
   }
@@ -189,17 +182,17 @@ export const createVmTemplate = async (
 export const createVm = async (
   { k8sCreate, k8sPatch, getActualState },
   templates,
-  basicSettings,
+  vmSettings,
   networks,
   storages,
   persistentVolumeClaims
 ) => {
-  const getSetting = settingsValue.bind(undefined, basicSettings);
+  const getSetting = settingsValue.bind(undefined, vmSettings);
 
   let conversionPod;
 
-  if (isVmwareImport(basicSettings)) {
-    const importResult = await importVmwareVm(getSetting, networks, storages, {
+  if (isVmwareProvider(vmSettings)) {
+    const importResult = await importVmwareVm(vmSettings, networks, storages, {
       k8sCreate,
       k8sPatch,
     });
@@ -208,19 +201,12 @@ export const createVm = async (
     storages = importResult.mappedStorages;
   }
 
-  const template = getModifiedVmTemplate(
-    templates,
-    basicSettings,
-    getSetting,
-    networks,
-    storages,
-    persistentVolumeClaims
-  );
+  const template = getModifiedVmTemplate(templates, vmSettings, getSetting, networks, storages, persistentVolumeClaims);
 
   // ProcessedTemplates endpoint will reject the request if user cannot post to the namespace
   // common-templates are stored in openshift namespace, default user can read but cannot post
   const postTemplate = cloneDeep(template);
-  postTemplate.metadata.namespace = settingsValue(basicSettings, NAMESPACE_KEY);
+  postTemplate.metadata.namespace = settingsValue(vmSettings, NAMESPACE_KEY);
 
   const processedTemplate = await k8sCreate(ProcessedTemplatesModel, postTemplate, null, { disableHistory: true }); // temporary
 
@@ -245,8 +231,8 @@ export const createVm = async (
   return getActualState && getActualState();
 };
 
-const getModifiedVmTemplate = (templates, basicSettings, getSetting, networks, storage, persistentVolumeClaims) => {
-  const template = resolveTemplate(templates, basicSettings, getSetting);
+const getModifiedVmTemplate = (templates, vmSettings, getSetting, networks, storage, persistentVolumeClaims) => {
+  const template = resolveTemplate(templates, vmSettings, getSetting);
 
   const vm = selectVm(template.objects);
   modifyVmObject(vm, template, getSetting, networks, storage, persistentVolumeClaims);
@@ -279,7 +265,7 @@ const createTemplateObject = (getSetting, vm, template) => {
   return vmTemplate;
 };
 
-const resolveTemplate = (templates, basicSettings, getSetting) => {
+const resolveTemplate = (templates, vmSettings, getSetting) => {
   let chosenTemplate;
 
   if (getSetting(USER_TEMPLATE_KEY)) {
@@ -290,9 +276,9 @@ const resolveTemplate = (templates, basicSettings, getSetting) => {
     chosenTemplate = cloneDeep(chosenTemplate);
   } else {
     const baseTemplates = getTemplatesWithLabels(getTemplate(templates, TEMPLATE_TYPE_BASE), [
-      getOsLabel(basicSettings),
-      getWorkloadLabel(basicSettings),
-      getFlavorLabel(basicSettings),
+      getOsLabel(settingsValue(vmSettings, OPERATING_SYSTEM_KEY)),
+      getWorkloadLabel(settingsValue(vmSettings, WORKLOAD_PROFILE_KEY)),
+      getFlavorLabel(settingsValue(vmSettings, FLAVOR_KEY)),
     ]);
     if (baseTemplates.length === 0) {
       return null;
@@ -380,7 +366,7 @@ const addNetworks = (vm, template, getSetting, networks) => {
 };
 
 const addCloudInit = (vm, defaultDisk, getSetting) => {
-  if (getSetting(CLOUD_INIT_KEY)) {
+  if (getSetting(USE_CLOUD_INIT_KEY)) {
     const existingCloudInitVolume = getCloudInitVolume(vm);
     const cloudInit = new CloudInit({
       volume: existingCloudInitVolume,
diff --git a/src/k8s/requests/v2v/createV2VvmwareObject.js b/src/k8s/requests/v2v/createV2VvmwareObject.js
new file mode 100644
index 000000000..f4f22f1f1
--- /dev/null
+++ b/src/k8s/requests/v2v/createV2VvmwareObject.js
@@ -0,0 +1,49 @@
+import { SecretModel, V2VVMwareModel } from '../../../models';
+import { getName } from '../../../selectors';
+import { getDefaultSecretName } from './utils';
+import { buildV2VVMwareObject } from '../../objects/v2v/vmware/vmWareObject';
+import { buildVMwareSecret } from '../../objects/v2v/vmware/vmWareSecret';
+
+export const createV2VvmwareObjectWithSecret = async ({ url, username, password, namespace }, { k8sCreate }) => {
+  const secretName = `temp-${getDefaultSecretName({ url, username })}-`;
+  const secret = await k8sCreate(
+    SecretModel,
+    buildVMwareSecret({
+      url,
+      username,
+      password,
+      namespace,
+      secretName,
+      isTemporary: true, // do not list this temporary secret in the dropdown box
+    })
+  );
+
+  return k8sCreate(
+    V2VVMwareModel,
+    buildV2VVMwareObject({
+      generateName: `check-${getDefaultSecretName({ url, username })}-`,
+      namespace,
+      connectionSecretName: getName(secret),
+      isTemporary: true, // remove this object automatically (by controller)
+    })
+  );
+};
+
+// ATM, Kubernetes does not support deletion of CRs with a gracefulPeriod (delayed deletion).
+// The only object with this support are PODs.
+// More info: https://github.com/kubernetes/kubernetes/issues/56567
+// Workaround: handle garbage collection on our own by:
+// - set VCENTER_TEMPORARY_LABEL label to 'true'
+// - controller will set deletionTimestamp label with RFC 3339 timestamp
+// - controller will remove the object after the timeStamp
+// - can be easily extended for delaying the deletionTimestamp (recently not needed, so not implemented)
+export const createV2VvmwareObject = async ({ connectionSecretName, namespace }, { k8sCreate }) =>
+  k8sCreate(
+    V2VVMwareModel,
+    buildV2VVMwareObject({
+      generateName: `v2vvmware-${connectionSecretName}-`,
+      namespace,
+      connectionSecretName,
+      isTemporary: true, // remove this object automatically (by controller)
+    })
+  );
diff --git a/src/k8s/requests/v2v/importVmware.js b/src/k8s/requests/v2v/importVmware.js
index b9048aea7..4fc7993e7 100644
--- a/src/k8s/requests/v2v/importVmware.js
+++ b/src/k8s/requests/v2v/importVmware.js
@@ -11,33 +11,38 @@ import {
 } from '../../../models';
 import {
   NAMESPACE_KEY,
-  PROVIDER_VMWARE_HOSTNAME_KEY,
-  PROVIDER_VMWARE_USER_NAME_KEY,
-  PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY,
-  PROVIDER_VMWARE_USER_PWD_KEY,
-  PROVIDER_VMWARE_USER_PWD_REMEMBER_KEY,
-  PROVIDER_VMWARE_VCENTER_KEY,
-  PROVIDER_VMWARE_VM_DATA_KEY,
-  PROVIDER_VMWARE_VM_KEY,
   STORAGE_TYPE_EXTERNAL_IMPORT,
   STORAGE_TYPE_EXTERNAL_V2V_TEMP,
   STORAGE_TYPE_EXTERNAL_V2V_VDDK,
 } from '../../../components/Wizard/CreateVmWizard/constants';
-import { getImportProviderSecretObject } from '../../../components/Wizard/CreateVmWizard/providers/vmwareProviderPod';
 import { getName } from '../../../selectors';
-import { buildConversionPod, buildConversionPodSecret, buildV2VRole } from '../../objects/v2v';
+import { buildConversionPod, buildConversionPodSecret, buildV2VRole, buildVMwareSecret } from '../../objects/v2v';
 import { buildPvc, buildServiceAccount, buildServiceAccountRoleBinding } from '../../objects';
 import { CONVERSION_GENERATE_NAME } from './constants';
 import { buildOwnerReference, buildAddOwnerReferencesPatch } from '../../util/utils';
-
-const asImportProviderSecret = getSetting => {
-  if (getSetting(PROVIDER_VMWARE_USER_PWD_REMEMBER_KEY)) {
-    const url = getSetting(PROVIDER_VMWARE_HOSTNAME_KEY);
-    const username = getSetting(PROVIDER_VMWARE_USER_NAME_KEY);
-    const password = get(getSetting(PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY), PROVIDER_VMWARE_USER_PWD_KEY);
-    const namespace = getSetting(NAMESPACE_KEY);
-
-    return getImportProviderSecretObject({
+import {
+  PROVIDER_VMWARE_HOSTNAME_KEY,
+  PROVIDER_VMWARE_USER_NAME_KEY,
+  PROVIDER_VMWARE_USER_PASSWORD_KEY,
+  PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY,
+  PROVIDER_VMWARE_VCENTER_KEY,
+  PROVIDER_VMWARE_VM_KEY,
+} from '../../../components/Wizard/CreateVmWizard/providers/VMwareImportProvider/constants';
+import { settingsValue } from '../../selectors';
+import {
+  getVmwareAttribute,
+  getVmwareValue,
+  getVmwareField,
+} from '../../../components/Wizard/CreateVmWizard/providers/VMwareImportProvider/selectors';
+
+const asImportProviderSecret = vmSettings => {
+  if (getVmwareValue(vmSettings, PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY)) {
+    const url = getVmwareValue(vmSettings, PROVIDER_VMWARE_HOSTNAME_KEY);
+    const username = getVmwareValue(vmSettings, PROVIDER_VMWARE_USER_NAME_KEY);
+    const password = getVmwareValue(vmSettings, PROVIDER_VMWARE_USER_PASSWORD_KEY);
+    const namespace = settingsValue(vmSettings, NAMESPACE_KEY);
+
+    return buildVMwareSecret({
       url,
       username,
       password,
@@ -60,8 +65,8 @@ const asVolume = ({ name, data }) => ({
   },
 });
 
-const createProviderSecret = async (getSetting, networks, storages, { k8sCreate }) => {
-  const importProviderSecret = asImportProviderSecret(getSetting);
+const createProviderSecret = async (vmSettings, networks, storages, { k8sCreate }) => {
+  const importProviderSecret = asImportProviderSecret(vmSettings);
 
   if (importProviderSecret) {
     await k8sCreate(SecretModel, importProviderSecret);
@@ -70,10 +75,10 @@ const createProviderSecret = async (getSetting, networks, storages, { k8sCreate
   return null;
 };
 
-const resolveStorages = async (getSetting, networks, storages, { k8sCreate }) => {
+const resolveStorages = async (vmSettings, networks, storages, { k8sCreate }) => {
   const isImportStorage = storage =>
     [STORAGE_TYPE_EXTERNAL_IMPORT, STORAGE_TYPE_EXTERNAL_V2V_TEMP].includes(storage.storageType);
-  const namespace = getSetting(NAMESPACE_KEY);
+  const namespace = settingsValue(vmSettings, NAMESPACE_KEY);
 
   const extImportPvcsPromises = storages.filter(isImportStorage).map(storage =>
     k8sCreate(
@@ -106,8 +111,8 @@ const resolveStorages = async (getSetting, networks, storages, { k8sCreate }) =>
   };
 };
 
-const resolveRolesAndServiceAccount = async (getSetting, networks, storages, { k8sCreate }) => {
-  const namespace = getSetting(NAMESPACE_KEY);
+const resolveRolesAndServiceAccount = async (vmSettings, networks, storages, { k8sCreate }) => {
+  const namespace = settingsValue(vmSettings, NAMESPACE_KEY);
 
   const serviceAccount = await k8sCreate(
     ServiceAccountModel,
@@ -132,18 +137,19 @@ const resolveRolesAndServiceAccount = async (getSetting, networks, storages, { k
   };
 };
 
-const createConversionPodSecret = async (getSetting, networks, storages, { k8sCreate }) => {
-  const namespace = getSetting(NAMESPACE_KEY);
-  const vmWareData = getSetting(PROVIDER_VMWARE_VM_DATA_KEY);
+const createConversionPodSecret = async (vmSettings, networks, storages, { k8sCreate }) => {
+  const namespace = settingsValue(vmSettings, NAMESPACE_KEY);
+  const { vm, thumbprint } = getVmwareField(vmSettings, PROVIDER_VMWARE_VM_KEY);
 
-  const extractFromSecret = name => atob(get(getSetting(PROVIDER_VMWARE_VCENTER_KEY), ['data', name]));
+  const extractFromSecret = name =>
+    atob(get(getVmwareAttribute(vmSettings, PROVIDER_VMWARE_VCENTER_KEY, 'secret'), ['data', name]));
 
-  const username = encodeURIComponent(getSetting(PROVIDER_VMWARE_USER_NAME_KEY) || extractFromSecret('username'));
-  const password =
-    get(getSetting(PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY), PROVIDER_VMWARE_USER_PWD_KEY) ||
-    extractFromSecret('password');
+  const username = encodeURIComponent(
+    getVmwareValue(vmSettings, PROVIDER_VMWARE_USER_NAME_KEY) || extractFromSecret('username')
+  );
+  const password = getVmwareValue(vmSettings, PROVIDER_VMWARE_USER_PASSWORD_KEY) || extractFromSecret('password');
 
-  const hostname = getSetting(PROVIDER_VMWARE_HOSTNAME_KEY) || extractFromSecret('url');
+  const hostname = getVmwareValue(vmSettings, PROVIDER_VMWARE_HOSTNAME_KEY) || extractFromSecret('url');
 
   const sourceDisks = storages
     .filter(storage => storage.storageType === STORAGE_TYPE_EXTERNAL_IMPORT)
@@ -152,11 +158,11 @@ const createConversionPodSecret = async (getSetting, networks, storages, { k8sCr
   const conversionData = {
     daemonize: false,
 
-    vm_name: getSetting(PROVIDER_VMWARE_VM_KEY),
+    vm_name: vm.name,
     transport_method: 'vddk',
 
-    vmware_fingerprint: vmWareData && vmWareData.thumbPrint,
-    vmware_uri: `vpx://${username}@${hostname}${vmWareData && vmWareData.hostPath}?no_verify=1`,
+    vmware_fingerprint: thumbprint,
+    vmware_uri: `vpx://${username}@${hostname}${vm.detail.hostPath}?no_verify=1`,
     vmware_password: password,
 
     source_disks: sourceDisks,
@@ -174,13 +180,13 @@ const createConversionPodSecret = async (getSetting, networks, storages, { k8sCr
 
 // // Start of the Conversion pod is blocked until the PVCs are bound
 const startConversionPod = async (
-  getSetting,
+  vmSettings,
   networks,
   storages,
   { k8sCreate, k8sPatch },
   { serviceAccount, role, roleBinding, mappedStorages, conversionPodSecret }
 ) => {
-  const namespace = getSetting(NAMESPACE_KEY);
+  const namespace = settingsValue(vmSettings, NAMESPACE_KEY);
   const volumes = [];
   const volumeMounts = [];
 
@@ -224,7 +230,7 @@ const startConversionPod = async (
   };
 };
 
-export const importVmwareVm = async (getSetting, networks, storages, { k8sCreate, k8sPatch }) =>
+export const importVmwareVm = async (vmSettings, networks, storages, { k8sCreate, k8sPatch }) =>
   [
     createProviderSecret,
     createConversionPodSecret,
@@ -234,7 +240,7 @@ export const importVmwareVm = async (getSetting, networks, storages, { k8sCreate
   ].reduce(async (lastResultPromise, stepFunction) => {
     const lastResult = await lastResultPromise;
     const nextResult = await stepFunction(
-      getSetting,
+      vmSettings,
       networks,
       storages,
       {
diff --git a/src/k8s/requests/v2v/index.js b/src/k8s/requests/v2v/index.js
index f980ff536..ce9ff7481 100644
--- a/src/k8s/requests/v2v/index.js
+++ b/src/k8s/requests/v2v/index.js
@@ -1,2 +1,3 @@
 export * from './importVmware';
+export * from './startV2VvmwareController';
 export * from './constants';
diff --git a/src/k8s/requests/v2v/requestVmDetail.js b/src/k8s/requests/v2v/requestVmDetail.js
new file mode 100644
index 000000000..d86b7dd08
--- /dev/null
+++ b/src/k8s/requests/v2v/requestVmDetail.js
@@ -0,0 +1,33 @@
+import { get } from 'lodash';
+
+import { V2VVMwareModel } from '../../../models';
+
+const { warn } = console;
+
+export const requestVmDetail = async ({ vmName, v2vwmwareName, namespace }, { k8sGet, k8sPatch }) => {
+  vmName = (vmName || '').trim();
+
+  // The V2VVMWare object can be reused from the VCenterVmsConnected component or re-queried here. The later option helps to minimize conflicts.
+  const v2vvmware = await k8sGet(V2VVMwareModel, v2vwmwareName, namespace);
+
+  // Strategic merge patches seem not to work, so let's do mapping via positional arrays.
+  // Probably not a big deal as the controller is designed to avoid VMs list refresh
+  const index = get(v2vvmware, 'spec.vms', []).findIndex(vm => vm.name === vmName);
+  if (index >= 0) {
+    const patch = [
+      {
+        op: get(v2vvmware, ['spec', 'vms', `[${index}]`, 'detailRequest']) ? 'replace' : 'add',
+        path: `/spec/vms/${index}/detailRequest`,
+        value: true,
+      },
+    ];
+    await k8sPatch(V2VVMwareModel, v2vvmware, patch); // the controller will supply details for the selected VM
+  } else {
+    warn(
+      'onVCenterVmSelectedConnected: The retrieved V2VVMware object is missing desired VM: "',
+      vmName,
+      '", ',
+      v2vvmware
+    );
+  }
+};
diff --git a/src/k8s/requests/v2v/startV2VvmwareController.js b/src/k8s/requests/v2v/startV2VvmwareController.js
new file mode 100644
index 000000000..d79e75405
--- /dev/null
+++ b/src/k8s/requests/v2v/startV2VvmwareController.js
@@ -0,0 +1,103 @@
+import { DeploymentModel, RoleModel, ServiceAccountModel, RoleBindingModel, findModel } from '../../../models';
+import { buildServiceAccount, buildServiceAccountRoleBinding } from '../../objects';
+import { buildVmWareRole, buildVmWareDeployment } from '../../objects/v2v/vmware';
+import { V2VVMWARE_DEPLOYMENT_NAME } from './constants';
+import { getDeploymentContainer } from '../../../selectors/deployment';
+import { getContainerImage } from '../../../selectors/pod';
+import { buildAddOwnerReferencesPatch, buildOwnerReference } from '../../util';
+import { getName } from '../../../selectors';
+import { KUBEVIRT_V2V_VMWARE_CONTAINER_IMAGE } from '../../../config';
+
+const { info } = console;
+
+const OLD_VERSION = 'OLD_VERSION';
+
+// The controller is namespace-scoped, especially due to security reasons
+// Let's make sure its started within the desired namespace (which is not by default).
+// The V2VVmware CRD is expected to be already created within the cluster (by Web UI installation)
+export const startV2VVMWareController = async ({ namespace }, { k8sGet, k8sCreate, k8sKill, k8sPatch }) => {
+  if (!namespace) {
+    throw new Error('V2V VMWare: namespace must be selected');
+  }
+
+  const name = V2VVMWARE_DEPLOYMENT_NAME;
+  let activeDeployment;
+
+  try {
+    activeDeployment = await k8sGet(DeploymentModel, name, namespace);
+
+    if (getContainerImage(getDeploymentContainer(activeDeployment, name)) !== KUBEVIRT_V2V_VMWARE_CONTAINER_IMAGE) {
+      throw new Error(OLD_VERSION);
+    }
+  } catch (e) {
+    // Deployment does not exist or does not have permissions to see Deployments in this namespace
+    // TODO: notify the user in other way not just the console.log
+    info(
+      e && e.message === OLD_VERSION
+        ? 'updating V2V VMWare controller'
+        : 'V2V VMWare controller deployment not found, so creating one ...'
+    );
+
+    [cleanupOldDeployment, resolveRolesAndServiceAccount, startVmWare].reduce(
+      async (lastResultPromise, stepFunction) => {
+        const lastResult = await lastResultPromise;
+        const nextResult = await stepFunction(lastResult, {
+          k8sCreate,
+          k8sPatch,
+          k8sKill,
+        });
+        return {
+          ...lastResult,
+          ...nextResult,
+        };
+      },
+      Promise.resolve({ activeDeployment, namespace, name })
+    );
+  }
+};
+
+const cleanupOldDeployment = async ({ activeDeployment }, { k8sKill }) => {
+  if (activeDeployment) {
+    await k8sKill(DeploymentModel, activeDeployment);
+  }
+  return null;
+};
+
+const resolveRolesAndServiceAccount = async ({ name, namespace }, { k8sCreate }) => {
+  const serviceAccount = await k8sCreate(ServiceAccountModel, buildServiceAccount({ name, namespace }));
+  const role = await k8sCreate(RoleModel, buildVmWareRole({ name, namespace }));
+
+  const roleBinding = await k8sCreate(
+    RoleBindingModel,
+    buildServiceAccountRoleBinding({
+      name,
+      namespace,
+      serviceAccountName: getName(serviceAccount),
+      roleName: getName(role),
+    })
+  );
+
+  return {
+    serviceAccount,
+    role,
+    roleBinding,
+  };
+};
+
+const startVmWare = async ({ name, namespace, serviceAccount, role, roleBinding }, { k8sCreate, k8sPatch }) => {
+  const deployment = await k8sCreate(DeploymentModel, buildVmWareDeployment({ name, namespace }));
+
+  if (deployment) {
+    const newOwnerReferences = [buildOwnerReference(deployment)];
+
+    const patchPromises = [serviceAccount, role, roleBinding].map(object => {
+      const patches = [buildAddOwnerReferencesPatch(object, newOwnerReferences)];
+      return k8sPatch(findModel(object), object, patches);
+    });
+    await Promise.all(patchPromises);
+  }
+
+  return {
+    deployment,
+  };
+};
diff --git a/src/k8s/requests/v2v/utils.js b/src/k8s/requests/v2v/utils.js
new file mode 100644
index 000000000..948c7e5db
--- /dev/null
+++ b/src/k8s/requests/v2v/utils.js
@@ -0,0 +1,19 @@
+/**
+ * Based on V2V Provider Pod manifest.yaml
+ */
+
+export const getDefaultSecretName = ({ username, url }) => {
+  if (!url) {
+    throw new Error('VMWare URL can not be empty.');
+  }
+
+  if (!url.startsWith('https://') && !url.startsWith('http://')) {
+    url = `https://${url}`;
+  }
+  const u = new URL(url);
+  const host = u.host || 'nohost';
+
+  username = username || 'nousername';
+  const user = username.replace('@', '-at-');
+  return `${host}-${user}`;
+};
diff --git a/src/k8s/selectors.js b/src/k8s/selectors.js
index 0d13f3798..e2158b682 100644
--- a/src/k8s/selectors.js
+++ b/src/k8s/selectors.js
@@ -1,88 +1,71 @@
-import { get, has } from 'lodash';
+import { get, isObject } from 'lodash';
 
 import { getTemplatesLabelValues, getTemplatesWithLabels, getTemplate } from '../utils/templates';
-import { VirtualMachineModel, TemplateModel, SecretModel } from '../models';
+import { SecretModel, TemplateModel, VirtualMachineModel } from '../models';
 
 import {
   CUSTOM_FLAVOR,
   TEMPLATE_FLAVOR_LABEL,
   TEMPLATE_OS_LABEL,
-  TEMPLATE_WORKLOAD_LABEL,
+  TEMPLATE_OS_NAME_ANNOTATION,
   TEMPLATE_TYPE_BASE,
   TEMPLATE_TYPE_VM,
-  TEMPLATE_OS_NAME_ANNOTATION,
-  PROVISION_SOURCE_IMPORT,
+  TEMPLATE_WORKLOAD_LABEL,
 } from '../constants';
 
-import {
-  PROVISION_SOURCE_TYPE_KEY,
-  OPERATING_SYSTEM_KEY,
-  FLAVOR_KEY,
-  WORKLOAD_PROFILE_KEY,
-  PROVIDER_KEY,
-  PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY,
-  PROVIDER_VMWARE_CONNECTION,
-  PROVIDER_VMWARE_VCENTER_KEY,
-} from '../components/Wizard/CreateVmWizard/constants';
-
-export const settingsValue = (basicSettings, key, defaultValue) => get(basicSettings, [key, 'value'], defaultValue);
-
-export const getLabel = (basicSettings, labelPrefix, value) => {
-  const val = settingsValue(basicSettings, value);
-  if (val == null) {
+export const settingsValue = (vmSettings, key, defaultValue) => get(vmSettings, [key, 'value'], defaultValue);
+
+const getLabel = (labelPrefix, value) => {
+  if (value == null) {
     return undefined;
   }
-  const isObject = typeof val === 'object';
-  return `${labelPrefix}/${isObject ? val.id : val}`;
+  return `${labelPrefix}/${isObject(value) ? value.id : value}`;
 };
 
-export const getWorkloadLabel = basicSettings => getLabel(basicSettings, TEMPLATE_WORKLOAD_LABEL, WORKLOAD_PROFILE_KEY);
-export const getOsLabel = basicSettings => getLabel(basicSettings, TEMPLATE_OS_LABEL, OPERATING_SYSTEM_KEY);
+export const getWorkloadLabel = workload => getLabel(TEMPLATE_WORKLOAD_LABEL, workload);
+export const getOsLabel = os => getLabel(TEMPLATE_OS_LABEL, os);
 
-export const getOperatingSystems = (basicSettings, templates, userTemplate) => {
+export const getOperatingSystems = ({ workload, flavor, userTemplate }, templates) => {
   let templatesWithLabels;
   if (userTemplate) {
     templatesWithLabels = [getTemplate(templates, TEMPLATE_TYPE_VM).find(t => t.metadata.name === userTemplate)];
   } else {
     templatesWithLabels = getTemplatesWithLabels(getTemplate(templates, TEMPLATE_TYPE_BASE), [
-      getWorkloadLabel(basicSettings),
-      getFlavorLabel(basicSettings),
+      getWorkloadLabel(workload),
+      getFlavorLabel(flavor),
     ]);
   }
   return getTemplateOperatingSystems(templatesWithLabels);
 };
 
-export const getWorkloadProfiles = (basicSettings, templates, userTemplate) => {
+export const getWorkloadProfiles = ({ flavor, os, userTemplate }, templates) => {
   let templatesWithLabels;
   if (userTemplate) {
     templatesWithLabels = [getTemplate(templates, TEMPLATE_TYPE_VM).find(t => t.metadata.name === userTemplate)];
   } else {
     templatesWithLabels = getTemplatesWithLabels(getTemplate(templates, TEMPLATE_TYPE_BASE), [
-      getOsLabel(basicSettings),
-      getFlavorLabel(basicSettings),
+      getOsLabel(os),
+      getFlavorLabel(flavor),
     ]);
   }
   return getTemplateWorkloadProfiles(templatesWithLabels);
 };
 
-export const getFlavorLabel = basicSettings => {
-  if (has(basicSettings, [FLAVOR_KEY, 'value'])) {
-    const flavorValue = basicSettings.flavor.value;
-    if (flavorValue !== CUSTOM_FLAVOR) {
-      return `${TEMPLATE_FLAVOR_LABEL}/${basicSettings.flavor.value}`;
-    }
+export const getFlavorLabel = flavor => {
+  if (flavor && flavor !== CUSTOM_FLAVOR) {
+    return `${TEMPLATE_FLAVOR_LABEL}/${flavor}`;
   }
   return undefined;
 };
 
-export const getFlavors = (basicSettings, templates, userTemplate) => {
+export const getFlavors = ({ workload, os, userTemplate }, templates) => {
   let templatesWithLabels;
   if (userTemplate) {
     templatesWithLabels = [getTemplate(templates, TEMPLATE_TYPE_VM).find(t => t.metadata.name === userTemplate)];
   } else {
     templatesWithLabels = getTemplatesWithLabels(getTemplate(templates, TEMPLATE_TYPE_BASE), [
-      getWorkloadLabel(basicSettings),
-      getOsLabel(basicSettings),
+      getWorkloadLabel(workload),
+      getOsLabel(os),
     ]);
   }
   const flavors = getTemplateFlavors(templatesWithLabels);
@@ -110,18 +93,6 @@ export const getTemplateOperatingSystems = templates => {
 
 export const getTemplateWorkloadProfiles = templates => getTemplatesLabelValues(templates, TEMPLATE_WORKLOAD_LABEL);
 
-export const isImageSourceType = (basicSettings, type) =>
-  settingsValue(basicSettings, PROVISION_SOURCE_TYPE_KEY) === type;
-
-// true if selected
-// - provision source Import
-// - provider of given "providerType"
-export const isImportProviderType = (basicSettings, providerType) =>
-  isImageSourceType(basicSettings, PROVISION_SOURCE_IMPORT) &&
-  settingsValue(basicSettings, PROVIDER_KEY) === providerType;
-
-export const isFlavorType = (basicSettings, type) => settingsValue(basicSettings, FLAVOR_KEY) === type;
-
 export const getTemplateAnnotations = (template, name) => get(template.metadata.annotations, [name]);
 
 export const selectVm = objects => objects.find(obj => obj.kind === VirtualMachineModel.kind);
@@ -131,13 +102,3 @@ export const selectTemplate = objects => objects.find(obj => obj.kind === Templa
 export const selectSecret = objects => objects.find(obj => obj.kind === SecretModel.kind);
 
 export const getModelApi = model => `${model.apiGroup}/${model.apiVersion}`;
-
-export const getV2VVmwareName = basicSettings =>
-  get(settingsValue(basicSettings, PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY), [
-    PROVIDER_VMWARE_CONNECTION,
-    'V2VVmwareName',
-  ]);
-
-export const isVmwareImport = basicSettings =>
-  !!settingsValue(basicSettings, [PROVIDER_VMWARE_VCENTER_KEY]) &&
-  settingsValue(basicSettings, [PROVISION_SOURCE_TYPE_KEY]) === PROVISION_SOURCE_IMPORT;
diff --git a/src/k8s/tests/request.test.js b/src/k8s/tests/request.test.js
index 15900f1e1..c922899be 100644
--- a/src/k8s/tests/request.test.js
+++ b/src/k8s/tests/request.test.js
@@ -10,16 +10,19 @@ import { persistentVolumeClaims } from '../../tests/mocks/persistentVolumeClaim'
 import { pvcDisk, templateDataVolumeDisk } from '../../tests/forms_mocks/disk.mock';
 import { podNetwork, multusNetwork } from '../../tests/forms_mocks/nic.mock';
 import {
-  basicSettingsCloudInit,
-  basicSettingsContainer,
-  basicSettingsContainerWindows,
-  basicSettingsCustomFlavor,
-  basicSettingsImportVmwareNewConnection,
-  basicSettingsPxe,
-  basicSettingsUrl,
-  basicSettingsUserTemplate,
-} from '../../tests/forms_mocks/basicSettings.mock';
-import { rootContainerDisk, rootDataVolumeDisk } from '../../components/Wizard/CreateVmWizard/CreateVmWizard';
+  vmSettingsCloudInit,
+  vmSettingsContainer,
+  vmSettingsContainerWindows,
+  vmSettingsCustomFlavor,
+  vmSettingsImportVmwareNewConnection,
+  vmSettingsPxe,
+  vmSettingsUrl,
+  vmSettingsUserTemplate,
+} from '../../tests/forms_mocks/vmSettings.mock';
+import {
+  rootContainerDisk,
+  rootDataVolumeDisk,
+} from '../../components/Wizard/CreateVmWizard/stateUpdate/storageTabStateUpdate';
 import { k8sCreate, k8sPatch } from '../../tests/k8s';
 
 import { settingsValue, selectVm, selectTemplate, selectSecret } from '../selectors';
@@ -98,13 +101,13 @@ const testStorage = (vm, storageIndex, bootOrder, expectedName) => {
 
 const testContainerImage = results => {
   const vm = selectVm(results);
-  expect(vm.metadata.name).toBe(settingsValue(basicSettingsContainer, NAME_KEY));
-  expect(vm.metadata.namespace).toBe(settingsValue(basicSettingsContainer, NAMESPACE_KEY));
+  expect(vm.metadata.name).toBe(settingsValue(vmSettingsContainer, NAME_KEY));
+  expect(vm.metadata.namespace).toBe(settingsValue(vmSettingsContainer, NAMESPACE_KEY));
   expect(vm.spec.template.spec.domain.devices.disks[0].name).toBe(rootContainerDisk.name);
 
   expect(vm.spec.template.spec.volumes[0].name).toBe(rootContainerDisk.name);
   expect(vm.spec.template.spec.volumes[0].containerDisk.image).toBe(
-    settingsValue(basicSettingsContainer, CONTAINER_IMAGE_KEY)
+    settingsValue(vmSettingsContainer, CONTAINER_IMAGE_KEY)
   );
   return vm;
 };
@@ -127,8 +130,8 @@ const everyDiskHasVolume = results => {
 
 const testPXE = (results, firstBoot = true) => {
   const vm = selectVm(results);
-  expect(vm.metadata.name).toBe(settingsValue(basicSettingsContainer, NAME_KEY));
-  expect(vm.metadata.namespace).toBe(settingsValue(basicSettingsContainer, NAMESPACE_KEY));
+  expect(vm.metadata.name).toBe(settingsValue(vmSettingsContainer, NAME_KEY));
+  expect(vm.metadata.namespace).toBe(settingsValue(vmSettingsContainer, NAMESPACE_KEY));
   expect(vm.spec.template.spec.domain.devices.interfaces).toHaveLength(2);
   expect(vm.spec.template.spec.domain.devices.interfaces[0].name).toEqual(podNetwork.name);
   expect(vm.spec.template.spec.domain.devices.interfaces[1].bootOrder).toBe(1);
@@ -155,8 +158,8 @@ const testMetadata = (results, os, workload, flavor, templateName, templateNames
 
 const testCloudConfig = (results, cloudInit) => {
   const vm = selectVm(results);
-  expect(vm.metadata.name).toBe(settingsValue(basicSettingsContainer, NAME_KEY));
-  expect(vm.metadata.namespace).toBe(settingsValue(basicSettingsContainer, NAMESPACE_KEY));
+  expect(vm.metadata.name).toBe(settingsValue(vmSettingsContainer, NAME_KEY));
+  expect(vm.metadata.namespace).toBe(settingsValue(vmSettingsContainer, NAMESPACE_KEY));
   expect(vm.spec.template.spec.domain.devices.disks[1].name).toBe(CLOUDINIT_DISK);
 
   expect(vm.spec.template.spec.volumes[1].name).toBe(CLOUDINIT_DISK);
@@ -168,7 +171,7 @@ describe('request.js - provision sources', () => {
     createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsContainer,
+      vmSettingsContainer,
       [],
       [rootContainerDisk],
       persistentVolumeClaims
@@ -177,14 +180,14 @@ describe('request.js - provision sources', () => {
     createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsUrl,
+      vmSettingsUrl,
       [],
       [rootDataVolumeDisk],
       persistentVolumeClaims
     ).then(results => {
       const vm = selectVm(results);
-      expect(vm.metadata.name).toBe(settingsValue(basicSettingsContainer, NAME_KEY));
-      expect(vm.metadata.namespace).toBe(settingsValue(basicSettingsContainer, NAMESPACE_KEY));
+      expect(vm.metadata.name).toBe(settingsValue(vmSettingsContainer, NAME_KEY));
+      expect(vm.metadata.namespace).toBe(settingsValue(vmSettingsContainer, NAMESPACE_KEY));
 
       expect(vm.spec.template.spec.domain.devices.disks[0].name).toBe(rootDataVolumeDisk.name);
 
@@ -194,7 +197,7 @@ describe('request.js - provision sources', () => {
       );
 
       expect(vm.spec.dataVolumeTemplates[0].metadata.name).toBe(generateDiskName(getName(vm), rootDataVolumeDisk.name));
-      expect(vm.spec.dataVolumeTemplates[0].spec.source.http.url).toBe(settingsValue(basicSettingsUrl, IMAGE_URL_KEY));
+      expect(vm.spec.dataVolumeTemplates[0].spec.source.http.url).toBe(settingsValue(vmSettingsUrl, IMAGE_URL_KEY));
       expect(vm.spec.dataVolumeTemplates[0].spec.pvc.resources.requests.storage).toBe(`${rootDataVolumeDisk.size}Gi`);
       return results;
     }));
@@ -202,7 +205,7 @@ describe('request.js - provision sources', () => {
     createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsPxe,
+      vmSettingsPxe,
       [podNetwork, multusNetwork],
       persistentVolumeClaims
     ).then(testPXE));
@@ -210,14 +213,14 @@ describe('request.js - provision sources', () => {
     createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsUserTemplate,
+      vmSettingsUserTemplate,
       [],
       [pvcDisk, templateDataVolumeDisk],
       persistentVolumeClaims
     ).then(results => {
       const vm = selectVm(results);
-      expect(vm.metadata.name).toBe(settingsValue(basicSettingsContainer, NAME_KEY));
-      expect(vm.metadata.namespace).toBe(settingsValue(basicSettingsContainer, NAMESPACE_KEY));
+      expect(vm.metadata.name).toBe(settingsValue(vmSettingsContainer, NAME_KEY));
+      expect(vm.metadata.namespace).toBe(settingsValue(vmSettingsContainer, NAMESPACE_KEY));
       expect(vm.spec.template.spec.domain.cpu.cores).toBe(2);
       expect(vm.spec.template.spec.domain.resources.requests.memory).toBe('2G');
 
@@ -241,14 +244,14 @@ describe('request.js - networks', () => {
     createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsContainer,
+      vmSettingsContainer,
       [podNetwork],
       [],
       persistentVolumeClaims
     ).then(results => {
       const vm = selectVm(results);
-      expect(vm.metadata.name).toBe(settingsValue(basicSettingsContainer, NAME_KEY));
-      expect(vm.metadata.namespace).toBe(settingsValue(basicSettingsContainer, NAMESPACE_KEY));
+      expect(vm.metadata.name).toBe(settingsValue(vmSettingsContainer, NAME_KEY));
+      expect(vm.metadata.namespace).toBe(settingsValue(vmSettingsContainer, NAMESPACE_KEY));
       expect(vm.spec.template.spec.domain.devices.autoattachPodInterface).toBeUndefined();
       expect(vm.spec.template.spec.domain.devices.interfaces).toHaveLength(1);
       expect(vm.spec.template.spec.domain.devices.interfaces[0].name).toEqual(podNetwork.name);
@@ -265,7 +268,7 @@ describe('request.js - networks', () => {
     createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsContainerWindows,
+      vmSettingsContainerWindows,
       [podNetwork, multusNetwork],
       [],
       persistentVolumeClaims
@@ -287,7 +290,7 @@ describe('request.js - networks', () => {
     createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsCustomFlavor,
+      vmSettingsCustomFlavor,
       [],
       [],
       persistentVolumeClaims
@@ -302,7 +305,7 @@ describe('request.js - networks', () => {
     createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsCustomFlavor,
+      vmSettingsCustomFlavor,
       [multusNetwork],
       [],
       persistentVolumeClaims
@@ -316,7 +319,7 @@ describe('request.js - networks', () => {
       return results;
     }));
   it('PXE with start on creation', () => {
-    const vmPXEStart = cloneDeep(basicSettingsPxe);
+    const vmPXEStart = cloneDeep(vmSettingsPxe);
     vmPXEStart[START_VM_KEY] = {
       value: true,
     };
@@ -343,7 +346,7 @@ describe('request.js - networks', () => {
     return createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsCustomFlavor,
+      vmSettingsCustomFlavor,
       [withMac],
       [],
       persistentVolumeClaims
@@ -363,22 +366,22 @@ describe('request.js - cloudInit', () => {
       users: [
         {
           name: 'default',
-          'ssh-authorized-keys': basicSettingsCloudInit[AUTHKEYS_KEY].value,
+          'ssh-authorized-keys': vmSettingsCloudInit[AUTHKEYS_KEY].value,
         },
       ],
-      hostname: basicSettingsCloudInit[HOST_NAME_KEY].value,
+      hostname: vmSettingsCloudInit[HOST_NAME_KEY].value,
     };
     return createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsCloudInit,
+      vmSettingsCloudInit,
       [],
       [rootContainerDisk],
       persistentVolumeClaims
     ).then(results => testCloudConfig(results, cloudInit));
   });
   it('with CloudInit - only hostname', () => {
-    const onlyHostname = cloneDeep(basicSettingsCloudInit);
+    const onlyHostname = cloneDeep(vmSettingsCloudInit);
     delete onlyHostname[AUTHKEYS_KEY];
 
     const cloudInit = {
@@ -394,7 +397,7 @@ describe('request.js - cloudInit', () => {
     ).then(results => testCloudConfig(results, cloudInit));
   });
   it('with CloudInit - only ssh', () => {
-    const onlySSH = cloneDeep(basicSettingsCloudInit);
+    const onlySSH = cloneDeep(vmSettingsCloudInit);
     delete onlySSH[HOST_NAME_KEY];
 
     const cloudInit = {
@@ -415,7 +418,7 @@ describe('request.js - cloudInit', () => {
     ).then(results => testCloudConfig(results, cloudInit));
   });
   it('with CloudInit - no config', () => {
-    const noConfig = cloneDeep(basicSettingsCloudInit);
+    const noConfig = cloneDeep(vmSettingsCloudInit);
     delete noConfig[HOST_NAME_KEY];
     delete noConfig[AUTHKEYS_KEY];
     return createVm(
@@ -431,7 +434,7 @@ describe('request.js - cloudInit', () => {
     createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsContainer,
+      vmSettingsContainer,
       [],
       [rootContainerDisk],
       persistentVolumeClaims
@@ -446,20 +449,16 @@ describe('request.js - cloudInit', () => {
 
 describe('request.js - flavors', () => {
   it('with custom flavor', () =>
-    createVm(
-      new EnhancedK8sMethods({ k8sCreate }),
-      templates,
-      basicSettingsCustomFlavor,
-      [],
-      persistentVolumeClaims
-    ).then(results => {
-      const vm = selectVm(results);
-      expect(vm.metadata.name).toBe(settingsValue(basicSettingsCustomFlavor, NAME_KEY));
-      expect(vm.metadata.namespace).toBe(settingsValue(basicSettingsCustomFlavor, NAMESPACE_KEY));
-      expect(vm.spec.template.spec.domain.cpu.cores).toBe(1);
-      expect(vm.spec.template.spec.domain.resources.requests.memory).toBe('1G');
-      return results;
-    }));
+    createVm(new EnhancedK8sMethods({ k8sCreate }), templates, vmSettingsCustomFlavor, [], persistentVolumeClaims).then(
+      results => {
+        const vm = selectVm(results);
+        expect(vm.metadata.name).toBe(settingsValue(vmSettingsCustomFlavor, NAME_KEY));
+        expect(vm.metadata.namespace).toBe(settingsValue(vmSettingsCustomFlavor, NAMESPACE_KEY));
+        expect(vm.spec.template.spec.domain.cpu.cores).toBe(1);
+        expect(vm.spec.template.spec.domain.resources.requests.memory).toBe('1G');
+        return results;
+      }
+    ));
 });
 
 describe('request.js - storages', () => {
@@ -467,7 +466,7 @@ describe('request.js - storages', () => {
     createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsContainer,
+      vmSettingsContainer,
       [],
       [rootContainerDisk],
       persistentVolumeClaims
@@ -476,7 +475,7 @@ describe('request.js - storages', () => {
     createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsCloudInit,
+      vmSettingsCloudInit,
       [],
       [rootContainerDisk],
       persistentVolumeClaims
@@ -485,7 +484,7 @@ describe('request.js - storages', () => {
     createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsContainer,
+      vmSettingsContainer,
       [],
       [rootContainerDisk, pvcDisk],
       persistentVolumeClaims
@@ -499,7 +498,7 @@ describe('request.js - storages', () => {
     createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsUrl,
+      vmSettingsUrl,
       [],
       [rootDataVolumeDisk, pvcDisk],
       persistentVolumeClaims
@@ -512,7 +511,7 @@ describe('request.js - storages', () => {
     createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsUserTemplate,
+      vmSettingsUserTemplate,
       [],
       [pvcDisk, templateDataVolumeDisk],
       persistentVolumeClaims
@@ -537,7 +536,7 @@ describe('request.js - storages', () => {
     return createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsPxe,
+      vmSettingsPxe,
       [podNetwork, multusNetwork],
       [bootablePvcDisk],
       persistentVolumeClaims
@@ -551,7 +550,7 @@ describe('request.js - storages', () => {
     const results = await createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsPxe,
+      vmSettingsPxe,
       [podNetwork, multusNetwork],
       [pvcDisk],
       persistentVolumeClaims
@@ -564,7 +563,7 @@ describe('request.js - storages', () => {
 
 describe('request.js - metadata', () => {
   it('adds description to VM ', () => {
-    const withDescription = cloneDeep(basicSettingsContainer);
+    const withDescription = cloneDeep(vmSettingsContainer);
     withDescription[DESCRIPTION_KEY] = {
       value: 'foo description',
     };
@@ -585,16 +584,16 @@ describe('request.js - metadata', () => {
     const results = await createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsContainer,
+      vmSettingsContainer,
       [podNetwork, multusNetwork],
       [pvcDisk],
       persistentVolumeClaims
     );
     testMetadata(
       results,
-      basicSettingsContainer[OPERATING_SYSTEM_KEY].value,
-      basicSettingsContainer[WORKLOAD_PROFILE_KEY].value,
-      basicSettingsContainer[FLAVOR_KEY].value,
+      vmSettingsContainer[OPERATING_SYSTEM_KEY].value,
+      vmSettingsContainer[WORKLOAD_PROFILE_KEY].value,
+      vmSettingsContainer[FLAVOR_KEY].value,
       'rhel-generic',
       'openshift'
     );
@@ -604,16 +603,16 @@ describe('request.js - metadata', () => {
     const results = await createVm(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsUserTemplate,
+      vmSettingsUserTemplate,
       [podNetwork, multusNetwork],
       [pvcDisk],
       persistentVolumeClaims
     );
     testMetadata(
       results,
-      basicSettingsUserTemplate[OPERATING_SYSTEM_KEY].value,
-      basicSettingsUserTemplate[WORKLOAD_PROFILE_KEY].value,
-      basicSettingsUserTemplate[FLAVOR_KEY].value,
+      vmSettingsUserTemplate[OPERATING_SYSTEM_KEY].value,
+      vmSettingsUserTemplate[WORKLOAD_PROFILE_KEY].value,
+      vmSettingsUserTemplate[FLAVOR_KEY].value,
       getName(urlTemplate),
       getNamespace(urlTemplate)
     );
@@ -622,7 +621,7 @@ describe('request.js - metadata', () => {
     const results = await createVm(
       new EnhancedK8sMethods({ k8sCreate, k8sPatch }),
       templates,
-      basicSettingsImportVmwareNewConnection,
+      vmSettingsImportVmwareNewConnection,
       [],
       [],
       persistentVolumeClaims
@@ -636,29 +635,27 @@ describe('request.js - Create Vm Template', () => {
     const results = await createVmTemplate(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsContainer,
+      vmSettingsContainer,
       [],
       [rootContainerDisk]
     );
     const vmTemplate = selectTemplate(results);
-    expect(vmTemplate.metadata.name).toEqual(settingsValue(basicSettingsContainer, NAME_KEY));
+    expect(vmTemplate.metadata.name).toEqual(settingsValue(vmSettingsContainer, NAME_KEY));
     expect(vmTemplate.metadata.description).toBeUndefined();
-    expect(vmTemplate.metadata.namespace).toEqual(settingsValue(basicSettingsContainer, NAMESPACE_KEY));
+    expect(vmTemplate.metadata.namespace).toEqual(settingsValue(vmSettingsContainer, NAMESPACE_KEY));
     expect(vmTemplate.kind).toEqual(TemplateModel.kind);
     expect(vmTemplate.apiVersion).toEqual(`${TemplateModel.apiGroup}/${TemplateModel.apiVersion}`);
     expect(vmTemplate.metadata.labels[TEMPLATE_TYPE_LABEL]).toEqual(TEMPLATE_TYPE_VM);
     expect(
-      vmTemplate.metadata.labels[
-        `${TEMPLATE_OS_LABEL}/${settingsValue(basicSettingsContainer, OPERATING_SYSTEM_KEY).id}`
-      ]
+      vmTemplate.metadata.labels[`${TEMPLATE_OS_LABEL}/${settingsValue(vmSettingsContainer, OPERATING_SYSTEM_KEY).id}`]
     ).toEqual('true');
     expect(
       vmTemplate.metadata.labels[
-        `${TEMPLATE_WORKLOAD_LABEL}/${settingsValue(basicSettingsContainer, WORKLOAD_PROFILE_KEY)}`
+        `${TEMPLATE_WORKLOAD_LABEL}/${settingsValue(vmSettingsContainer, WORKLOAD_PROFILE_KEY)}`
       ]
     ).toEqual('true');
     expect(
-      vmTemplate.metadata.labels[`${TEMPLATE_FLAVOR_LABEL}/${settingsValue(basicSettingsContainer, FLAVOR_KEY)}`]
+      vmTemplate.metadata.labels[`${TEMPLATE_FLAVOR_LABEL}/${settingsValue(vmSettingsContainer, FLAVOR_KEY)}`]
     ).toEqual('true');
 
     expect(vmTemplate.objects).toHaveLength(1);
@@ -673,7 +670,7 @@ describe('request.js - Create Vm Template', () => {
     return vmTemplate;
   });
   it('adds description to VM Template', async () => {
-    const withDescription = cloneDeep(basicSettingsContainer);
+    const withDescription = cloneDeep(vmSettingsContainer);
     withDescription[DESCRIPTION_KEY] = {
       value: 'foo description',
     };
@@ -692,7 +689,7 @@ describe('request.js - Create Vm Template', () => {
     const results = await createVmTemplate(
       new EnhancedK8sMethods({ k8sCreate }),
       templates,
-      basicSettingsContainer,
+      vmSettingsContainer,
       [],
       [rootContainerDisk, pvcDisk],
       persistentVolumeClaims
diff --git a/src/k8s/tests/selectors.test.js b/src/k8s/tests/selectors.test.js
index 4d78f4908..6bdf6d601 100644
--- a/src/k8s/tests/selectors.test.js
+++ b/src/k8s/tests/selectors.test.js
@@ -7,108 +7,41 @@ import {
   TEMPLATE_TYPE_VM,
 } from '../../constants';
 import {
-  isFlavorType,
   getWorkloadLabel,
   getOsLabel,
   getFlavorLabel,
   getFlavors,
   getOperatingSystems,
   getWorkloadProfiles,
-  isImageSourceType,
 } from '../selectors';
 import { getTemplate } from '../../utils/templates';
 import { baseTemplates } from '../objects/template';
 import { userTemplates } from '../../tests/mocks/user_template';
-import { PROVISION_SOURCE_TYPE_KEY } from '../../components/Wizard/CreateVmWizard/constants';
 
 const templates = [...baseTemplates, ...userTemplates];
 
 const osId = (os, nextOs) => os.id.localeCompare(nextOs.id);
 
 describe('selectors.js', () => {
-  it('isImageSourceType', () => {
-    const basicVmSettings = {
-      [PROVISION_SOURCE_TYPE_KEY]: {
-        value: 'shouldReturnTrue',
-      },
-    };
-    expect(isImageSourceType(basicVmSettings, undefined)).toBeFalsy();
-    expect(isImageSourceType(basicVmSettings, 'shouldReturnTrue')).toBeTruthy();
-
-    basicVmSettings[PROVISION_SOURCE_TYPE_KEY].value = 'shouldReturnFalse';
-    expect(isImageSourceType(basicVmSettings, 'thisIsNotTheValue')).toBeFalsy();
-    basicVmSettings[PROVISION_SOURCE_TYPE_KEY].value = undefined;
-    expect(isImageSourceType(basicVmSettings, 'thisIsNotTheValue')).toBeFalsy();
-    basicVmSettings[PROVISION_SOURCE_TYPE_KEY] = undefined;
-    expect(isImageSourceType(basicVmSettings, 'thisIsNotTheValue')).toBeFalsy();
-    expect(isImageSourceType(undefined, 'thisIsNotTheValue')).toBeFalsy();
-  });
-  it('isFlavorType', () => {
-    const basicVmSettings = {
-      flavor: {
-        value: 'shouldReturnTrue',
-      },
-    };
-    expect(isFlavorType(basicVmSettings, undefined)).toBeFalsy();
-    expect(isFlavorType(basicVmSettings, 'shouldReturnTrue')).toBeTruthy();
-
-    basicVmSettings.flavor.value = 'shouldReturnFalse';
-    expect(isFlavorType(basicVmSettings, 'thisIsNotTheValue')).toBeFalsy();
-    basicVmSettings.flavor.value = undefined;
-    expect(isFlavorType(basicVmSettings, 'thisIsNotTheValue')).toBeFalsy();
-    basicVmSettings.flavor = undefined;
-    expect(isFlavorType(basicVmSettings, 'thisIsNotTheValue')).toBeFalsy();
-    expect(isFlavorType(undefined, 'thisIsNotTheValue')).toBeFalsy();
-  });
   it('getFlavorLabel', () => {
     expect(getFlavorLabel()).toBeUndefined();
 
-    expect(getFlavorLabel({})).toBeUndefined();
-
     const value = 'someFlavor';
-    expect(
-      getFlavorLabel({
-        flavor: {
-          value,
-        },
-      })
-    ).toEqual(`${TEMPLATE_FLAVOR_LABEL}/${value}`);
-
-    expect(
-      getFlavorLabel({
-        flavor: {
-          value: CUSTOM_FLAVOR,
-        },
-      })
-    ).toBeUndefined();
+    expect(getFlavorLabel(value)).toEqual(`${TEMPLATE_FLAVOR_LABEL}/${value}`);
+
+    expect(getFlavorLabel(CUSTOM_FLAVOR)).toBeUndefined();
   });
   it('getWorkloadLabel', () => {
     expect(getWorkloadLabel()).toBeUndefined();
 
-    expect(getWorkloadLabel({})).toBeUndefined();
-
     const value = 'someWorkload';
-    expect(
-      getWorkloadLabel({
-        workloadProfile: {
-          value,
-        },
-      })
-    ).toEqual(`${TEMPLATE_WORKLOAD_LABEL}/${value}`);
+    expect(getWorkloadLabel(value)).toEqual(`${TEMPLATE_WORKLOAD_LABEL}/${value}`);
   });
   it('getOsLabel', () => {
     expect(getOsLabel()).toBeUndefined();
 
-    expect(getOsLabel({})).toBeUndefined();
-
     const value = 'someOs';
-    expect(
-      getOsLabel({
-        operatingSystem: {
-          value,
-        },
-      })
-    ).toEqual(`${TEMPLATE_OS_LABEL}/${value}`);
+    expect(getOsLabel(value)).toEqual(`${TEMPLATE_OS_LABEL}/${value}`);
   });
 
   it('getTemplate', () => {
@@ -148,8 +81,18 @@ describe('selectors.js', () => {
         name: 'Fedora 29',
       },
     ];
-    const rhel = [{ id: 'rhel7.0', name: 'Red Hat Enterprise Linux 7.0' }];
-    const ubuntu = [{ id: 'ubuntu18.04', name: 'Ubuntu 18.04 LTS' }];
+    const rhel = [
+      {
+        id: 'rhel7.0',
+        name: 'Red Hat Enterprise Linux 7.0',
+      },
+    ];
+    const ubuntu = [
+      {
+        id: 'ubuntu18.04',
+        name: 'Ubuntu 18.04 LTS',
+      },
+    ];
     const windows = [
       {
         id: 'win2k12r2',
@@ -173,38 +116,30 @@ describe('selectors.js', () => {
       [...fedora, ...rhel, ...ubuntu, ...windows].sort(osId)
     );
 
-    const basicVmSettings = {
-      workloadProfile: {
-        value: 'generic',
-      },
+    const params = {
+      workload: 'generic',
     };
 
-    expect(getOperatingSystems(basicVmSettings, templates).sort(osId)).toEqual(
+    expect(getOperatingSystems(params, templates).sort(osId)).toEqual(
       [...fedora, ...rhel, ...ubuntu, ...windows].sort(osId)
     );
 
-    basicVmSettings.workloadProfile.value = 'high-performance';
+    params.workload = 'high-performance';
 
-    expect(getOperatingSystems(basicVmSettings, templates).sort(osId)).toEqual([...rhel]);
+    expect(getOperatingSystems(params, templates).sort(osId)).toEqual([...rhel]);
 
-    basicVmSettings.flavor = {
-      value: 'medium',
-    };
+    params.flavor = 'medium';
 
-    expect(getOperatingSystems(basicVmSettings, templates)).toEqual([...rhel]);
+    expect(getOperatingSystems(params, templates)).toEqual([...rhel]);
 
-    delete basicVmSettings.workloadProfile;
+    delete params.workload;
 
-    expect(getOperatingSystems(basicVmSettings, templates).sort(osId)).toEqual([...rhel, ...windows].sort(osId));
+    expect(getOperatingSystems(params, templates).sort(osId)).toEqual([...rhel, ...windows].sort(osId));
 
-    basicVmSettings.flavor.value = 'small';
-    basicVmSettings.workloadProfile = {
-      value: 'generic',
-    };
+    params.flavor = 'small';
+    params.workload = 'generic';
 
-    expect(getOperatingSystems(basicVmSettings, templates).sort(osId)).toEqual(
-      [...fedora, ...rhel, ...ubuntu].sort(osId)
-    );
+    expect(getOperatingSystems(params, templates).sort(osId)).toEqual([...fedora, ...rhel, ...ubuntu].sort(osId));
   });
 
   it('getFlavors', () => {
@@ -213,55 +148,45 @@ describe('selectors.js', () => {
 
     expect(getFlavors({}, templates).sort()).toEqual([CUSTOM_FLAVOR, mediumFlavor, smallFlavor].sort());
 
-    const basicVmSettings = {
-      workloadProfile: {
-        value: 'generic',
-      },
+    const params = {
+      workload: 'generic',
     };
 
-    expect(getFlavors(basicVmSettings, templates).sort()).toEqual([CUSTOM_FLAVOR, smallFlavor, mediumFlavor].sort());
+    expect(getFlavors(params, templates).sort()).toEqual([CUSTOM_FLAVOR, smallFlavor, mediumFlavor].sort());
 
-    basicVmSettings.workloadProfile.value = 'high-performance';
-    expect(getFlavors(basicVmSettings, templates).sort()).toEqual([CUSTOM_FLAVOR, mediumFlavor].sort());
+    params.workload = 'high-performance';
+    expect(getFlavors(params, templates).sort()).toEqual([CUSTOM_FLAVOR, mediumFlavor].sort());
 
-    delete basicVmSettings.workloadProfile;
-    basicVmSettings.operatingSystem = {
-      value: 'fedora24',
-    };
-    expect(getFlavors(basicVmSettings, templates).sort()).toEqual([CUSTOM_FLAVOR, smallFlavor].sort());
+    delete params.workload;
+    params.os = 'fedora24';
+    expect(getFlavors(params, templates).sort()).toEqual([CUSTOM_FLAVOR, smallFlavor].sort());
 
-    basicVmSettings.operatingSystem.value = 'rhel7.0';
-    expect(getFlavors(basicVmSettings, templates).sort()).toEqual([CUSTOM_FLAVOR, smallFlavor, mediumFlavor].sort());
+    params.os = 'rhel7.0';
+    expect(getFlavors(params, templates).sort()).toEqual([CUSTOM_FLAVOR, smallFlavor, mediumFlavor].sort());
 
-    basicVmSettings.workloadProfile = {
-      value: 'high-performance',
-    };
-    expect(getFlavors(basicVmSettings, templates).sort()).toEqual([CUSTOM_FLAVOR, mediumFlavor].sort());
+    params.workload = 'high-performance';
+    expect(getFlavors(params, templates).sort()).toEqual([CUSTOM_FLAVOR, mediumFlavor].sort());
   });
 
-  it('getWorkloadProfiles', () => {
+  it('getworkloads', () => {
     const highPerformance = 'high-performance';
     const generic = 'generic';
 
     expect(getWorkloadProfiles({}, templates).sort()).toEqual([highPerformance, generic].sort());
 
-    const basicVmSettings = {
-      operatingSystem: {
-        value: 'fedora24',
-      },
+    const params = {
+      os: 'fedora24',
     };
-    expect(getWorkloadProfiles(basicVmSettings, templates)).toEqual([generic]);
+    expect(getWorkloadProfiles(params, templates)).toEqual([generic]);
 
-    basicVmSettings.operatingSystem.value = 'rhel7.0';
-    expect(getWorkloadProfiles(basicVmSettings, templates).sort()).toEqual([generic, highPerformance].sort());
+    params.os = 'rhel7.0';
+    expect(getWorkloadProfiles(params, templates).sort()).toEqual([generic, highPerformance].sort());
 
-    basicVmSettings.operatingSystem.value = 'rhel7.0';
-    basicVmSettings.flavor = {
-      value: 'medium',
-    };
-    expect(getWorkloadProfiles(basicVmSettings, templates)).toEqual([highPerformance]);
+    params.os = 'rhel7.0';
+    params.flavor = 'medium';
+    expect(getWorkloadProfiles(params, templates)).toEqual([highPerformance]);
 
-    basicVmSettings.flavor.value = 'small';
-    expect(getWorkloadProfiles(basicVmSettings, templates)).toEqual([generic]);
+    params.flavor = 'small';
+    expect(getWorkloadProfiles(params, templates)).toEqual([generic]);
   });
 });
diff --git a/src/k8s/util/enhancedK8sMethods.js b/src/k8s/util/enhancedK8sMethods.js
index 1b1d42e8a..af4e49ac7 100644
--- a/src/k8s/util/enhancedK8sMethods.js
+++ b/src/k8s/util/enhancedK8sMethods.js
@@ -1,9 +1,10 @@
 import { get } from 'lodash';
 
-import { K8sCreateError, K8sKillError, K8sMultipleErrors, K8sPatchError } from './errors';
+import { K8sCreateError, K8sGetError, K8sKillError, K8sMultipleErrors, K8sPatchError } from './errors';
 import { findModel } from '../../models';
 import { getFullResourceId } from '../../utils';
 
+export const HISTORY_TYPE_GET = 'get';
 export const HISTORY_TYPE_CREATE = 'create';
 export const HISTORY_TYPE_PATCH = 'patch';
 export const HISTORY_TYPE_DELETE = 'delete';
@@ -17,8 +18,9 @@ export class HistoryItem {
 }
 
 export class EnhancedK8sMethods {
-  constructor({ k8sCreate, k8sPatch, k8sKill }) {
+  constructor({ k8sGet, k8sCreate, k8sPatch, k8sKill }) {
     this._history = [];
+    this._k8sGet = k8sGet;
     this._k8sCreate = k8sCreate;
     this._k8sPatch = k8sPatch;
     this._k8sKill = k8sKill;
@@ -30,6 +32,16 @@ export class EnhancedK8sMethods {
     }
   };
 
+  k8sGet = async (kind, name, namespace, opts, enhancedOpts) => {
+    try {
+      const result = await this._k8sGet(kind, name, namespace, opts);
+      this._appendHistory(new HistoryItem(HISTORY_TYPE_GET, result), enhancedOpts);
+      return result;
+    } catch (error) {
+      throw new K8sGetError(error.message, { name, namespace });
+    }
+  };
+
   k8sCreate = async (kind, data, opts, enhancedOpts) => {
     try {
       const result = await this._k8sCreate(kind, data, opts);
@@ -69,16 +81,21 @@ export class EnhancedK8sMethods {
 
     this._history.forEach(({ type, object }) => {
       const id = getFullResourceId(object);
+      const currentIdx = currentIndexes[id];
       switch (type) {
+        case HISTORY_TYPE_GET:
         case HISTORY_TYPE_CREATE:
-          currentIndexes[id] = currentUnfilteredState.push(object) - 1;
-          break;
         case HISTORY_TYPE_PATCH:
-          currentUnfilteredState[currentIndexes[id]] = object;
+          if (currentIdx != null && currentIdx >= 0) {
+            currentUnfilteredState[currentIdx] = object;
+          } else {
+            currentIndexes[id] = currentUnfilteredState.push(object) - 1;
+          }
           break;
         case HISTORY_TYPE_DELETE:
         case HISTORY_TYPE_NOT_FOUND:
-          currentUnfilteredState[currentIndexes[id]] = null;
+          currentUnfilteredState[currentIdx] = null;
+          currentIndexes[id] = null;
           break;
         default:
           break;
diff --git a/src/k8s/util/errors.js b/src/k8s/util/errors.js
index ea8b6f84d..bcebbc05e 100644
--- a/src/k8s/util/errors.js
+++ b/src/k8s/util/errors.js
@@ -1,3 +1,10 @@
+export class K8sGetError extends Error {
+  constructor(message, failedObject) {
+    super(message);
+    this.failedObject = failedObject;
+  }
+}
+
 export class K8sCreateError extends Error {
   constructor(message, failedObject) {
     super(message);
diff --git a/src/k8s/util/k8sMethodsUtils.js b/src/k8s/util/k8sMethodsUtils.js
new file mode 100644
index 000000000..47f4751f0
--- /dev/null
+++ b/src/k8s/util/k8sMethodsUtils.js
@@ -0,0 +1,91 @@
+import { getGeneratedName, getKind, getName } from '../../selectors';
+import { getFullResourceId } from '../../utils';
+import {
+  ERROR,
+  CREATED,
+  CREATED_WITH_CLEANUP,
+  CREATED_WITH_FAILED_CLEANUP,
+  FAILED_TO_CREATE,
+  FAILED_TO_PATCH,
+} from '../../utils/strings';
+
+const k8sObjectToResult = ({ obj, content, message, isExpanded, isError }) => ({
+  title: [getKind(obj), getName(obj) || getGeneratedName(obj), message].filter(a => a).join(' '),
+  content,
+  isExpanded,
+  isError,
+});
+
+export const cleanupAndGetResults = async (enhancedK8sMethods, { message, failedObject, failedPatches }) => {
+  const actualState = enhancedK8sMethods.getActualState(); // actual state will differ after cleanup
+
+  let errors;
+  try {
+    await enhancedK8sMethods.rollback();
+  } catch (e) {
+    // eslint-disable-next-line prefer-destructuring
+    errors = e.errors;
+  }
+
+  const failedObjectsMap = {};
+
+  if (errors) {
+    errors.forEach(error => {
+      failedObjectsMap[getFullResourceId(error.failedObject)] = error.failedObject;
+    });
+  }
+
+  const cleanupArray = actualState
+    .map(resource => {
+      const failedToCleanup = !!failedObjectsMap[getFullResourceId(resource)];
+
+      return k8sObjectToResult({
+        obj: resource,
+        content: resource,
+        message: failedToCleanup ? CREATED_WITH_FAILED_CLEANUP : CREATED_WITH_CLEANUP,
+        isExpanded: failedToCleanup,
+        isError: failedToCleanup,
+      });
+    })
+    .reverse();
+
+  const results = [
+    k8sObjectToResult({
+      content: message,
+      message: ERROR,
+      isExpanded: true,
+      isError: true,
+    }),
+    k8sObjectToResult({
+      obj: failedObject,
+      content: failedPatches || failedObject,
+      message: failedPatches ? FAILED_TO_PATCH : FAILED_TO_CREATE,
+      isError: true,
+    }),
+    ...cleanupArray,
+  ];
+
+  return {
+    valid: false,
+    results,
+  };
+};
+
+export const getResults = enhancedK8sMethods => ({
+  valid: true,
+  results: enhancedK8sMethods
+    .getActualState()
+    .map(obj => k8sObjectToResult({ obj, content: obj, message: CREATED }))
+    .reverse(),
+});
+
+export const errorsFirstSort = results =>
+  results
+    .map((result, sortIndex) => ({ ...result, sortIndex }))
+    // move errors to the top
+    .sort((a, b) => {
+      if (a.isError === b.isError) {
+        return a.sortIndex - b.sortIndex;
+      }
+      return a.isError ? -1 : 1;
+    });
diff --git a/src/k8s/util/tests/enhancedK8sMethods.test.js b/src/k8s/util/tests/enhancedK8sMethods.test.js
index 6c2e206aa..54f0a5ceb 100644
--- a/src/k8s/util/tests/enhancedK8sMethods.test.js
+++ b/src/k8s/util/tests/enhancedK8sMethods.test.js
@@ -20,6 +20,7 @@ const disableHistoryOpts = { disableHistory: true };
 const buildMethods = () =>
   new EnhancedK8sMethods({
     k8sCreate: (kind, data) => Promise.resolve(data),
+    k8sGet: (kind, data) => Promise.resolve(data),
     k8sPatch: (kind, data, patch) => Promise.resolve({ ...data, ...patch }),
     k8sKill: (kind, data) => Promise.resolve(data),
   });
@@ -65,10 +66,14 @@ describe('enhancedK8sMethods.js', () => {
 
     await methods.k8sCreate(VirtualMachineModel, fullVm);
     await methods.k8sPatch(VirtualMachineModel, fullVm);
+    await methods.k8sPatch(VirtualMachineModel, fullVm);
+    await methods.k8sGet(VirtualMachineModel, fullVm);
     await methods.k8sKill(VirtualMachineModel, fullVm);
     await methods.k8sCreate(VirtualMachineModel, cloudInitTestVm);
     await methods.k8sPatch(VirtualMachineModel, cloudInitTestVm);
+    await methods.k8sGet(VirtualMachineModel, cloudInitTestVm);
     await methods.k8sCreate(VirtualMachineModel, fullVm);
+    await methods.k8sGet(VirtualMachineModel, fullVm);
     await methods.k8sPatch(VirtualMachineModel, fullVm, mockPatch);
     const actualState = methods.getActualState();
 
diff --git a/src/selectors/common.js b/src/selectors/common.js
index 01cedf62b..8b5ba54d4 100644
--- a/src/selectors/common.js
+++ b/src/selectors/common.js
@@ -11,6 +11,7 @@ export const getGeneratedName = value => get(value, 'metadata.generateName');
 export const getOwnerReferences = value => get(value, 'metadata.ownerReferences');
 export const getNamespace = value => get(value, 'metadata.namespace');
 export const getUid = resource => get(resource, 'metadata.uid');
+export const getLabels = (entity, defaultValue) => get(entity, 'metadata.labels', defaultValue);
 export const getId = value => `${getNamespace(value)}-${getName(value)}`;
 
 export const getStorageSize = resources => get(resources, 'requests.storage');
diff --git a/src/selectors/deployment/index.js b/src/selectors/deployment/index.js
new file mode 100644
index 000000000..8c9698fe1
--- /dev/null
+++ b/src/selectors/deployment/index.js
@@ -0,0 +1 @@
+export * from './selectors';
diff --git a/src/selectors/deployment/selectors.js b/src/selectors/deployment/selectors.js
new file mode 100644
index 000000000..ff84159b6
--- /dev/null
+++ b/src/selectors/deployment/selectors.js
@@ -0,0 +1,4 @@
+import { get } from 'lodash';
+
+export const getDeploymentContainer = (deployment, containerName) =>
+  get(deployment, 'spec.template.spec.containers', []).find(container => container.name === containerName);
diff --git a/src/selectors/pod/container.js b/src/selectors/pod/container.js
index d2eac6431..b4f928fd9 100644
--- a/src/selectors/pod/container.js
+++ b/src/selectors/pod/container.js
@@ -4,6 +4,7 @@ const failedWaitingContainerReasons = ['ImagePullBackOff', 'ErrImagePull', 'Cras
 const failedTerminationContaineReasons = ['Error'];
 
 const getContainerWaitingReason = container => get(container, 'state.waiting.reason');
+export const getContainerImage = container => get(container, 'image');
 const getContainerTerminatedReason = container => get(container, 'state.terminated.reason');
 
 const stateReasonResolver = {
diff --git a/src/selectors/v2v/index.js b/src/selectors/v2v/index.js
new file mode 100644
index 000000000..8c9698fe1
--- /dev/null
+++ b/src/selectors/v2v/index.js
@@ -0,0 +1 @@
+export * from './selectors';
diff --git a/src/selectors/v2v/selectors.js b/src/selectors/v2v/selectors.js
new file mode 100644
index 000000000..1875435cd
--- /dev/null
+++ b/src/selectors/v2v/selectors.js
@@ -0,0 +1,12 @@
+import { get } from 'lodash';
+
+import { getSimpleV2vVMwareStatus } from '../../utils/status/v2vVMware/v2vVMwareStatus';
+import { V2V_WMWARE_STATUS_CONNECTION_SUCCESSFUL } from '../../utils/status/v2vVMware';
+
+export const getVms = (v2vvmware, defaultValue) => get(v2vvmware, 'spec.vms', defaultValue);
+export const getThumbprint = v2vvmware => get(v2vvmware, 'spec.thumbprint');
+
+export const getLoadedVm = (v2vvmware, vmName) =>
+  getSimpleV2vVMwareStatus(v2vvmware) === V2V_WMWARE_STATUS_CONNECTION_SUCCESSFUL
+    ? getVms(v2vvmware, []).find(v => v.name === vmName && v.detail && v.detail.raw)
+    : null;
diff --git a/src/tests/forms_mocks/basicSettings.mock.js b/src/tests/forms_mocks/vmSettings.mock.js
similarity index 61%
rename from src/tests/forms_mocks/basicSettings.mock.js
rename to src/tests/forms_mocks/vmSettings.mock.js
index ae8259d27..6925fe295 100644
--- a/src/tests/forms_mocks/basicSettings.mock.js
+++ b/src/tests/forms_mocks/vmSettings.mock.js
@@ -11,18 +11,11 @@ import {
   CPU_KEY,
   AUTHKEYS_KEY,
   HOST_NAME_KEY,
-  CLOUD_INIT_KEY,
+  USE_CLOUD_INIT_KEY,
   IMAGE_URL_KEY,
   CONTAINER_IMAGE_KEY,
   PROVIDER_KEY,
-  PROVIDER_VMWARE,
-  PROVIDER_VMWARE_VCENTER_KEY,
-  PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY,
-  PROVIDER_VMWARE_CONNECTION,
-  PROVIDER_VMWARE_USER_PWD_KEY,
-  PROVIDER_VMWARE_HOSTNAME_KEY,
-  PROVIDER_VMWARE_USER_NAME_KEY,
-  PROVIDER_VMWARE_USER_PWD_REMEMBER_KEY,
+  PROVIDERS_DATA_KEY,
 } from '../../components/Wizard/CreateVmWizard/constants';
 import {
   CUSTOM_FLAVOR,
@@ -34,8 +27,18 @@ import {
 import { urlTemplate } from '../mocks/user_template';
 import { getTemplateFlavors, getTemplateOperatingSystems, getTemplateWorkloadProfiles } from '../../k8s/selectors';
 import { CONNECT_TO_NEW_INSTANCE } from '../../components/Wizard/CreateVmWizard/strings';
+import {
+  PROVIDER_VMWARE,
+  PROVIDER_VMWARE_HOSTNAME_KEY,
+  PROVIDER_VMWARE_USER_NAME_KEY,
+  PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY,
+  PROVIDER_VMWARE_VCENTER_KEY,
+  PROVIDER_VMWARE_V2V_NAME_KEY,
+  PROVIDER_VMWARE_USER_PASSWORD_KEY,
+  PROVIDER_VMWARE_VM_KEY,
+} from '../../components/Wizard/CreateVmWizard/providers/VMwareImportProvider/constants';
 
-export const basicSettingsContainer = {
+export const vmSettingsContainer = {
   [NAME_KEY]: {
     value: 'name',
   },
@@ -62,8 +65,8 @@ export const basicSettingsContainer = {
   },
 };
 
-export const basicSettingsUrl = {
-  ...basicSettingsContainer,
+export const vmSettingsUrl = {
+  ...vmSettingsContainer,
   [PROVISION_SOURCE_TYPE_KEY]: {
     value: PROVISION_SOURCE_URL,
   },
@@ -72,16 +75,16 @@ export const basicSettingsUrl = {
   },
 };
 
-export const basicSettingsPxe = {
-  ...basicSettingsContainer,
+export const vmSettingsPxe = {
+  ...vmSettingsContainer,
   [PROVISION_SOURCE_TYPE_KEY]: {
     value: PROVISION_SOURCE_PXE,
   },
 };
 
-export const basicSettingsCloudInit = {
-  ...basicSettingsContainer,
-  [CLOUD_INIT_KEY]: {
+export const vmSettingsCloudInit = {
+  ...vmSettingsContainer,
+  [USE_CLOUD_INIT_KEY]: {
     value: true,
   },
   [HOST_NAME_KEY]: {
@@ -92,8 +95,8 @@ export const basicSettingsCloudInit = {
   },
 };
 
-export const basicSettingsCustomFlavor = {
-  ...basicSettingsContainer,
+export const vmSettingsCustomFlavor = {
+  ...vmSettingsContainer,
   [FLAVOR_KEY]: {
     value: CUSTOM_FLAVOR,
   },
@@ -108,7 +111,7 @@ export const basicSettingsCustomFlavor = {
   },
 };
 
-export const basicSettingsUserTemplate = {
+export const vmSettingsUserTemplate = {
   [NAME_KEY]: {
     value: 'name',
   },
@@ -132,9 +135,10 @@ export const basicSettingsUserTemplate = {
   },
 };
 
-export const basicSettingsImportVmwareNewConnection = {
-  [NAME_KEY]: basicSettingsContainer[NAME_KEY],
-  [NAMESPACE_KEY]: basicSettingsContainer[NAMESPACE_KEY],
+// TODO repair
+export const vmSettingsImportVmwareNewConnection = {
+  [NAME_KEY]: vmSettingsContainer[NAME_KEY],
+  [NAMESPACE_KEY]: vmSettingsContainer[NAMESPACE_KEY],
   [PROVISION_SOURCE_TYPE_KEY]: {
     value: PROVISION_SOURCE_IMPORT,
   },
@@ -144,30 +148,39 @@ export const basicSettingsImportVmwareNewConnection = {
   [PROVIDER_VMWARE_VCENTER_KEY]: {
     value: CONNECT_TO_NEW_INSTANCE,
   },
-  [PROVIDER_VMWARE_USER_PWD_AND_CHECK_KEY]: {
-    value: {
-      [PROVIDER_VMWARE_CONNECTION]: {
-        V2VVmwareName: 'v2vvmware-object-name',
+  [PROVIDERS_DATA_KEY]: {
+    [PROVIDER_VMWARE]: {
+      [PROVIDER_VMWARE_V2V_NAME_KEY]: 'v2vvmware-object-name',
+      [PROVIDER_VMWARE_USER_NAME_KEY]: {
+        value: 'username',
+      },
+      [PROVIDER_VMWARE_HOSTNAME_KEY]: {
+        value: 'my.domain.com',
+      },
+      [PROVIDER_VMWARE_USER_PASSWORD_KEY]: {
+        value: 'password',
+      },
+      [PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY]: {
+        value: true,
+      },
+      [PROVIDER_VMWARE_VM_KEY]: {
+        value: 'vm',
+        vm: {
+          name: 'vm',
+          detail: {
+            hostPath: 'hostpath',
+          },
+        },
       },
-      [PROVIDER_VMWARE_USER_PWD_KEY]: 'password',
     },
   },
-  [PROVIDER_VMWARE_USER_NAME_KEY]: {
-    value: 'username',
-  },
-  [PROVIDER_VMWARE_HOSTNAME_KEY]: {
-    value: 'my.domain.com',
-  },
-  [PROVIDER_VMWARE_USER_PWD_REMEMBER_KEY]: {
-    value: true,
-  },
-  [FLAVOR_KEY]: basicSettingsContainer[FLAVOR_KEY],
-  [WORKLOAD_PROFILE_KEY]: basicSettingsContainer[WORKLOAD_PROFILE_KEY],
-  [OPERATING_SYSTEM_KEY]: basicSettingsContainer[OPERATING_SYSTEM_KEY],
+  [FLAVOR_KEY]: vmSettingsContainer[FLAVOR_KEY],
+  [WORKLOAD_PROFILE_KEY]: vmSettingsContainer[WORKLOAD_PROFILE_KEY],
+  [OPERATING_SYSTEM_KEY]: vmSettingsContainer[OPERATING_SYSTEM_KEY],
 };
 
-export const basicSettingsContainerWindows = {
-  ...basicSettingsContainer,
+export const vmSettingsContainerWindows = {
+  ...vmSettingsContainer,
   [FLAVOR_KEY]: {
     value: 'medium',
   },
diff --git a/src/tests/k8s.js b/src/tests/k8s.js
index e4042aaa2..ea151ce92 100644
--- a/src/tests/k8s.js
+++ b/src/tests/k8s.js
@@ -3,13 +3,10 @@ import React from 'react';
 import * as _ from 'lodash';
 
 import { ConfigMapModel, ProcessedTemplatesModel, V2VVMwareModel, TemplateModel } from '../models';
-import {
-  TEMPLATE_PARAM_VM_NAME,
-  VMWARE_TO_KUBEVIRT_OS_CONFIG_MAP_NAME,
-  VMWARE_TO_KUBEVIRT_OS_CONFIG_MAP_NAMESPACE,
-} from '../constants';
+import { TEMPLATE_PARAM_VM_NAME } from '../constants';
 import { fedora28 } from '../k8s/objects/template/fedora28';
 import { osV2VConfigMap } from './mocks/configMap';
+import { VMWARE_TO_KUBEVIRT_OS_CONFIG_MAP_NAME, VMWARE_TO_KUBEVIRT_OS_CONFIG_MAP_NAMESPACE } from '../config';
 
 const processTemplate = template =>
   new Promise((resolve, reject) => {
@@ -84,11 +81,13 @@ const inject = (children, props) => {
   });
 };
 
-export const WithResources = ({ resourceMap, resourceToProps, children, tesOnlyPhase = 'ConnectionVerified' }) => {
-  let childrenProps = {
-    choices: ['test-vm1', 'test-vm2'],
-    disabled: false,
-  };
+export const WithResources = ({
+  resourceMap,
+  resourceToProps = resources => resources,
+  children,
+  tesOnlyPhase = 'ConnectionVerified',
+}) => {
+  let childrenProps = {};
 
   if (resourceMap.vCenterSecrets) {
     const vCenterSecrets = [
@@ -103,7 +102,7 @@ export const WithResources = ({ resourceMap, resourceToProps, children, tesOnlyP
         },
       },
     ];
-    childrenProps = resourceToProps({ vCenterSecrets });
+    childrenProps = { ...childrenProps, ...resourceToProps({ vCenterSecrets }) };
   }
 
   if (resourceMap.v2vvmware) {
@@ -125,7 +124,7 @@ export const WithResources = ({ resourceMap, resourceToProps, children, tesOnlyP
         phase: tesOnlyPhase,
       },
     };
-    childrenProps = resourceToProps({ v2vvmware });
+    childrenProps = { ...childrenProps, ...resourceToProps({ v2vvmware }) };
   }
 
   return inject(children, childrenProps);
diff --git a/src/utils/status/v2vVMware/constants.js b/src/utils/status/v2vVMware/constants.js
new file mode 100644
index 000000000..4d207150f
--- /dev/null
+++ b/src/utils/status/v2vVMware/constants.js
@@ -0,0 +1,11 @@
+export const V2V_WMWARE_STATUS_CONNECTING = 'V2V_WMWARE_STATUS_CONNECTING';
+export const V2V_WMWARE_STATUS_CONNECTION_FAILED = 'V2V_WMWARE_STATUS_CONNECTION_FAILED';
+export const V2V_WMWARE_STATUS_CONNECTION_TO_VCENTER_FAILED = 'V2V_WMWARE_STATUS_CONNECTION_TO_VCENTER_FAILED';
+export const V2V_WMWARE_STATUS_LOADING_VMS_LIST = 'V2V_WMWARE_STATUS_LOADING_VMS_LIST';
+export const V2V_WMWARE_STATUS_LOADING_VMS_LIST_FAILED = 'V2V_WMWARE_STATUS_LOADING_VMS_LIST_FAILED';
+export const V2V_WMWARE_STATUS_LOADING_VM_DETAIL = 'V2V_WMWARE_STATUS_LOADING_VM_DETAIL';
+export const V2V_WMWARE_STATUS_LOADING_VM_DETAIL_FAILED = 'V2V_WMWARE_STATUS_LOADING_VM_DETAIL_FAILED';
+export const V2V_WMWARE_STATUS_CONNECTION_SUCCESSFUL = 'V2V_WMWARE_STATUS_CONNECTION_SUCCESSFUL';
+export const V2V_WMWARE_STATUS_UNKNOWN = 'V2V_WMWARE_STATUS_UNKNOWN';
+
+export const V2V_WMWARE_STATUS_ALL_OK = [V2V_WMWARE_STATUS_CONNECTION_SUCCESSFUL];
diff --git a/src/utils/status/v2vVMware/index.js b/src/utils/status/v2vVMware/index.js
new file mode 100644
index 000000000..60632bfc2
--- /dev/null
+++ b/src/utils/status/v2vVMware/index.js
@@ -0,0 +1,2 @@
+export * from './constants';
+export * from './v2vVMwareStatus';
diff --git a/src/utils/status/v2vVMware/v2vVMwareStatus.js b/src/utils/status/v2vVMware/v2vVMwareStatus.js
new file mode 100644
index 000000000..3a16e840e
--- /dev/null
+++ b/src/utils/status/v2vVMware/v2vVMwareStatus.js
@@ -0,0 +1,51 @@
+import {
+  V2V_WMWARE_STATUS_CONNECTION_FAILED,
+  V2V_WMWARE_STATUS_LOADING_VMS_LIST_FAILED,
+  V2V_WMWARE_STATUS_LOADING_VM_DETAIL_FAILED,
+  V2V_WMWARE_STATUS_CONNECTING,
+  V2V_WMWARE_STATUS_LOADING_VMS_LIST,
+  V2V_WMWARE_STATUS_LOADING_VM_DETAIL,
+  V2V_WMWARE_STATUS_CONNECTION_SUCCESSFUL,
+  V2V_WMWARE_STATUS_UNKNOWN,
+  V2V_WMWARE_STATUS_CONNECTION_TO_VCENTER_FAILED,
+} from './constants';
+
+import { getStatusPhase } from '../../../selectors';
+
+import { NOT_HANDLED } from '..';
+
+// Following constants conform v2vvmware_controller.go
+const phaseMapper = {
+  Failed: V2V_WMWARE_STATUS_CONNECTION_TO_VCENTER_FAILED,
+  LoadingVmsListFailed: V2V_WMWARE_STATUS_LOADING_VMS_LIST_FAILED,
+  LoadingVmDetailFailed: V2V_WMWARE_STATUS_LOADING_VM_DETAIL_FAILED,
+  LoadingVmsList: V2V_WMWARE_STATUS_LOADING_VMS_LIST,
+  LoadingVmDetail: V2V_WMWARE_STATUS_LOADING_VM_DETAIL,
+  Connecting: V2V_WMWARE_STATUS_CONNECTING,
+  ConnectionVerified: V2V_WMWARE_STATUS_CONNECTION_SUCCESSFUL,
+};
+
+const hasV2vVMWareStatus = v2vvmware => {
+  const status = phaseMapper[getStatusPhase(v2vvmware)];
+
+  return status ? { status } : NOT_HANDLED;
+};
+
+const hasSetStatus = flags => {
+  if (flags.isConnecting) {
+    return V2V_WMWARE_STATUS_CONNECTING;
+  }
+
+  if (flags.hasConnectionFailed) {
+    return V2V_WMWARE_STATUS_CONNECTION_FAILED;
+  }
+
+  return NOT_HANDLED;
+};
+
+// TODO: tests?
+export const getV2vVMwareStatus = (v2vvmware, flags = { isConnecting: false, hasConnectionFailed: false }) =>
+  hasV2vVMWareStatus(v2vvmware) || hasSetStatus(flags) || { status: V2V_WMWARE_STATUS_UNKNOWN };
+
+export const getSimpleV2vVMwareStatus = (v2vvmware, flags = { isConnecting: false, hasConnectionFailed: false }) =>
+  getV2vVMwareStatus(v2vvmware, flags).status;
diff --git a/src/utils/strings.js b/src/utils/strings.js
index a6bc65c0a..ba240ecd7 100644
--- a/src/utils/strings.js
+++ b/src/utils/strings.js
@@ -2,6 +2,8 @@ export const EMPTY_ERROR = 'cannot be empty';
 export const START_WHITESPACE_ERROR = 'cannot start with whitespace characters';
 export const END_WHITESPACE_ERROR = 'cannot end with whitespace characters';
 
+export const NAMESPACE_MUST_BE_SELECTED = 'Namespace must be selected.';
+
 export const DNS1123_START_ERROR = 'has to start with alphanumeric character';
 export const DNS1123_END_ERROR = 'has to end with alphanumeric character';
 export const DNS1123_CONTAINS_ERROR = 'cannot contain';
@@ -13,3 +15,9 @@ export const URL_INVALID_ERROR = 'has to be a valid URL';
 export const VIRTUAL_MACHINE_EXISTS = `is already used by another Virtual Machine`;
 
 // export const VMWARE_URL_ERROR = 'vCenter URL is incorrectly formatted. Example: https://host:port/';
+export const ERROR = 'Error';
+export const CREATED = 'created';
+export const CREATED_WITH_FAILED_CLEANUP = 'created & failed to clean up';
+export const CREATED_WITH_CLEANUP = 'created & cleaned up';
+export const FAILED_TO_CREATE = 'failed to create';
+export const FAILED_TO_PATCH = 'failed to patch';
diff --git a/src/utils/templates.js b/src/utils/templates.js
index d85886e80..997b6d747 100644
--- a/src/utils/templates.js
+++ b/src/utils/templates.js
@@ -10,6 +10,7 @@ import {
   getName,
   getNamespace,
   getDataVolumeSourceType,
+  getLabels,
 } from '../selectors';
 import { selectVm } from '../k8s/selectors';
 import { baseTemplates } from '../k8s/objects/template';
@@ -32,10 +33,7 @@ export const getTemplatesWithLabels = (templates, labels) => {
     if (label !== undefined) {
       pull(
         filteredTemplates,
-        remove(
-          filteredTemplates,
-          template => Object.keys(template.metadata.labels).find(l => l === label) === undefined
-        )
+        remove(filteredTemplates, template => Object.keys(getLabels(template, [])).find(l => l === label) === undefined)
       );
     }
   });
@@ -44,8 +42,8 @@ export const getTemplatesWithLabels = (templates, labels) => {
 
 export const getTemplatesLabelValues = (templates, label) => {
   const labelValues = [];
-  templates.forEach(t => {
-    const labels = Object.keys(t.metadata.labels || []).filter(l => l.startsWith(label));
+  (templates || []).forEach(t => {
+    const labels = Object.keys(getLabels(t, [])).filter(l => l.startsWith(label));
     labels.forEach(l => {
       const labelParts = l.split('/');
       if (labelParts.length > 1) {
@@ -60,7 +58,7 @@ export const getTemplatesLabelValues = (templates, label) => {
 };
 
 export const getTemplate = (templates, type) => {
-  const filteredTemplates = templates.filter(template => {
+  const filteredTemplates = (templates || []).filter(template => {
     const labels = get(template, 'metadata.labels', {});
     return labels[TEMPLATE_TYPE_LABEL] === type;
   });
diff --git a/src/utils/tests/utils.test.js b/src/utils/tests/utils.test.js
index 33be81493..15183aec3 100644
--- a/src/utils/tests/utils.test.js
+++ b/src/utils/tests/utils.test.js
@@ -1,4 +1,4 @@
-import { formatBytes, formatCores, formatNetTraffic } from '../utils';
+import { formatBytes, formatCores, formatNetTraffic, hasObjectTruthyValue, objectMerge } from '../utils';
 
 describe('unit format functions', () => {
   it('formats bytes', () => {
@@ -21,3 +21,71 @@ describe('unit format functions', () => {
     expect(formatNetTraffic(3 * 1000 * 1000)).toEqual({ value: 3, unit: 'MBps' });
   });
 });
+
+describe('objectMerge', () => {
+  it('works with arrays', () => {
+    const destination = {
+      a: {},
+      b: {
+        e: {},
+        array: [1, 2, 3, 4],
+      },
+      c: {
+        f: {},
+      },
+      d: {},
+    };
+
+    const updateOne = {
+      b: {
+        e: {
+          c: 9,
+        },
+        array: [3, 5],
+      },
+      d: {
+        g: {
+          i: 10,
+        },
+      },
+    };
+
+    const updateTwo = {
+      d: {
+        g: {
+          h: 5,
+        },
+      },
+    };
+
+    const result = {
+      a: {},
+      b: {
+        e: {
+          c: 9,
+        },
+        array: [3, 5],
+      },
+      c: {
+        f: {},
+      },
+      d: {
+        g: {
+          h: 5,
+          i: 10,
+        },
+      },
+    };
+
+    expect(objectMerge(destination, updateOne, updateTwo)).toEqual(result);
+  });
+});
+
+describe('hasObjectTruthyValue', () => {
+  it('does not have', () => {
+    expect(hasObjectTruthyValue({ a: false, b: undefined, c: null })).toBeFalsy();
+  });
+  it('has', () => {
+    expect(hasObjectTruthyValue({ a: false, b: undefined, c: null, d: true })).toBeTruthy();
+  });
+});
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 3e190baa6..d712c0831 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1,3 +1,5 @@
+import { isArray, mergeWith } from 'lodash';
+
 import { getModelIndexId, NamespaceModel, ProjectModel } from '../models';
 
 import {
@@ -148,3 +150,14 @@ export const formatToShortTime = timestamp => {
   // returns in HH:MM format
   return dt.toString().substring(16, 21);
 };
+
+export const hasObjectTruthyValue = obj => !!(obj && !!Object.keys(obj).find(key => obj[key]));
+
+// merge but keep only keys eligible for update (dest)
+export const objectMerge = (dest, ...sources) =>
+  mergeWith(dest, ...sources, (objValue, srcValue) => {
+    if (isArray(objValue) || isArray(srcValue)) {
+      return srcValue;
+    }
+    return undefined;
+  });
diff --git a/src/utils/validations.js b/src/utils/validations.js
index 26eac10dd..06c44bd3c 100644
--- a/src/utils/validations.js
+++ b/src/utils/validations.js
@@ -24,6 +24,7 @@ const alphanumberincRegex = '[a-zA-Z0-9]';
 export const getValidationObject = (message, type = VALIDATION_ERROR_TYPE) => ({
   message,
   type,
+  isEmptyError: message === EMPTY_ERROR,
 });
 
 // DNS-1123 subdomain
@@ -44,8 +45,10 @@ export const validateDNS1123SubdomainValue = value => {
     return getValidationObject(DNS1123_END_ERROR);
   }
   for (let i = 1; i < value.length - 1; i++) {
-    if (!value.charAt(i).match('[-a-zA-Z0-9.]')) {
-      return getValidationObject(`${DNS1123_CONTAINS_ERROR} ${value.charAt(i)}`);
+    const char = value.charAt(i);
+    if (!char.match('[-a-zA-Z0-9.]')) {
+      const offender = char.match('\\s') ? 'whitespace characters' : char;
+      return getValidationObject(`${DNS1123_CONTAINS_ERROR} ${offender}`);
     }
   }
   return null;
diff --git a/yarn.lock b/yarn.lock
index b4633b021..490099d43 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7985,7 +7985,12 @@ react-is@^16.3.2, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4:
   version "16.8.4"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.4.tgz#90f336a68c3a29a096a3d648ab80e87ec61482a2"
 
-react-lifecycles-compat@^3.0.4:
+react-is@^16.6.0:
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
+  integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
+
+react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
 
@@ -8035,6 +8040,19 @@ react-prop-types@^0.4.0:
   dependencies:
     warning "^3.0.0"
 
+react-redux@5.x:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.1.1.tgz#88e368682c7fa80e34e055cd7ac56f5936b0f52f"
+  integrity sha512-LE7Ned+cv5qe7tMV5BPYkGQ5Lpg8gzgItK07c67yHvJ8t0iaD9kPFPAli/mYkiyJYrs2pJgExR2ZgsGqlrOApg==
+  dependencies:
+    "@babel/runtime" "^7.1.2"
+    hoist-non-react-statics "^3.1.0"
+    invariant "^2.2.4"
+    loose-envify "^1.1.0"
+    prop-types "^15.6.1"
+    react-is "^16.6.0"
+    react-lifecycles-compat "^3.0.0"
+
 react-responsive@6.1.x:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/react-responsive/-/react-responsive-6.1.1.tgz#3edfac93c2ada3e9bf5904683c2d7c5aab4a6296"
@@ -8233,7 +8251,7 @@ redent@^2.0.0:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
 
-redux@^3.7.1:
+redux@3.x, redux@^3.7.1:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
   dependencies: