diff --git a/.tekton/forklift-console-plugin-pull-request.yaml b/.tekton/forklift-console-plugin-pull-request.yaml
index 46e918968..235b389eb 100644
--- a/.tekton/forklift-console-plugin-pull-request.yaml
+++ b/.tekton/forklift-console-plugin-pull-request.yaml
@@ -30,6 +30,8 @@ spec:
     value: build/Containerfile
   - name: path-context
     value: .
+  - name: build-source-image
+    value: "true"
   pipelineSpec:
     description: |
       This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.
@@ -134,7 +136,7 @@ spec:
         - name: name
           value: init
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:0523b51c28375a3f222da91690e22eff11888ebc98a0c73c468af44762265c69
+          value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:60063fefe88e111d129cb59caff97c912722927c8a0f750253553d4c527a2396
         - name: kind
           value: task
         resolver: bundles
@@ -225,7 +227,7 @@ spec:
         - name: name
           value: buildah-oci-ta
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.2@sha256:decef0e000a05daad9dd43b707c8b3a96b6125ff5a4ee096fd3e8c23a2881b9e
+          value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.2@sha256:e0f1ec1ec43ba0f9533dd70fe76a3c24ac3ca14ddd83036099c8073c94dc8258
         - name: kind
           value: task
         resolver: bundles
@@ -254,7 +256,7 @@ spec:
         - name: name
           value: build-image-index
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:a89c141c8d35b2e9d9904c92c9b128f7ccf36681adac7f7422b4537b8bb077e7
+          value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:37328a4b2fc686435531ba423c26c2051822a4e70b06088c4d8eaf0e8fa6d65b
         - name: kind
           value: task
         resolver: bundles
@@ -304,7 +306,7 @@ spec:
         - name: name
           value: deprecated-image-check
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.4@sha256:5a1a165fa02270f0a947d8a2131ee9d8be0b8e9d34123828c2bef589e504ee84
+          value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.4@sha256:f8efb0b22692fad908a1a75f8d5c0b6ed3b0bcd2a9853577e7be275e5bac1bb8
         - name: kind
           value: task
         resolver: bundles
@@ -326,7 +328,7 @@ spec:
         - name: name
           value: clair-scan
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:0a5421111e7092740398691d5bd7c125cc0896f29531d19414bb5724ae41692a
+          value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:e428b37d253621365ffb24d4053e5f3141988ae6a30fce1c8ba73b7211396eb0
         - name: kind
           value: task
         resolver: bundles
@@ -372,7 +374,7 @@ spec:
         - name: name
           value: sast-snyk-check-oci-ta
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.3@sha256:1119722a2d31b831d1aa336fd8cced0a5016c95466b6b59a58bbf3585735850f
+          value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.3@sha256:6d232347739a0366dcfc4e40afbcb5d1937dd3fea8952afb1bd6a4b0c5d1c1f5
         - name: kind
           value: task
         resolver: bundles
@@ -394,7 +396,7 @@ spec:
         - name: name
           value: clamav-scan
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:6e08cf608240f57442ca5458f3c0dade3558f4f2953be8ea939232f5d5378d58
+          value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:d78221853f7ff2befc6669dd0eeb91e6611ae84ac7754150ea0f071d92ff41cb
         - name: kind
           value: task
         resolver: bundles
@@ -414,7 +416,7 @@ spec:
         - name: name
           value: apply-tags
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:87fd7fc0e937aad1a8db9b6e377d7e444f53394dafde512d68adbea6966a4702
+          value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:0767c115d4ba4854d106c9cdfabdc1f1298bc2742a3fea4fefbac4b9c5873d6e
         - name: kind
           value: task
         resolver: bundles
@@ -454,7 +456,7 @@ spec:
         - name: name
           value: rpms-signature-scan
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:8f3b23bf1b0ef55cc79d28604d2397a0101ac9c0c42ae26e26532eb2778c801b
+          value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:ec536e55a039052823ba74e07db3175554fb046649671d1fefd776ca064d00ac
         - name: kind
           value: task
         resolver: bundles
diff --git a/.tekton/forklift-console-plugin-push.yaml b/.tekton/forklift-console-plugin-push.yaml
index 9d0a46460..d2e76e0e7 100644
--- a/.tekton/forklift-console-plugin-push.yaml
+++ b/.tekton/forklift-console-plugin-push.yaml
@@ -29,6 +29,8 @@ spec:
     value: build/Containerfile
   - name: path-context
     value: .
+  - name: build-source-image
+    value: "true"
   pipelineSpec:
     description: |
       This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.
@@ -133,7 +135,7 @@ spec:
         - name: name
           value: init
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:0523b51c28375a3f222da91690e22eff11888ebc98a0c73c468af44762265c69
+          value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:60063fefe88e111d129cb59caff97c912722927c8a0f750253553d4c527a2396
         - name: kind
           value: task
         resolver: bundles
@@ -224,7 +226,7 @@ spec:
         - name: name
           value: buildah-oci-ta
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.2@sha256:decef0e000a05daad9dd43b707c8b3a96b6125ff5a4ee096fd3e8c23a2881b9e
+          value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.2@sha256:e0f1ec1ec43ba0f9533dd70fe76a3c24ac3ca14ddd83036099c8073c94dc8258
         - name: kind
           value: task
         resolver: bundles
@@ -253,7 +255,7 @@ spec:
         - name: name
           value: build-image-index
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:a89c141c8d35b2e9d9904c92c9b128f7ccf36681adac7f7422b4537b8bb077e7
+          value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:37328a4b2fc686435531ba423c26c2051822a4e70b06088c4d8eaf0e8fa6d65b
         - name: kind
           value: task
         resolver: bundles
@@ -303,7 +305,7 @@ spec:
         - name: name
           value: deprecated-image-check
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.4@sha256:5a1a165fa02270f0a947d8a2131ee9d8be0b8e9d34123828c2bef589e504ee84
+          value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.4@sha256:f8efb0b22692fad908a1a75f8d5c0b6ed3b0bcd2a9853577e7be275e5bac1bb8
         - name: kind
           value: task
         resolver: bundles
@@ -325,7 +327,7 @@ spec:
         - name: name
           value: clair-scan
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:0a5421111e7092740398691d5bd7c125cc0896f29531d19414bb5724ae41692a
+          value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:e428b37d253621365ffb24d4053e5f3141988ae6a30fce1c8ba73b7211396eb0
         - name: kind
           value: task
         resolver: bundles
@@ -371,7 +373,7 @@ spec:
         - name: name
           value: sast-snyk-check-oci-ta
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.3@sha256:1119722a2d31b831d1aa336fd8cced0a5016c95466b6b59a58bbf3585735850f
+          value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.3@sha256:6d232347739a0366dcfc4e40afbcb5d1937dd3fea8952afb1bd6a4b0c5d1c1f5
         - name: kind
           value: task
         resolver: bundles
@@ -393,7 +395,7 @@ spec:
         - name: name
           value: clamav-scan
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:6e08cf608240f57442ca5458f3c0dade3558f4f2953be8ea939232f5d5378d58
+          value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:d78221853f7ff2befc6669dd0eeb91e6611ae84ac7754150ea0f071d92ff41cb
         - name: kind
           value: task
         resolver: bundles
@@ -413,7 +415,7 @@ spec:
         - name: name
           value: apply-tags
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:87fd7fc0e937aad1a8db9b6e377d7e444f53394dafde512d68adbea6966a4702
+          value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:0767c115d4ba4854d106c9cdfabdc1f1298bc2742a3fea4fefbac4b9c5873d6e
         - name: kind
           value: task
         resolver: bundles
@@ -453,7 +455,7 @@ spec:
         - name: name
           value: rpms-signature-scan
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:8f3b23bf1b0ef55cc79d28604d2397a0101ac9c0c42ae26e26532eb2778c801b
+          value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:ec536e55a039052823ba74e07db3175554fb046649671d1fefd776ca064d00ac
         - name: kind
           value: task
         resolver: bundles
diff --git a/packages/common/src/components/TypeaheadSelect/TypeaheadSelect.tsx b/packages/common/src/components/TypeaheadSelect/TypeaheadSelect.tsx
new file mode 100644
index 000000000..f82af1f82
--- /dev/null
+++ b/packages/common/src/components/TypeaheadSelect/TypeaheadSelect.tsx
@@ -0,0 +1,425 @@
+import React from 'react';
+
+import {
+  Button,
+  MenuToggle,
+  MenuToggleElement,
+  MenuToggleProps,
+  Select,
+  SelectList,
+  SelectOption,
+  SelectOptionProps,
+  SelectProps,
+  TextInputGroup,
+  TextInputGroupMain,
+  TextInputGroupUtilities,
+} from '@patternfly/react-core';
+import { TimesIcon } from '@patternfly/react-icons';
+
+export interface TypeaheadSelectOption extends Omit<SelectOptionProps, 'content' | 'isSelected'> {
+  /** Content of the select option. */
+  content: string | number;
+  /** Value of the select option. */
+  value: string | number;
+  /** Indicator for option being selected */
+  isSelected?: boolean;
+}
+
+export interface TypeaheadSelectProps extends Omit<SelectProps, 'toggle' | 'onSelect'> {
+  /** Options of the select */
+  selectOptions: TypeaheadSelectOption[];
+  /** Callback triggered on selection. */
+  onSelect?: (
+    _event:
+      | React.MouseEvent<Element, MouseEvent>
+      | React.KeyboardEvent<HTMLInputElement>
+      | undefined,
+    selection: string | number,
+  ) => void;
+  /** Callback triggered when the select opens or closes. */
+  onToggle?: (nextIsOpen: boolean) => void;
+  /** Callback triggered when the text in the input field changes. */
+  onInputChange?: (newValue: string) => void;
+  /** Function to return items matching the current filter value */
+  filterFunction?: (
+    filterValue: string,
+    options: TypeaheadSelectOption[],
+  ) => TypeaheadSelectOption[];
+  /** Callback triggered when the clear button is selected */
+  onClearSelection?: () => void;
+  /** Flag to allow clear current selection */
+  allowClear?: boolean;
+  /** Placeholder text for the select input. */
+  placeholder?: string;
+  /** Flag to indicate if the typeahead select allows new items */
+  isCreatable?: boolean;
+  /** Flag to indicate if create option should be at top of typeahead */
+  isCreateOptionOnTop?: boolean;
+  /** Message to display to create a new option */
+  createOptionMessage?: string | ((newValue: string) => string);
+  /** Message to display when no options are available. */
+  noOptionsAvailableMessage?: string;
+  /** Message to display when no options match the filter. */
+  noOptionsFoundMessage?: string | ((filter: string) => string);
+  /** Flag indicating the select should be disabled. */
+  isDisabled?: boolean;
+  /** Width of the toggle. */
+  toggleWidth?: string;
+  /** Additional props passed to the toggle. */
+  toggleProps?: MenuToggleProps;
+}
+
+const defaultNoOptionsFoundMessage = (filter: string) => `No results found for "${filter}"`;
+const defaultCreateOptionMessage = (newValue: string) => `Create "${newValue}"`;
+const defaultFilterFunction = (filterValue: string, options: TypeaheadSelectOption[]) =>
+  options.filter((o) => String(o.content).toLowerCase().includes(filterValue.toLowerCase()));
+
+export const TypeaheadSelect: React.FC<TypeaheadSelectProps> = ({
+  innerRef,
+  selectOptions,
+  onSelect,
+  onToggle,
+  onInputChange,
+  filterFunction = defaultFilterFunction,
+  onClearSelection,
+  allowClear,
+  placeholder = 'Select an option',
+  noOptionsAvailableMessage = 'No options are available',
+  noOptionsFoundMessage = defaultNoOptionsFoundMessage,
+  isCreatable = false,
+  isCreateOptionOnTop = false,
+  createOptionMessage = defaultCreateOptionMessage,
+  isDisabled,
+  toggleWidth,
+  toggleProps,
+  ...props
+}: TypeaheadSelectProps) => {
+  const [isOpen, setIsOpen] = React.useState(false);
+  const [filterValue, setFilterValue] = React.useState<string>('');
+  const [isFiltering, setIsFiltering] = React.useState<boolean>(false);
+  const [focusedItemIndex, setFocusedItemIndex] = React.useState<number | null>(null);
+  const [activeItemId, setActiveItemId] = React.useState<string | null>(null);
+  const textInputRef = React.useRef<HTMLInputElement>();
+
+  const NO_RESULTS = 'no results';
+
+  const selected = React.useMemo(
+    () => selectOptions.find((option) => option.value === props.selected || option.isSelected),
+    [props.selected, selectOptions],
+  );
+
+  const filteredSelections = React.useMemo(() => {
+    let newSelectOptions: TypeaheadSelectOption[] = selectOptions;
+
+    // Filter menu items based on the text input value when one exists
+    if (isFiltering && filterValue) {
+      newSelectOptions = filterFunction(filterValue, selectOptions);
+
+      if (
+        isCreatable &&
+        filterValue.trim() &&
+        !newSelectOptions.find((o) => String(o.content).toLowerCase() === filterValue.toLowerCase())
+      ) {
+        const createOption = {
+          content:
+            typeof createOptionMessage === 'string'
+              ? createOptionMessage
+              : createOptionMessage(filterValue),
+          value: filterValue,
+        };
+        newSelectOptions = isCreateOptionOnTop
+          ? [createOption, ...newSelectOptions]
+          : [...newSelectOptions, createOption];
+      }
+
+      // When no options are found after filtering, display 'No results found'
+      if (!newSelectOptions.length) {
+        newSelectOptions = [
+          {
+            isAriaDisabled: true,
+            content:
+              typeof noOptionsFoundMessage === 'string'
+                ? noOptionsFoundMessage
+                : noOptionsFoundMessage(filterValue),
+            value: NO_RESULTS,
+          },
+        ];
+      }
+    }
+
+    // When no options are  available,  display 'No options available'
+    if (!newSelectOptions.length) {
+      newSelectOptions = [
+        {
+          isAriaDisabled: true,
+          content: noOptionsAvailableMessage,
+          value: NO_RESULTS,
+        },
+      ];
+    }
+
+    return newSelectOptions;
+  }, [
+    isFiltering,
+    filterValue,
+    filterFunction,
+    selectOptions,
+    noOptionsFoundMessage,
+    isCreatable,
+    isCreateOptionOnTop,
+    createOptionMessage,
+    noOptionsAvailableMessage,
+  ]);
+
+  React.useEffect(() => {
+    if (isFiltering) {
+      openMenu();
+    }
+    // Don't update on openMenu changes
+  }, [isFiltering]);
+
+  const setActiveAndFocusedItem = (itemIndex: number) => {
+    setFocusedItemIndex(itemIndex);
+    const focusedItem = selectOptions[itemIndex];
+    setActiveItemId(String(focusedItem.value));
+  };
+
+  const resetActiveAndFocusedItem = () => {
+    setFocusedItemIndex(null);
+    setActiveItemId(null);
+  };
+
+  const openMenu = () => {
+    if (!isOpen) {
+      if (onToggle) {
+        onToggle(true);
+      }
+      setIsOpen(true);
+    }
+  };
+
+  const closeMenu = () => {
+    if (onToggle) {
+      onToggle(false);
+    }
+    setIsOpen(false);
+    resetActiveAndFocusedItem();
+    setIsFiltering(false);
+    setFilterValue(String(selected?.content ?? ''));
+  };
+
+  const onInputClick = () => {
+    if (!isOpen) {
+      openMenu();
+    }
+    setTimeout(() => {
+      textInputRef.current?.focus();
+    }, 100);
+  };
+
+  const selectOption = (
+    _event:
+      | React.MouseEvent<Element, MouseEvent>
+      | React.KeyboardEvent<HTMLInputElement>
+      | undefined,
+    option: TypeaheadSelectOption,
+  ) => {
+    if (onSelect) {
+      onSelect(_event, option.value);
+    }
+    closeMenu();
+  };
+
+  const handleSelect = (
+    _event: React.MouseEvent<Element, MouseEvent> | undefined,
+    value: string | number | undefined,
+  ) => {
+    if (value && value !== NO_RESULTS) {
+      const optionToSelect = selectOptions.find((option) => option.value === value);
+      if (optionToSelect) {
+        selectOption(_event, optionToSelect);
+      } else if (isCreatable) {
+        selectOption(_event, { value, content: value });
+      }
+    }
+  };
+
+  const onTextInputChange = (_event: React.FormEvent<HTMLInputElement>, value: string) => {
+    setFilterValue(value || '');
+    setIsFiltering(true);
+    if (onInputChange) {
+      onInputChange(value);
+    }
+
+    resetActiveAndFocusedItem();
+  };
+
+  const handleMenuArrowKeys = (key: string) => {
+    let indexToFocus = 0;
+
+    openMenu();
+
+    if (filteredSelections.every((option) => option.isDisabled)) {
+      return;
+    }
+
+    if (key === 'ArrowUp') {
+      // When no index is set or at the first index, focus to the last, otherwise decrement focus index
+      if (focusedItemIndex === null || focusedItemIndex === 0) {
+        indexToFocus = filteredSelections.length - 1;
+      } else {
+        indexToFocus = focusedItemIndex - 1;
+      }
+
+      // Skip disabled options
+      while (filteredSelections[indexToFocus].isDisabled) {
+        indexToFocus--;
+        if (indexToFocus === -1) {
+          indexToFocus = filteredSelections.length - 1;
+        }
+      }
+    }
+
+    if (key === 'ArrowDown') {
+      // When no index is set or at the last index, focus to the first, otherwise increment focus index
+      if (focusedItemIndex === null || focusedItemIndex === filteredSelections.length - 1) {
+        indexToFocus = 0;
+      } else {
+        indexToFocus = focusedItemIndex + 1;
+      }
+
+      // Skip disabled options
+      while (filteredSelections[indexToFocus].isDisabled) {
+        indexToFocus++;
+        if (indexToFocus === filteredSelections.length) {
+          indexToFocus = 0;
+        }
+      }
+    }
+
+    setActiveAndFocusedItem(indexToFocus);
+  };
+
+  const onInputKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
+    const focusedItem = focusedItemIndex !== null ? filteredSelections[focusedItemIndex] : null;
+
+    switch (event.key) {
+      case 'Enter':
+        if (
+          isOpen &&
+          focusedItem &&
+          focusedItem.value !== NO_RESULTS &&
+          !focusedItem.isAriaDisabled
+        ) {
+          selectOption(event, focusedItem);
+        }
+
+        openMenu();
+
+        break;
+      case 'ArrowUp':
+      case 'ArrowDown':
+        event.preventDefault();
+        handleMenuArrowKeys(event.key);
+        break;
+    }
+  };
+
+  const onToggleClick = () => {
+    if (!isOpen) {
+      openMenu();
+    } else {
+      closeMenu();
+    }
+    textInputRef.current?.focus();
+  };
+
+  const onClearButtonClick = () => {
+    if (isFiltering && filterValue) {
+      if (selected && onSelect) {
+        onSelect(undefined, selected.value);
+      }
+      setFilterValue('');
+      if (onInputChange) {
+        onInputChange('');
+      }
+      setIsFiltering(false);
+    }
+
+    resetActiveAndFocusedItem();
+    textInputRef.current?.focus();
+
+    if (onClearSelection) {
+      onClearSelection();
+    }
+  };
+
+  const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
+    <MenuToggle
+      ref={toggleRef}
+      variant="typeahead"
+      aria-label="Typeahead menu toggle"
+      onClick={onToggleClick}
+      isExpanded={isOpen}
+      isDisabled={isDisabled}
+      isFullWidth
+      style={{ width: toggleWidth }}
+      {...toggleProps}
+    >
+      <TextInputGroup isPlain>
+        <TextInputGroupMain
+          value={isFiltering ? filterValue : selected?.content ?? ''}
+          onClick={onInputClick}
+          onChange={onTextInputChange}
+          onKeyDown={onInputKeyDown}
+          autoComplete="off"
+          innerRef={textInputRef}
+          placeholder={placeholder}
+          {...(activeItemId && { 'aria-activedescendant': activeItemId })}
+          role="combobox"
+          isExpanded={isOpen}
+          aria-controls="select-typeahead-listbox"
+        />
+        {(isFiltering && filterValue) || (allowClear && selected) ? (
+          <TextInputGroupUtilities>
+            <Button
+              icon={<TimesIcon aria-hidden />}
+              variant="plain"
+              onClick={onClearButtonClick}
+              aria-label="Clear input value"
+            />
+          </TextInputGroupUtilities>
+        ) : null}
+      </TextInputGroup>
+    </MenuToggle>
+  );
+
+  return (
+    <Select
+      isOpen={isOpen}
+      selected={selected}
+      onSelect={handleSelect}
+      onOpenChange={(open) => !open && closeMenu()}
+      toggle={toggle}
+      shouldFocusFirstItemOnOpen={false}
+      ref={innerRef}
+      {...props}
+    >
+      <SelectList>
+        {filteredSelections.map((option, index) => {
+          const { content, value, ...optionProps } = option;
+          return (
+            <SelectOption
+              key={value}
+              value={value}
+              isFocused={focusedItemIndex === index}
+              {...optionProps}
+            >
+              {content}
+            </SelectOption>
+          );
+        })}
+      </SelectList>
+    </Select>
+  );
+};
diff --git a/packages/common/src/components/TypeaheadSelect/index.ts b/packages/common/src/components/TypeaheadSelect/index.ts
new file mode 100644
index 000000000..2d1d44920
--- /dev/null
+++ b/packages/common/src/components/TypeaheadSelect/index.ts
@@ -0,0 +1,3 @@
+// @index(['./*', /__/g], f => `export * from '${f.path}';`)
+export * from './TypeaheadSelect';
+// @endindex
diff --git a/packages/common/src/components/index.ts b/packages/common/src/components/index.ts
index e561934ae..54b33dbf8 100644
--- a/packages/common/src/components/index.ts
+++ b/packages/common/src/components/index.ts
@@ -10,4 +10,5 @@ export * from './LoadingDots';
 export * from './Page';
 export * from './QueryClientHoc';
 export * from './TableView';
+export * from './TypeaheadSelect';
 // @endindex
diff --git a/packages/forklift-console-plugin/locales/en/plugin__forklift-console-plugin.json b/packages/forklift-console-plugin/locales/en/plugin__forklift-console-plugin.json
index dbe3d2f99..92ae50477 100644
--- a/packages/forklift-console-plugin/locales/en/plugin__forklift-console-plugin.json
+++ b/packages/forklift-console-plugin/locales/en/plugin__forklift-console-plugin.json
@@ -11,6 +11,8 @@
   "{{selectedLength}} hosts selected.": "{{selectedLength}} hosts selected.",
   "{{success}} of {{total}} VMs migrated": "{{success}} of {{total}} VMs migrated",
   "{{success}} VMs succeeded": "{{success}} VMs succeeded",
+  "{{total}} VM": "{{total}} VM",
+  "{{total}} VM_plural": "{{total}} VMs",
   "{{total}} VMs": "{{total}} VMs",
   "{{vmCount}} VMs selected ": "{{vmCount}} VMs selected ",
   "{children}": "{children}",
@@ -156,7 +158,6 @@
   "Edit migration plan transfer network": "Edit migration plan transfer network",
   "Edit NetworkMap": "Edit NetworkMap",
   "Edit Plan": "Edit Plan",
-  "Edit plan name": "Edit plan name",
   "Edit Precopy interval (minutes)": "Edit Precopy interval (minutes)",
   "Edit Provider": "Edit Provider",
   "Edit Provider Credentials": "Edit Provider Credentials",
@@ -167,6 +168,7 @@
   "Edit StorageMap": "Edit StorageMap",
   "Edit URL": "Edit URL",
   "Edit VDDK init image": "Edit VDDK init image",
+  "Edit virtual machines": "Edit virtual machines",
   "Empty": "Empty",
   "Endpoint": "Endpoint",
   "Endpoint type": "Endpoint type",
@@ -253,6 +255,7 @@
   "Migration plan state information and progress": "Migration plan state information and progress",
   "Migration plans are used to plan migration or virtualization workloads from source providers to target providers.": "Migration plans are used to plan migration or virtualization workloads from source providers to target providers.",
   "Migration started": "Migration started",
+  "Migration status": "Migration status",
   "Migration Toolkit for Virtualization": "Migration Toolkit for Virtualization",
   "Migrations": "Migrations",
   "Migrations (last 24 hours)": "Migrations (last 24 hours)",
@@ -265,11 +268,9 @@
   "Multiple NICs on the same network": "Multiple NICs on the same network",
   "Name": "Name",
   "Name is primarily intended for creation idempotence and configuration definition. Cannot be updated.": "Name is primarily intended for creation idempotence and configuration definition. Cannot be updated.",
-  "Name is required and must be a unique within a namespace and valid Kubernetes name.": "Name is required and must be a unique within a namespace and valid Kubernetes name.",
   "Namespace": "Namespace",
   "Namespace defines the space within which each name must be unique.\n               An empty namespace is equivalent to the \"default\" namespace, but \"default\" is the canonical representation.\n               Not all objects are required to be scoped to a namespace - the value of this field for those objects will be empty.": "Namespace defines the space within which each name must be unique.\n               An empty namespace is equivalent to the \"default\" namespace, but \"default\" is the canonical representation.\n               Not all objects are required to be scoped to a namespace - the value of this field for those objects will be empty.",
   "Namespace defines the space within which each name must be unique.\n     An empty namespace is equivalent to the \"default\" namespace, but \"default\" is the canonical representation.\n     Not all objects are required to be scoped to a namespace -\n     the value of this field for those objects will be empty.": "Namespace defines the space within which each name must be unique.\n     An empty namespace is equivalent to the \"default\" namespace, but \"default\" is the canonical representation.\n     Not all objects are required to be scoped to a namespace -\n     the value of this field for those objects will be empty.",
-  "Namespace is not defined": "Namespace is not defined",
   "Network for data transfer": "Network for data transfer",
   "Network interfaces": "Network interfaces",
   "Network Map name re-generated": "Network Map name re-generated",
@@ -387,6 +388,7 @@
   "Provider details": "Provider details",
   "Provider inventory": "Provider inventory",
   "Provider resource name": "Provider resource name",
+  "Provider type": "Provider type",
   "Provider web UI link": "Provider web UI link",
   "Provider YAML": "Provider YAML",
   "Providers": "Providers",
@@ -401,7 +403,6 @@
   "Remove virtual machines": "Remove virtual machines",
   "Reorder": "Reorder",
   "Resources": "Resources",
-  "Restart": "Restart",
   "Restart migration": "Restart migration",
   "Restore default columns": "Restore default columns",
   "Return to the providers list page": "Return to the providers list page",
@@ -418,7 +419,6 @@
   "Select a namespace": "Select a namespace",
   "Select a provider": "Select a provider",
   "Select migration network": "Select migration network",
-  "Select provider type": "Select provider type",
   "Select source provider": "Select source provider",
   "Select virtual machines": "Select virtual machines",
   "Select vSphere provider endpoint type.": "Select vSphere provider endpoint type.",
@@ -486,6 +486,8 @@
   "The chosen provider is no longer available.": "The chosen provider is no longer available.",
   "The current certificate does not match the certificate fetched from URL. Manually validate the fingerprint before proceeding.": "The current certificate does not match the certificate fetched from URL. Manually validate the fingerprint before proceeding.",
   "The edit mappings button is disabled if the plan started running and at least one virtual machine was migrated successfully or when the plan status does not enable editing.": "The edit mappings button is disabled if the plan started running and at least one virtual machine was migrated successfully or when the plan status does not enable editing.",
+  "The edit virtual machines button is disabled if the plan started running and at least one virtual machine was migrated successfully.": "The edit virtual machines button is disabled if the plan started running and at least one virtual machine was migrated successfully.",
+  "The edit virtual machines button is disabled while the plan is not editable.": "The edit virtual machines button is disabled while the plan is not editable.",
   "The interval in minutes for precopy. Default value is 60.": "The interval in minutes for precopy. Default value is 60.",
   "The interval in seconds for snapshot pooling. Default value is 10.": "The interval in seconds for snapshot pooling. Default value is 10.",
   "The limit for CPU usage by the controller, specified in milliCPU. Default value is 500m.": "The limit for CPU usage by the controller, specified in milliCPU. Default value is 500m.",
@@ -525,7 +527,9 @@
   "Update credentials": "Update credentials",
   "Update hooks": "Update hooks",
   "Update mappings": "Update mappings",
+  "Update migration plan": "Update migration plan",
   "Update providers": "Update providers",
+  "Update virtual machines": "Update virtual machines",
   "Updated": "Updated",
   "Upload": "Upload",
   "URL": "URL",
@@ -536,6 +540,7 @@
   "URL of the providers API endpoint. The URL must be a valid endpoint for the provider type, see\n      the documentation for each provider type to learn more about the URL format.": "URL of the providers API endpoint. The URL must be a valid endpoint for the provider type, see\n      the documentation for each provider type to learn more about the URL format.",
   "User ID": "User ID",
   "Username": "Username",
+  "Validating...": "Validating...",
   "Validation Failed": "Validation Failed",
   "vCenter": "vCenter",
   "VDDK init image": "VDDK init image",
diff --git a/packages/forklift-console-plugin/src/components/page/StandardPageWithExpansion.tsx b/packages/forklift-console-plugin/src/components/page/StandardPageWithExpansion.tsx
new file mode 100644
index 000000000..b4bbe1dfd
--- /dev/null
+++ b/packages/forklift-console-plugin/src/components/page/StandardPageWithExpansion.tsx
@@ -0,0 +1,149 @@
+import React, { useState } from 'react';
+
+import { RowProps, withTr } from '@kubev2v/common';
+import { Td, Th } from '@patternfly/react-table';
+
+import StandardPage, { StandardPageProps } from './StandardPage';
+
+export function withRowExpansion<T>({ CellMapper, isExpanded, toggleExpandFor }) {
+  const Enhanced = (props: RowProps<T>) => (
+    <>
+      {isExpanded && (
+        <Td
+          expand={{
+            rowIndex: props.resourceIndex,
+            isExpanded: isExpanded(props.resourceData),
+            onToggle: () => toggleExpandFor([props.resourceData]),
+          }}
+        />
+      )}
+      <CellMapper {...props} />
+    </>
+  );
+  Enhanced.displayName = `${CellMapper.displayName || 'CellMapper'}WithExpansion`;
+  return Enhanced;
+}
+
+export interface IdBasedExpansionProps<T> {
+  /**
+   * @returns string that can be used as an unique identifier
+   */
+  toId?: (item: T) => string;
+
+  /**
+   * onExpand is called when expand changes
+   */
+  onExpand?: (expandedIds: string[]) => void;
+
+  /**
+   * Expanded ids
+   */
+  expandedIds?: string[];
+}
+
+/**
+ * Adds ID based expansion to StandardPage component.
+ * Contract:
+ * 1. IDs provided with toId() function are unique and constant in time
+ */
+export function withIdBasedExpansion<T>({
+  toId,
+  onExpand,
+  expandedIds: initialExpandedIds,
+}: IdBasedExpansionProps<T>) {
+  const Enhanced = (props: StandardPageProps<T>) => {
+    const [expandedIds, setExpandedIds] = useState(initialExpandedIds);
+
+    const isExpanded =
+      onExpand || expandedIds ? (item: T) => expandedIds.includes(toId(item)) : undefined;
+
+    const toggleExpandFor = (items: T[]) => {
+      const ids = items.map(toId);
+      const allExpanded = ids.every((id) => expandedIds?.includes(id));
+      const newExpandedIds = [
+        ...(expandedIds || []).filter((it) => !ids.includes(it)),
+        ...(allExpanded ? [] : ids),
+      ];
+
+      setExpandedIds(newExpandedIds);
+      if (onExpand) {
+        onExpand(newExpandedIds);
+      }
+    };
+
+    const { CellMapper, ExpandedComponent, ...rest } = props;
+
+    const RowMapper = withTr(
+      withRowExpansion({
+        CellMapper: CellMapper,
+        isExpanded,
+        toggleExpandFor,
+      }),
+      ExpandedComponent,
+    );
+
+    return (
+      <StandardPage
+        {...rest}
+        expandedIds={expandedIds}
+        toId={toId}
+        RowMapper={RowMapper}
+        HeaderMapper={() => <Th />}
+        GlobalActionToolbarItems={props.GlobalActionToolbarItems}
+      />
+    );
+  };
+  Enhanced.displayName = 'StandardPageWithExpansion';
+  return Enhanced;
+}
+
+/**
+ * Properties for the `StandardPageWithExpansion` component.
+ * These properties extend the base `StandardPageProps` and add additional ones related to expansion.
+ *
+ * @typedef {Object} StandardPageWithExpansionProps
+ * @property {Function} toId - A function that returns a unique identifier for each item.
+ * @property {Function} onExpand - A callback function that is triggered when row is expanded or un expanded.
+ * @property {string[]} expandedIds - An array of identifiers for the currently expanded items.
+ * @property {...StandardPageProps<T>} - Other props that are passed through to the `StandardPage` component.
+ *
+ * @template T - The type of the items being displayed in the table.
+ */
+export interface StandardPageWithExpansionProps<T> extends StandardPageProps<T> {
+  toId?: (item: T) => string;
+  onExpand?: (expandedIds: string[]) => void;
+  expandedIds?: string[];
+}
+
+/**
+ * Renders a standard page with expansion capabilities.
+ * This component wraps the `StandardPage` component and adds support for row expansion.
+ * It uses the provided `toId`, `onExpand`, and `expandedIds` props to manage the expansion state.
+ *
+ * @param {Object} props - The properties passed to the component.
+ * @param {Function} props.toId - A function that returns a unique identifier for each item.
+ * @param {...StandardPageProps<T>} props - Other props that are passed through to the `StandardPage` component.
+ *
+ * @template T - The type of the items being displayed in the table.
+ *
+ * @example
+ * <StandardPageWithExpansion
+ *   toId={item => item.id}
+ *   // ...other props
+ * />
+ */
+export function StandardPageWithExpansion<T>(props: StandardPageWithExpansionProps<T>) {
+  const { toId, onExpand, expandedIds, ...rest } = props;
+
+  if (onExpand && (!toId || !expandedIds)) {
+    throw new Error('Missing required properties: toId, expandedIds');
+  }
+
+  const EnhancedStandardPage = withIdBasedExpansion<T>({
+    toId,
+    onExpand,
+    expandedIds,
+  });
+
+  return <EnhancedStandardPage {...rest} />;
+}
diff --git a/packages/forklift-console-plugin/src/modules/Plans/actions/PlanActionsDropdownItems.tsx b/packages/forklift-console-plugin/src/modules/Plans/actions/PlanActionsDropdownItems.tsx
index 3d22954f5..541d95c15 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/actions/PlanActionsDropdownItems.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/actions/PlanActionsDropdownItems.tsx
@@ -21,6 +21,7 @@ import {
   isPlanArchived,
   isPlanExecuting,
   PlanData,
+  PlanPhase,
 } from '../utils';
 
 export const PlanActionsDropdownItems = ({ data }: PlanActionsDropdownItemsProps) => {
@@ -93,7 +94,9 @@ export const PlanActionsDropdownItems = ({ data }: PlanActionsDropdownItemsProps
 
     <DropdownItem
       key="archive"
-      isDisabled={!data?.permissions?.canDelete || ['Archived', 'Archiving'].includes(phase)}
+      isDisabled={
+        !data?.permissions?.canDelete || [PlanPhase.Archived, PlanPhase.Archiving].includes(phase)
+      }
       onClick={onClickArchive}
     >
       {t('Archive Plan')}
diff --git a/packages/forklift-console-plugin/src/modules/Plans/hooks/usePlanMigration.ts b/packages/forklift-console-plugin/src/modules/Plans/hooks/usePlanMigration.ts
index ac185e98e..1a5f90f4c 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/hooks/usePlanMigration.ts
+++ b/packages/forklift-console-plugin/src/modules/Plans/hooks/usePlanMigration.ts
@@ -1,7 +1,7 @@
 import { MigrationModelGroupVersionKind, V1beta1Migration, V1beta1Plan } from '@kubev2v/types';
-import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
+import { useK8sWatchResource, WatchK8sResult } from '@openshift-console/dynamic-plugin-sdk';
 
-export const usePlanMigration = (plan: V1beta1Plan) => {
+export const usePlanMigration = (plan: V1beta1Plan): WatchK8sResult<V1beta1Migration> => {
   const [migrations, migrationLoaded, migrationLoadError] = useK8sWatchResource<V1beta1Migration[]>(
     {
       groupVersionKind: MigrationModelGroupVersionKind,
diff --git a/packages/forklift-console-plugin/src/modules/Plans/modals/ArchiveModal.tsx b/packages/forklift-console-plugin/src/modules/Plans/modals/ArchiveModal.tsx
index e99fbf42c..805573071 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/modals/ArchiveModal.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/modals/ArchiveModal.tsx
@@ -8,7 +8,7 @@ import { PlanModel, V1beta1Plan } from '@kubev2v/types';
 import { K8sModel, k8sPatch } from '@openshift-console/dynamic-plugin-sdk';
 import { Alert, Button, Modal, ModalVariant } from '@patternfly/react-core';
 
-import { getPlanPhase } from '../utils';
+import { getPlanPhase, PlanPhase } from '../utils';
 
 /**
  * Props for the DeleteModal component
@@ -70,7 +70,7 @@ export const ArchiveModal: React.FC<ArchiveModalProps> = ({ title, resource, red
   const actions = [
     <Button
       key="confirm"
-      variant={phase === 'Running' ? 'danger' : 'primary'}
+      variant={phase === PlanPhase.Running ? 'danger' : 'primary'}
       onClick={onArchive}
       isLoading={isLoading}
     >
@@ -112,7 +112,7 @@ export const ArchiveModal: React.FC<ArchiveModalProps> = ({ title, resource, red
           </p>
         </ForkliftTrans>
       }
-      {phase === 'Running' && <IsExecutingAlert />}
+      {phase === PlanPhase.Running && <IsExecutingAlert />}
       {alertMessage}
     </Modal>
   );
diff --git a/packages/forklift-console-plugin/src/modules/Plans/modals/PlanDeleteModal.tsx b/packages/forklift-console-plugin/src/modules/Plans/modals/PlanDeleteModal.tsx
index d87c48284..6336879a5 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/modals/PlanDeleteModal.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/modals/PlanDeleteModal.tsx
@@ -9,7 +9,7 @@ import { V1beta1Plan } from '@kubev2v/types';
 import { k8sDelete, K8sGroupVersionKind, K8sModel } from '@openshift-console/dynamic-plugin-sdk';
 import { Alert, Button, Modal, ModalVariant } from '@patternfly/react-core';
 
-import { getPlanPhase } from '../utils';
+import { getPlanPhase, PlanPhase } from '../utils';
 
 /**
  * Props for the DeleteModal component
@@ -131,8 +131,8 @@ export const PlanDeleteModal: React.FC<PlanDeleteModalProps> = ({
           Are you sure you want to delete <strong className="co-break-word">{name}</strong>?
         </ForkliftTrans>
       )}
-      {phase === 'Running' && <IsExecutingAlert />}
-      {phase !== 'Archived' && <IsNotArchivedAlert />}
+      {phase === PlanPhase.Running && <IsExecutingAlert />}
+      {phase !== PlanPhase.Archived && <IsNotArchivedAlert />}
       {typeof owner === 'object' && <ItemIsOwnedAlert owner={owner} namespace={namespace} />}
       {alertMessage}
     </Modal>
diff --git a/packages/forklift-console-plugin/src/modules/Plans/utils/constants/planPhases.ts b/packages/forklift-console-plugin/src/modules/Plans/utils/constants/planPhases.ts
index cb6a2b058..0ca05c486 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/utils/constants/planPhases.ts
+++ b/packages/forklift-console-plugin/src/modules/Plans/utils/constants/planPhases.ts
@@ -9,16 +9,16 @@ import { PlanPhase } from '../types';
  * This array is intended to be used for creating filter dropdowns, where users can select a plan phase to filter the results shown.
  */
 export const planPhases: { id: PlanPhase; label: string }[] = [
-  { id: 'Error', label: 'Error' },
-  { id: 'vmError', label: 'VM Error' },
-  { id: 'Unknown', label: 'Unknown' },
-  { id: 'Archiving', label: 'Archiving' },
-  { id: 'Archived', label: 'Archived' },
-  { id: 'Failed', label: 'Failed' },
-  { id: 'Canceled', label: 'Canceled' },
-  { id: 'Succeeded', label: 'Succeeded' },
-  { id: 'Running', label: 'Running' },
-  { id: 'Ready', label: 'Ready' },
-  { id: 'Warning', label: 'Warning' },
-  { id: 'NotReady', label: 'Not Ready' },
+  { id: PlanPhase.Error, label: PlanPhase.Error },
+  { id: PlanPhase.vmError, label: PlanPhase.vmError },
+  { id: PlanPhase.Unknown, label: PlanPhase.Unknown },
+  { id: PlanPhase.Archiving, label: PlanPhase.Archiving },
+  { id: PlanPhase.Archived, label: PlanPhase.Archived },
+  { id: PlanPhase.Failed, label: PlanPhase.Failed },
+  { id: PlanPhase.Canceled, label: PlanPhase.Canceled },
+  { id: PlanPhase.Succeeded, label: PlanPhase.Succeeded },
+  { id: PlanPhase.Running, label: PlanPhase.Running },
+  { id: PlanPhase.Ready, label: PlanPhase.Ready },
+  { id: PlanPhase.Warning, label: PlanPhase.Warning },
+  { id: PlanPhase.NotReady, label: PlanPhase.NotReady },
 ];
diff --git a/packages/forklift-console-plugin/src/modules/Plans/utils/helpers/getPhaseLabel.ts b/packages/forklift-console-plugin/src/modules/Plans/utils/helpers/getPhaseLabel.ts
deleted file mode 100644
index 1c5daa414..000000000
--- a/packages/forklift-console-plugin/src/modules/Plans/utils/helpers/getPhaseLabel.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { PlanPhase } from '../types';
-
-export const getPhaseLabel = (phase: PlanPhase) => phaseLabels?.[phase] ?? 'Unknown';
-
-const phaseLabels: Record<PlanPhase, string> = {
-  // t('Ready')
-  Ready: 'Ready',
-  // t('Not Ready')
-  NotReady: 'Not Ready',
-  // t('Running')
-  Running: 'Running',
-  // t('Succeeded')
-  Succeeded: 'Succeeded',
-  // t('Canceled')
-  Canceled: 'Canceled',
-  // t('Failed')
-  Failed: 'Failed',
-  // t('Archived')
-  Archived: 'Archived',
-  // t('Archiving')
-  Archiving: 'Archiving',
-  // t('Error')
-  Error: 'Error',
-  // t('Warning')
-  Warning: 'Warning',
-  // t('Some VMs Failed')
-  vmError: 'Some VMs Failed',
-  // t('Unknown')
-  Unknown: 'Unknown',
-};
diff --git a/packages/forklift-console-plugin/src/modules/Plans/utils/helpers/getPlanPhase.ts b/packages/forklift-console-plugin/src/modules/Plans/utils/helpers/getPlanPhase.ts
index c5712f3c8..ce480752c 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/utils/helpers/getPlanPhase.ts
+++ b/packages/forklift-console-plugin/src/modules/Plans/utils/helpers/getPlanPhase.ts
@@ -5,37 +5,37 @@ import { PlanData, PlanPhase } from '../types';
 export const getPlanPhase = (data: PlanData): PlanPhase => {
   const plan = data?.obj;
 
-  if (!plan) return 'Unknown';
+  if (!plan) return PlanPhase.Unknown;
 
   // Check condition type
   const conditions = getConditions(plan);
 
   if (!conditions || conditions?.length < 1) {
-    return 'Unknown';
+    return PlanPhase.Unknown;
   }
 
   // Check for Archived
   if (plan?.spec?.archived && !conditions.includes('Archived')) {
-    return 'Archiving';
+    return PlanPhase.Archiving;
   }
 
   if (conditions.includes('Archived')) {
-    return 'Archived';
+    return PlanPhase.Archived;
   }
 
   // Check for Succeeded
   if (conditions.includes('Succeeded')) {
-    return 'Succeeded';
+    return PlanPhase.Succeeded;
   }
 
   // Check for Canceled
   if (conditions.includes('Canceled')) {
-    return 'Canceled';
+    return PlanPhase.Canceled;
   }
 
   // CHeck for Running
   if (conditions.includes('Executing')) {
-    return 'Running';
+    return PlanPhase.Running;
   }
 
   // Check condition category
@@ -44,18 +44,18 @@ export const getPlanPhase = (data: PlanData): PlanPhase => {
   );
 
   if (isCritical) {
-    return 'Error';
+    return PlanPhase.Error;
   }
 
   // Check for vm errors
   const vmError = plan?.status?.migration?.vms?.find((vm) => vm?.error);
 
   if (conditions.includes('Failed')) {
-    return 'Failed';
+    return PlanPhase.Failed;
   }
 
   if (vmError) {
-    return 'vmError';
+    return PlanPhase.vmError;
   }
 
   // Check condition category
@@ -64,14 +64,14 @@ export const getPlanPhase = (data: PlanData): PlanPhase => {
   );
 
   if (isWarn) {
-    return 'Warning';
+    return PlanPhase.Warning;
   }
 
   if (conditions.includes('Ready')) {
-    return 'Ready';
+    return PlanPhase.Ready;
   }
 
-  return 'NotReady';
+  return PlanPhase.NotReady;
 };
 
 export const canPlanStart = (plan: V1beta1Plan) => {
@@ -107,20 +107,20 @@ export const isPlanEditable = (plan: V1beta1Plan) => {
   const planStatus = getPlanPhase({ obj: plan });
 
   return (
-    planStatus === 'Unknown' ||
-    planStatus === 'Canceled' ||
-    planStatus === 'Error' ||
-    planStatus === 'Failed' ||
-    planStatus === 'vmError' ||
-    planStatus === 'Warning' ||
-    planStatus === 'Ready'
+    planStatus === PlanPhase.Unknown ||
+    planStatus === PlanPhase.Canceled ||
+    planStatus === PlanPhase.Error ||
+    planStatus === PlanPhase.Failed ||
+    planStatus === PlanPhase.vmError ||
+    planStatus === PlanPhase.Warning ||
+    planStatus === PlanPhase.Ready
   );
 };
 
 export const isPlanArchived = (plan: V1beta1Plan) => {
   const planStatus = getPlanPhase({ obj: plan });
 
-  return planStatus === 'Archiving' || planStatus === 'Archived';
+  return planStatus === PlanPhase.Archiving || planStatus === PlanPhase.Archived;
 };
 
 const getConditions = (obj: V1beta1Plan) =>
diff --git a/packages/forklift-console-plugin/src/modules/Plans/utils/helpers/getPlanProgressVariant.ts b/packages/forklift-console-plugin/src/modules/Plans/utils/helpers/getPlanProgressVariant.ts
index 249fa34ad..c8ff964dd 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/utils/helpers/getPlanProgressVariant.ts
+++ b/packages/forklift-console-plugin/src/modules/Plans/utils/helpers/getPlanProgressVariant.ts
@@ -6,17 +6,17 @@ export const getPlanProgressVariant = (phase: PlanPhase): ProgressVariant => {
   let progressVariant;
 
   switch (phase) {
-    case 'Error':
-    case 'Failed':
+    case PlanPhase.Error:
+    case PlanPhase.Failed:
       progressVariant = ProgressVariant.danger;
       break;
-    case 'Unknown':
-    case 'Archived':
-    case 'Canceled':
-    case 'vmError':
+    case PlanPhase.Unknown:
+    case PlanPhase.Archived:
+    case PlanPhase.Canceled:
+    case PlanPhase.vmError:
       progressVariant = ProgressVariant.warning;
       break;
-    case 'Succeeded':
+    case PlanPhase.Succeeded:
       progressVariant = ProgressVariant.success;
       break;
   }
diff --git a/packages/forklift-console-plugin/src/modules/Plans/utils/helpers/index.ts b/packages/forklift-console-plugin/src/modules/Plans/utils/helpers/index.ts
index d2865d95b..f499b37f3 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/utils/helpers/index.ts
+++ b/packages/forklift-console-plugin/src/modules/Plans/utils/helpers/index.ts
@@ -1,7 +1,6 @@
 // @index(['./*', /style/g], f => `export * from '${f.path}';`)
 export * from './getMigrationPhase';
 export * from './getMigrationVmsCounts';
-export * from './getPhaseLabel';
 export * from './getPlanPhase';
 export * from './getPlanProgressVariant';
 // @endindex
diff --git a/packages/forklift-console-plugin/src/modules/Plans/utils/types/PlanEditAction.ts b/packages/forklift-console-plugin/src/modules/Plans/utils/types/PlanEditAction.ts
new file mode 100644
index 000000000..b9f1933d6
--- /dev/null
+++ b/packages/forklift-console-plugin/src/modules/Plans/utils/types/PlanEditAction.ts
@@ -0,0 +1 @@
+export type PlanEditAction = 'PLAN' | 'VMS';
diff --git a/packages/forklift-console-plugin/src/modules/Plans/utils/types/PlanPhase.ts b/packages/forklift-console-plugin/src/modules/Plans/utils/types/PlanPhase.ts
index 249f56b65..67d31e063 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/utils/types/PlanPhase.ts
+++ b/packages/forklift-console-plugin/src/modules/Plans/utils/types/PlanPhase.ts
@@ -1,13 +1,26 @@
-export type PlanPhase =
-  | 'Error'
-  | 'vmError'
-  | 'Unknown'
-  | 'Archiving'
-  | 'Archived'
-  | 'Failed'
-  | 'Canceled'
-  | 'Succeeded'
-  | 'Running'
-  | 'Ready'
-  | 'Warning'
-  | 'NotReady';
+export enum PlanPhase {
+  // t('Error')
+  Error = 'Error',
+  // t('Some VMs Failed')
+  vmError = 'Some VMs Failed',
+  // t('Unknown')
+  Unknown = 'Unknown',
+  // t('Archiving')
+  Archiving = 'Archiving',
+  // t('Archived')
+  Archived = 'Archived',
+  // t('Failed')
+  Failed = 'Failed',
+  // t('Canceled')
+  Canceled = 'Canceled',
+  // t('Succeeded')
+  Succeeded = 'Succeeded',
+  // t('Running')
+  Running = 'Running',
+  // t('Ready')
+  Ready = 'Ready',
+  // t('Warning')
+  Warning = 'Warning',
+  // t('Not Ready')
+  NotReady = 'Not Ready',
+}
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/create/PlanCreatePage.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/create/PlanCreatePage.tsx
index b7b4127c7..67554ed5c 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/create/PlanCreatePage.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/create/PlanCreatePage.tsx
@@ -5,11 +5,10 @@ import ProvidersCreateVmMigrationPage from 'src/modules/Providers/views/migrate/
 import { startCreate } from 'src/modules/Providers/views/migrate/reducer/actions';
 import { useFetchEffects } from 'src/modules/Providers/views/migrate/useFetchEffects';
 import { useSaveEffect } from 'src/modules/Providers/views/migrate/useSaveEffect';
-import { ForkliftTrans } from 'src/utils/i18n';
 
 import { ProviderModelGroupVersionKind, V1beta1Provider } from '@kubev2v/types';
-import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
-import { Alert, PageSection, Title } from '@patternfly/react-core';
+import { useActiveNamespace, useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
+import { PageSection, Title } from '@patternfly/react-core';
 import { Wizard } from '@patternfly/react-core/deprecated';
 
 import { findProviderByID } from './components';
@@ -22,8 +21,13 @@ export const PlanCreatePage: React.FC<{ namespace: string }> = ({ namespace }) =
   // Get optional initial state context
   const { data } = useCreateVmMigrationData();
   const history = useHistory();
-  const defaultNamespace = process?.env?.DEFAULT_NAMESPACE || 'default';
   const startAtStep = data?.provider !== undefined ? 2 : 1;
+  const [activeNamespace, setActiveNamespace] = useActiveNamespace();
+  const defaultNamespace = process?.env?.DEFAULT_NAMESPACE || 'default';
+  const projectName =
+    data?.projectName ||
+    (activeNamespace === '#ALL_NS#' ? 'openshift-mtv' : activeNamespace) ||
+    defaultNamespace;
 
   // Init Select source provider form state
   const [filterState, filterDispatch] = useReducer(planCreatePageReducer, {
@@ -38,6 +42,7 @@ export const PlanCreatePage: React.FC<{ namespace: string }> = ({ namespace }) =
     isList: true,
     namespace,
   });
+
   const selectedProvider =
     filterState.selectedProviderUID !== ''
       ? findProviderByID(filterState.selectedProviderUID, providers)
@@ -45,7 +50,12 @@ export const PlanCreatePage: React.FC<{ namespace: string }> = ({ namespace }) =
 
   // Init Create migration plan form state
   const [state, dispatch, emptyContext] = useFetchEffects({
-    data: { selectedVms: filterState.selectedVMs, provider: selectedProvider || data?.provider },
+    data: {
+      projectName,
+      selectedVms: filterState.selectedVMs,
+      provider: selectedProvider || data?.provider,
+      planName: data?.planName,
+    },
   });
   useSaveEffect(state, dispatch);
 
@@ -55,9 +65,11 @@ export const PlanCreatePage: React.FC<{ namespace: string }> = ({ namespace }) =
       name: 'Select source provider',
       component: (
         <SelectSourceProvider
-          namespace={namespace}
+          projectName={projectName}
           filterState={filterState}
           filterDispatch={filterDispatch}
+          dispatch={dispatch}
+          state={state}
           providers={providers}
           selectedProvider={selectedProvider}
         />
@@ -89,21 +101,6 @@ export const PlanCreatePage: React.FC<{ namespace: string }> = ({ namespace }) =
   return (
     <>
       <PageSection variant="light">
-        {!namespace && (
-          <Alert
-            className="co-alert forklift--create-plan--alert"
-            isInline
-            variant="warning"
-            title={'Namespace is not defined'}
-          >
-            <ForkliftTrans>
-              This plan will be created in <strong>{defaultNamespace}</strong> namespace, if you
-              wish to choose another namespace please cancel, and choose a namespace from the top
-              bar.
-            </ForkliftTrans>
-          </Alert>
-        )}
-
         <Title headingLevel="h2">{'Create migration plan'}</Title>
       </PageSection>
 
@@ -113,7 +110,10 @@ export const PlanCreatePage: React.FC<{ namespace: string }> = ({ namespace }) =
           navAriaLabel={`${title} steps`}
           mainAriaLabel={`${title} content`}
           steps={steps}
-          onSave={() => dispatch(startCreate())}
+          onSave={() => {
+            setActiveNamespace(state.underConstruction.projectName);
+            dispatch(startCreate());
+          }}
           onClose={() => history.goBack()}
           startAtStep={startAtStep}
         />
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/create/components/PlanCreateForm.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/create/components/PlanCreateForm.tsx
index 36e39ff51..4916ba616 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/create/components/PlanCreateForm.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/create/components/PlanCreateForm.tsx
@@ -2,7 +2,14 @@ import React from 'react';
 import { SelectableCard } from 'src/modules/Providers/utils/components/Gallery/SelectableCard';
 import { SelectableGallery } from 'src/modules/Providers/utils/components/Gallery/SelectableGallery';
 import { VmData } from 'src/modules/Providers/views';
-import { useForkliftTranslation } from 'src/utils';
+import { useCreateVmMigrationData } from 'src/modules/Providers/views/migrate';
+import {
+  PageAction,
+  setPlanName,
+  setProjectName as setProjectNameAction,
+} from 'src/modules/Providers/views/migrate/reducer/actions';
+import { CreateVmMigrationPageState } from 'src/modules/Providers/views/migrate/types';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils';
 
 import { FormGroupWithHelpText } from '@kubev2v/common';
 import { V1beta1Provider } from '@kubev2v/types';
@@ -13,14 +20,19 @@ import { PlanCreatePageState } from '../states';
 import { ChipsToolbarProviders } from './ChipsToolbarProviders';
 import { createProviderCardItems } from './createProviderCardItems';
 import { FiltersToolbarProviders } from './FiltersToolbarProviders';
+import { PlanNameTextField } from './PlanNameTextField';
+import { ProjectNameSelect } from './ProjectNameSelect';
 
 export type PlanCreateFormProps = {
   providers: V1beta1Provider[];
   filterState: PlanCreatePageState;
+  state: CreateVmMigrationPageState;
+  projectName: string;
   filterDispatch: React.Dispatch<{
     type: string;
     payload?: string | string[] | VmData[];
   }>;
+  dispatch: (action: PageAction<unknown, unknown>) => void;
 };
 
 /**
@@ -30,11 +42,17 @@ export type PlanCreateFormProps = {
 export const PlanCreateForm: React.FC<PlanCreateFormProps> = ({
   providers,
   filterState,
+  state,
+  projectName,
   filterDispatch,
+  dispatch,
 }) => {
   const { t } = useForkliftTranslation();
-
+  const { data, setData } = useCreateVmMigrationData();
   const providerCardItems = createProviderCardItems(providers);
+  const providerNamespaces = [
+    ...new Set(providers.map((provider) => provider.metadata?.namespace)),
+  ];
 
   const onChange = (id: string) => {
     filterDispatch({ type: 'SELECT_PROVIDER', payload: id || '' });
@@ -43,6 +61,36 @@ export const PlanCreateForm: React.FC<PlanCreateFormProps> = ({
   return (
     <div className="forklift-create-provider-edit-section">
       <Form isWidthLimited className="forklift-section-secret-edit">
+        <PlanNameTextField
+          isRequired
+          value={state.underConstruction.plan.metadata.name}
+          validated={state.validation.planName}
+          isDisabled={state.flow.editingDone}
+          onChange={(_, value) => {
+            dispatch(setPlanName(value?.trim() ?? ''));
+            setData({ ...data, planName: value });
+          }}
+        />
+
+        <ProjectNameSelect
+          value={projectName}
+          options={providerNamespaces.map((namespace) => ({
+            value: namespace,
+            content: namespace,
+          }))}
+          onSelect={(value) => {
+            dispatch(setProjectNameAction(value));
+            setData({ ...data, projectName: value });
+          }}
+          isDisabled={!providers.length}
+          popoverHelpContent={
+            <ForkliftTrans>
+              The project that your migration plan will be created in. Only projects with providers
+              in them can be selected.
+            </ForkliftTrans>
+          }
+        />
+
         <FormGroupWithHelpText fieldId="type">
           <FiltersToolbarProviders
             className="forklift--create-plan--filters-toolbar"
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/create/components/PlanNameTextField.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/create/components/PlanNameTextField.tsx
new file mode 100644
index 000000000..79ef68ffd
--- /dev/null
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/create/components/PlanNameTextField.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import { Validation } from 'src/modules/Providers';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils';
+
+import { FormGroupWithHelpText } from '@kubev2v/common';
+import { TextInput } from '@patternfly/react-core';
+
+interface PlanNameTextFieldProps {
+  value: string;
+  validated: Validation;
+  onChange: (event: React.FormEvent<HTMLInputElement>, value: string) => void;
+  isRequired?: boolean;
+  isDisabled?: boolean;
+}
+
+export const PlanNameTextField: React.FC<PlanNameTextFieldProps> = ({
+  value,
+  validated,
+  isDisabled,
+  isRequired,
+  onChange,
+}) => {
+  const { t } = useForkliftTranslation();
+  const [isUpdated, setIsUpdated] = React.useState(false);
+
+  return (
+    <FormGroupWithHelpText
+      label={t('Plan name')}
+      isRequired={isRequired}
+      fieldId="planName"
+      {...(isUpdated && {
+        validated: validated,
+        helperTextInvalid: (
+          <ForkliftTrans>
+            Name is required and must be a unique within a namespace and valid Kubernetes name.
+          </ForkliftTrans>
+        ),
+      })}
+    >
+      <TextInput
+        spellCheck="false"
+        isRequired={isRequired}
+        type="text"
+        id="planName"
+        value={value}
+        validated={isUpdated ? validated : 'default'}
+        isDisabled={isDisabled}
+        onChange={(event, value) => {
+          onChange(event, value);
+          setIsUpdated(true);
+        }}
+      />
+    </FormGroupWithHelpText>
+  );
+};
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/create/components/ProjectNameSelect.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/create/components/ProjectNameSelect.tsx
new file mode 100644
index 000000000..abd50ab4b
--- /dev/null
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/create/components/ProjectNameSelect.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import { useForkliftTranslation } from 'src/utils';
+
+import { FormGroupWithHelpText, TypeaheadSelect, TypeaheadSelectOption } from '@kubev2v/common';
+import { Popover } from '@patternfly/react-core';
+import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon';
+
+interface ProjectNameSelectProps {
+  value: string | undefined;
+  options: TypeaheadSelectOption[];
+  onSelect: (value: string) => void;
+  isDisabled?: boolean;
+  popoverHelpContent?: React.ReactNode;
+}
+
+export const ProjectNameSelect: React.FC<ProjectNameSelectProps> = ({
+  value,
+  options,
+  isDisabled,
+  popoverHelpContent,
+  onSelect,
+}) => {
+  const { t } = useForkliftTranslation();
+
+  return (
+    <FormGroupWithHelpText
+      label={t('Project')}
+      isRequired
+      fieldId="project"
+      labelIcon={
+        <Popover position="right" alertSeverityVariant="info" bodyContent={popoverHelpContent}>
+          <button type="button" className="pf-c-form__group-label-help">
+            <HelpIcon />
+          </button>
+        </Popover>
+      }
+    >
+      <TypeaheadSelect
+        id="project-name-select"
+        selectOptions={options}
+        selected={value}
+        onSelect={(_, value) => onSelect(String(value))}
+        onClearSelection={() => onSelect('')}
+        isDisabled={isDisabled}
+      />
+    </FormGroupWithHelpText>
+  );
+};
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/create/steps/SelectSourceProvider/SelectSourceProvider.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/create/steps/SelectSourceProvider/SelectSourceProvider.tsx
index 10df4be05..f506c2030 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/create/steps/SelectSourceProvider/SelectSourceProvider.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/create/steps/SelectSourceProvider/SelectSourceProvider.tsx
@@ -1,4 +1,6 @@
 import React from 'react';
+import { CreateVmMigration, PageAction } from 'src/modules/Providers/views/migrate/reducer/actions';
+import { CreateVmMigrationPageState } from 'src/modules/Providers/views/migrate/types';
 import { useForkliftTranslation } from 'src/utils/i18n';
 
 import { V1beta1Provider } from '@kubev2v/types';
@@ -10,12 +12,24 @@ import { PlanCreateForm } from './../../components';
 import { MemoizedProviderVirtualMachinesList } from './MemoizedProviderVirtualMachinesList';
 
 export const SelectSourceProvider: React.FC<{
-  namespace: string;
+  projectName: string;
   filterState: PlanCreatePageState;
-  filterDispatch: React.Dispatch<PlanCreatePageActionTypes>;
   providers: V1beta1Provider[];
   selectedProvider: V1beta1Provider;
-}> = ({ filterState, filterDispatch, providers, selectedProvider }) => {
+  state: CreateVmMigrationPageState;
+  dispatch: React.Dispatch<PageAction<CreateVmMigration, unknown>>;
+  filterDispatch: React.Dispatch<PlanCreatePageActionTypes>;
+  hideProviderSection?: boolean;
+}> = ({
+  filterState,
+  providers,
+  selectedProvider,
+  state,
+  projectName,
+  dispatch,
+  filterDispatch,
+  hideProviderSection,
+}) => {
   const { t } = useForkliftTranslation();
 
   // Get the ready providers (note: currently forklift does not allow filter be status.phase)
@@ -33,13 +47,20 @@ export const SelectSourceProvider: React.FC<{
 
   return (
     <>
-      <Title headingLevel="h2">{t('Select source provider')}</Title>
+      {!hideProviderSection && (
+        <>
+          <Title headingLevel="h2">{t('Select source provider')}</Title>
 
-      <PlanCreateForm
-        providers={filteredProviders}
-        filterState={filterState}
-        filterDispatch={filterDispatch}
-      />
+          <PlanCreateForm
+            providers={filteredProviders}
+            filterState={filterState}
+            filterDispatch={filterDispatch}
+            dispatch={dispatch}
+            state={state}
+            projectName={projectName}
+          />
+        </>
+      )}
 
       {filterState.selectedProviderUID && (
         <>
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/details/components/DetailsSection/components/StatusDetailsItem.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/details/components/DetailsSection/components/StatusDetailsItem.tsx
index 273c47345..75cb5952c 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/details/components/DetailsSection/components/StatusDetailsItem.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/details/components/DetailsSection/components/StatusDetailsItem.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { StatusCell } from 'src/modules/Plans/views/list';
+import { PlanStatusCell } from 'src/modules/Plans/views/list';
 import { DetailsItem } from 'src/modules/Providers/utils';
 import { useForkliftTranslation } from 'src/utils/i18n';
 
@@ -12,7 +12,7 @@ export const StatusDetailsItem: React.FC<PlanDetailsItemProps> = ({ resource })
     <DetailsItem
       title={t('Status')}
       helpContent={t('Migration plan state information and progress')}
-      content={<StatusCell data={{ obj: resource }} fieldId={''} fields={[]} />}
+      content={<PlanStatusCell data={{ obj: resource }} fieldId={''} fields={[]} />}
     />
   );
 };
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/details/components/MigrationsSection/components/MigrationsTable.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/details/components/MigrationsSection/components/MigrationsTable.tsx
index 39042db1d..d05377bb6 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/details/components/MigrationsSection/components/MigrationsTable.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/details/components/MigrationsSection/components/MigrationsTable.tsx
@@ -1,10 +1,6 @@
 import React from 'react';
 import { ConsoleTimestamp } from 'src/components/ConsoleTimestamp';
-import {
-  getMigrationVmsCounts,
-  getPhaseLabel,
-  getPlanProgressVariant,
-} from 'src/modules/Plans/utils';
+import { getMigrationVmsCounts, getPlanProgressVariant, PlanPhase } from 'src/modules/Plans/utils';
 import { getMigrationPhase } from 'src/modules/Plans/utils/helpers/getMigrationPhase';
 import { useForkliftTranslation } from 'src/utils/i18n';
 
@@ -90,8 +86,9 @@ const VMsLabel: React.FC<{ migration: V1beta1Migration }> = ({ migration }) => {
   const { t } = useForkliftTranslation();
 
   const phase = getMigrationPhase(migration);
-  const phaseLabel = t(getPhaseLabel(phase));
-  const progressVariant = getPlanProgressVariant(phase);
+  const phaseLabel = PlanPhase[phase] ? t(PlanPhase[phase]) : PlanPhase.Unknown;
+
+  const progressVariant = getPlanProgressVariant(PlanPhase[phase]);
   const counters = getMigrationVmsCounts(migration?.status?.vms);
 
   if (!counters?.total || counters.total === 0) {
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/details/components/PlanPageHeadings.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/details/components/PlanPageHeadings.tsx
index b69cdda74..2e528937b 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/details/components/PlanPageHeadings.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/details/components/PlanPageHeadings.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { PlanActionsDropdown } from 'src/modules/Plans/actions';
 import { PlanStartMigrationModal } from 'src/modules/Plans/modals';
-import { canPlanReStart, canPlanStart, getPlanPhase } from 'src/modules/Plans/utils';
+import { canPlanReStart, canPlanStart, getPlanPhase, PlanPhase } from 'src/modules/Plans/utils';
 import { useGetDeleteAndEditAccessReview } from 'src/modules/Providers/hooks';
 import { useModal } from 'src/modules/Providers/modals';
 import { PageHeadings } from 'src/modules/Providers/utils';
@@ -81,7 +81,7 @@ export const PlanPageHeadings: React.FC<{ name: string; namespace: string }> = (
 
   const handleAlerts = () => {
     // alerts are not relevant to display if plan was completed successfully
-    if (planStatus === 'Succeeded') return;
+    if (planStatus === PlanPhase.Succeeded) return;
 
     if (criticalCondition) {
       alerts.push(
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/Mappings/PlanMappings.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/Mappings/PlanMappings.tsx
index ba5b626ee..d134f6aa0 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/Mappings/PlanMappings.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/Mappings/PlanMappings.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect, useReducer } from 'react';
 import { SectionHeading } from 'src/components/headers/SectionHeading';
 import { useOpenShiftNetworks, useSourceNetworks } from 'src/modules/Providers/hooks/useNetworks';
 import { useOpenShiftStorages, useSourceStorages } from 'src/modules/Providers/hooks/useStorages';
@@ -17,12 +17,23 @@ import {
 import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 import { Alert, PageSection } from '@patternfly/react-core';
 
-import { PlanMappingsSection } from './PlanMappingsSection';
+import {
+  PlanMappingsSection,
+  planMappingsSectionReducer,
+  PlanMappingsSectionState,
+} from './PlanMappingsSection';
 
 export type PlanMappingsInitSectionProps = {
   plan: V1beta1Plan;
-  loaded: boolean;
-  loadError: unknown;
+  loaded?: boolean;
+  loadError?: unknown;
+  planMappingsState: PlanMappingsSectionState;
+  planMappingsDispatch: React.Dispatch<{
+    type: string;
+    payload?;
+  }>;
+  planNetworkMaps: V1beta1NetworkMap;
+  planStorageMaps: V1beta1StorageMap;
 };
 
 export const PlanMappings: React.FC<{ name: string; namespace: string }> = ({
@@ -30,7 +41,6 @@ export const PlanMappings: React.FC<{ name: string; namespace: string }> = ({
   namespace,
 }) => {
   const { t } = useForkliftTranslation();
-
   const [plan, loaded, loadError] = useK8sWatchResource<V1beta1Plan>({
     groupVersionKind: PlanModelGroupVersionKind,
     namespaced: true,
@@ -38,30 +48,6 @@ export const PlanMappings: React.FC<{ name: string; namespace: string }> = ({
     namespace,
   });
 
-  return (
-    <>
-      <div>
-        <PageSection variant="light">
-          <SectionHeading text={t('Mappings')} />
-          <PlanMappingsInitSection plan={plan} loaded={loaded} loadError={loadError} />
-        </PageSection>
-      </div>
-    </>
-  );
-};
-
-const PlanMappingsInitSection: React.FC<PlanMappingsInitSectionProps> = (props) => {
-  const { t } = useForkliftTranslation();
-  const { plan } = props;
-
-  // Retrieve all k8s Providers
-  const [providers, providersLoaded, providersLoadError] = useK8sWatchResource<V1beta1Provider[]>({
-    groupVersionKind: ProviderModelGroupVersionKind,
-    namespaced: true,
-    isList: true,
-    namespace: plan?.metadata?.namespace,
-  });
-
   // Retrieve all k8s Network Mappings
   const [networkMaps, networkMapsLoaded, networkMapsError] = useK8sWatchResource<
     V1beta1NetworkMap[]
@@ -88,6 +74,93 @@ const PlanMappingsInitSection: React.FC<PlanMappingsInitSectionProps> = (props)
   const planStorageMaps = storageMaps
     ? storageMaps.find((storage) => storage?.metadata?.name === plan.spec.map?.storage?.name)
     : null;
+
+  const initialState: PlanMappingsSectionState = {
+    edit: false,
+    dataChanged: false,
+    alertMessage: null,
+    updatedNetwork: planNetworkMaps?.spec?.map || [],
+    updatedStorage: planStorageMaps?.spec?.map || [],
+    planNetworkMaps: planNetworkMaps,
+    planStorageMaps: planStorageMaps,
+  };
+
+  const [state, dispatch] = useReducer(planMappingsSectionReducer, initialState);
+
+  useEffect(() => {
+    if (planNetworkMaps && planStorageMaps) {
+      dispatch({
+        type: 'SET_PLAN_MAPS',
+        payload: { planNetworkMaps, planStorageMaps },
+      });
+    }
+  }, [planNetworkMaps, planStorageMaps]);
+
+  const checkResources = () => {
+    if (!networkMapsLoaded || !storageMapsLoaded) {
+      return (
+        <div>
+          <span className="text-muted">{t('Data is loading, please wait.')}</span>
+        </div>
+      );
+    }
+
+    if (networkMapsError || storageMapsError) {
+      return (
+        <div>
+          <span className="text-muted">
+            {t(
+              'Something is wrong, the data was not loaded due to an error, please try to reload the page.',
+            )}
+          </span>
+        </div>
+      );
+    }
+
+    if (networkMaps.length == 0 || storageMaps.length == 0)
+      return (
+        <div>
+          <span className="text-muted">{t('No Mapping found.')}</span>
+        </div>
+      );
+
+    return null;
+  };
+
+  return (
+    <>
+      <div>
+        <PageSection variant="light">
+          <SectionHeading text={t('Mappings')} />
+          {checkResources() ?? (
+            <PlanMappingsInitSection
+              plan={plan}
+              loaded={loaded}
+              loadError={loadError}
+              planMappingsState={state}
+              planMappingsDispatch={dispatch}
+              planNetworkMaps={planNetworkMaps}
+              planStorageMaps={planStorageMaps}
+            />
+          )}
+        </PageSection>
+      </div>
+    </>
+  );
+};
+
+export const PlanMappingsInitSection: React.FC<PlanMappingsInitSectionProps> = (props) => {
+  const { t } = useForkliftTranslation();
+  const { plan, planMappingsState, planMappingsDispatch, planNetworkMaps, planStorageMaps } = props;
+
+  // Retrieve all k8s Providers
+  const [providers, providersLoaded, providersLoadError] = useK8sWatchResource<V1beta1Provider[]>({
+    groupVersionKind: ProviderModelGroupVersionKind,
+    namespaced: true,
+    isList: true,
+    namespace: plan?.metadata?.namespace,
+  });
+
   const sourceProvider: V1beta1Provider = providers
     ? providers.find((p) => p?.metadata?.name === plan?.spec?.provider?.source?.name)
     : null;
@@ -106,8 +179,6 @@ const PlanMappingsInitSection: React.FC<PlanMappingsInitSectionProps> = (props)
     useOpenShiftStorages(targetProvider);
 
   if (
-    !networkMapsLoaded ||
-    !storageMapsLoaded ||
     !providersLoaded ||
     sourceNetworksLoading ||
     targetNetworksLoading ||
@@ -122,8 +193,6 @@ const PlanMappingsInitSection: React.FC<PlanMappingsInitSectionProps> = (props)
   }
 
   if (
-    networkMapsError ||
-    storageMapsError ||
     providersLoadError ||
     sourceNetworksError ||
     targetNetworksError ||
@@ -141,13 +210,6 @@ const PlanMappingsInitSection: React.FC<PlanMappingsInitSectionProps> = (props)
     );
   }
 
-  if (networkMaps.length == 0 || storageMaps.length == 0)
-    return (
-      <div>
-        <span className="text-muted">{t('No Mapping found.')}</span>
-      </div>
-    );
-
   // Warn when missing inventory data, missing inventory will make
   // some editing options missing.
   const alerts = [];
@@ -176,6 +238,8 @@ const PlanMappingsInitSection: React.FC<PlanMappingsInitSectionProps> = (props)
         targetNetworks={targetNetworks}
         sourceStorages={sourceStorages}
         targetStorages={targetStorages}
+        planMappingsState={planMappingsState}
+        planMappingsDispatch={planMappingsDispatch}
       />
     </>
   );
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/Mappings/PlanMappingsSection.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/Mappings/PlanMappingsSection.tsx
index 5bf78ae11..5904b3991 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/Mappings/PlanMappingsSection.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/Mappings/PlanMappingsSection.tsx
@@ -1,5 +1,6 @@
-import React, { ReactNode, useReducer, useState } from 'react';
+import React, { ReactNode, useState } from 'react';
 import { isPlanEditable } from 'src/modules/Plans/utils';
+import { PlanEditAction } from 'src/modules/Plans/utils/types/PlanEditAction';
 import { InventoryNetwork } from 'src/modules/Providers/hooks/useNetworks';
 import { InventoryStorage } from 'src/modules/Providers/hooks/useStorages';
 import { useForkliftTranslation } from 'src/utils/i18n';
@@ -56,12 +57,15 @@ import {
  * @property {V1beta1NetworkMapSpecMap[]} updatedNetwork - The new version of the Plan Network Maps being edited.
  * @property {V1beta1StorageMapSpecMap[]} updatedStorage - The new version of the Plan Storage Maps being edited.
  */
-interface PlanMappingsSectionState {
+export interface PlanMappingsSectionState {
   edit: boolean;
   dataChanged: boolean;
   alertMessage: ReactNode;
   updatedNetwork: V1beta1NetworkMapSpecMap[];
   updatedStorage: V1beta1StorageMapSpecMap[];
+  planNetworkMaps: V1beta1NetworkMap;
+  planStorageMaps: V1beta1StorageMap;
+  editAction?: PlanEditAction;
 }
 
 export type PlanMappingsSectionProps = {
@@ -72,8 +76,86 @@ export type PlanMappingsSectionProps = {
   targetNetworks: OpenShiftNetworkAttachmentDefinition[];
   sourceStorages: InventoryStorage[];
   targetStorages: OpenShiftStorageClass[];
+  planMappingsState?: PlanMappingsSectionState;
+  planMappingsDispatch?: React.Dispatch<{
+    type: string;
+    payload?;
+  }>;
 };
 
+export function planMappingsSectionReducer(
+  state: PlanMappingsSectionState,
+  action: { type: string; payload? },
+): PlanMappingsSectionState {
+  switch (action.type) {
+    case 'SET_PLAN_MAPS': {
+      const { planNetworkMaps, planStorageMaps } = action.payload;
+      return {
+        ...state,
+        planNetworkMaps,
+        planStorageMaps,
+        updatedNetwork: planNetworkMaps?.spec?.map,
+        updatedStorage: planStorageMaps?.spec?.map,
+      };
+    }
+    case 'TOGGLE_EDIT': {
+      return { ...state, edit: !state.edit };
+    }
+    case 'SET_CANCEL': {
+      const dataChanged = false;
+
+      return {
+        ...state,
+        dataChanged,
+        alertMessage: null,
+        updatedNetwork: state.planNetworkMaps.spec.map,
+        updatedStorage: state.planStorageMaps.spec.map,
+      };
+    }
+    case 'SET_ALERT_MESSAGE': {
+      return { ...state, alertMessage: action.payload };
+    }
+    case 'ADD_NETWORK_MAPPING':
+    case 'DELETE_NETWORK_MAPPING':
+    case 'REPLACE_NETWORK_MAPPING': {
+      const updatedNetwork = action.payload.newState;
+      const dataChanged = hasPlanMappingsChanged(
+        state.planNetworkMaps.spec.map,
+        state.planStorageMaps.spec.map,
+        updatedNetwork,
+        state?.updatedStorage,
+      );
+
+      return {
+        ...state,
+        dataChanged,
+        alertMessage: null,
+        updatedNetwork,
+      };
+    }
+    case 'ADD_STORAGE_MAPPING':
+    case 'DELETE_STORAGE_MAPPING':
+    case 'REPLACE_STORAGE_MAPPING': {
+      const updatedStorage = action.payload.newState;
+      const dataChanged = hasPlanMappingsChanged(
+        state.planNetworkMaps.spec.map,
+        state.planStorageMaps.spec.map,
+        state?.updatedNetwork,
+        updatedStorage,
+      );
+
+      return {
+        ...state,
+        dataChanged,
+        alertMessage: null,
+        updatedStorage,
+      };
+    }
+    default:
+      return state;
+  }
+}
+
 export const PlanMappingsSection: React.FC<PlanMappingsSectionProps> = ({
   plan,
   planNetworkMaps,
@@ -82,84 +164,14 @@ export const PlanMappingsSection: React.FC<PlanMappingsSectionProps> = ({
   targetNetworks,
   sourceStorages,
   targetStorages,
+  planMappingsState: state,
+  planMappingsDispatch: dispatch,
 }) => {
   const { t } = useForkliftTranslation();
 
-  const initialState: PlanMappingsSectionState = {
-    edit: false,
-    dataChanged: false,
-    alertMessage: null,
-    updatedNetwork: planNetworkMaps?.spec?.map,
-    updatedStorage: planStorageMaps?.spec?.map,
-  };
-
   const [isLoading, setIsLoading] = useState(false);
   const [isAddNetworkMapAvailable, setIsAddNetworkMapAvailable] = useState(true);
   const [isAddStorageMapAvailable, setIsAddStorageMapAvailable] = useState(true);
-  const [state, dispatch] = useReducer(reducer, initialState);
-
-  function reducer(
-    state: PlanMappingsSectionState,
-    action: { type: string; payload? },
-  ): PlanMappingsSectionState {
-    switch (action.type) {
-      case 'TOGGLE_EDIT': {
-        return { ...state, edit: !state.edit };
-      }
-      case 'SET_CANCEL': {
-        const dataChanged = false;
-
-        return {
-          ...state,
-          dataChanged,
-          alertMessage: null,
-          updatedNetwork: planNetworkMaps?.spec?.map,
-          updatedStorage: planStorageMaps?.spec?.map,
-        };
-      }
-      case 'SET_ALERT_MESSAGE': {
-        return { ...state, alertMessage: action.payload };
-      }
-      case 'ADD_NETWORK_MAPPING':
-      case 'DELETE_NETWORK_MAPPING':
-      case 'REPLACE_NETWORK_MAPPING': {
-        const updatedNetwork = action.payload.newState;
-        const dataChanged = hasPlanMappingsChanged(
-          planNetworkMaps?.spec?.map,
-          planStorageMaps?.spec?.map,
-          updatedNetwork,
-          state?.updatedStorage,
-        );
-
-        return {
-          ...state,
-          dataChanged,
-          alertMessage: null,
-          updatedNetwork,
-        };
-      }
-      case 'ADD_STORAGE_MAPPING':
-      case 'DELETE_STORAGE_MAPPING':
-      case 'REPLACE_STORAGE_MAPPING': {
-        const updatedStorage = action.payload.newState;
-        const dataChanged = hasPlanMappingsChanged(
-          planNetworkMaps?.spec?.map,
-          planStorageMaps?.spec?.map,
-          state?.updatedNetwork,
-          updatedStorage,
-        );
-
-        return {
-          ...state,
-          dataChanged,
-          alertMessage: null,
-          updatedStorage,
-        };
-      }
-      default:
-        return state;
-    }
-  }
 
   // Toggles between view and edit modes
   function onToggleEdit() {
@@ -648,31 +660,35 @@ export const PlanMappingsSection: React.FC<PlanMappingsSectionProps> = ({
   return state.edit ? (
     // Edit mode
     <>
-      <Flex>
-        <FlexItem>
-          <Button
-            variant="primary"
-            onClick={onUpdate}
-            isDisabled={!state.dataChanged}
-            isLoading={isLoading}
-          >
-            {t('Update mappings')}
-          </Button>
-        </FlexItem>
-        <FlexItem>
-          <Button variant="secondary" onClick={onCancel}>
-            {t('Cancel')}
-          </Button>
-        </FlexItem>
-      </Flex>
-      <HelperText className="forklift-section-plan-helper-text">
-        <HelperTextItem variant="indeterminate">
-          {t(
-            'Click the update mappings button to save your changes, button is disabled until a change is detected.',
-          )}
-        </HelperTextItem>
-      </HelperText>
-      <Divider />
+      {!state.editAction && (
+        <>
+          <Flex>
+            <FlexItem>
+              <Button
+                variant="primary"
+                onClick={onUpdate}
+                isDisabled={!state.dataChanged}
+                isLoading={isLoading}
+              >
+                {t('Update mappings')}
+              </Button>
+            </FlexItem>
+            <FlexItem>
+              <Button variant="secondary" onClick={onCancel}>
+                {t('Cancel')}
+              </Button>
+            </FlexItem>
+          </Flex>
+          <HelperText className="forklift-section-plan-helper-text">
+            <HelperTextItem variant="indeterminate">
+              {t(
+                'Click the update mappings button to save your changes, button is disabled until a change is detected.',
+              )}
+            </HelperTextItem>
+          </HelperText>
+          <Divider />
+        </>
+      )}
       {state.alertMessage ? (
         <>
           <Alert
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/Migration/MigrationVirtualMachinesList.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/Migration/MigrationVirtualMachinesList.tsx
index abfc0ed6a..df79f50ff 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/Migration/MigrationVirtualMachinesList.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/Migration/MigrationVirtualMachinesList.tsx
@@ -1,4 +1,5 @@
 import React, { FC, useState } from 'react';
+import { StandardPageWithExpansion } from 'src/components/page/StandardPageWithExpansion';
 import {
   GlobalActionWithSelection,
   StandardPageWithSelection,
@@ -6,6 +7,7 @@ import {
 } from 'src/components/page/StandardPageWithSelection';
 import { usePlanMigration } from 'src/modules/Plans/hooks/usePlanMigration';
 import { isPlanArchived, isPlanExecuting } from 'src/modules/Plans/utils';
+import { hasSomeCompleteRunningVMs } from 'src/modules/Plans/views/details/utils';
 import { useForkliftTranslation } from 'src/utils/i18n';
 
 import { loadUserSettings, ResourceFieldFactory } from '@kubev2v/common';
@@ -20,7 +22,7 @@ import {
 import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 import { HelperText, HelperTextItem } from '@patternfly/react-core';
 
-import { MigrationVMsCancelButton, PlanVMsDeleteButton } from '../components';
+import { MigrationVMsCancelButton, PlanVMsDeleteButton, PlanVMsEditButton } from '../components';
 import { PlanData, VMData } from '../types';
 
 import { MigrationVirtualMachinesRow } from './MigrationVirtualMachinesRow';
@@ -146,6 +148,7 @@ const fieldsMetadataFactory: ResourceFieldFactory = (t) => [
 ];
 
 const PageWithSelection = StandardPageWithSelection<VMData>;
+const PageWithExpansion = StandardPageWithExpansion<VMData>;
 type PageWithSelectionProps = StandardPageWithSelectionProps<VMData>;
 type PageGlobalActions = FC<GlobalActionWithSelection<VMData>>[];
 
@@ -245,6 +248,7 @@ export const MigrationVirtualMachinesList: FC<{ obj: PlanData }> = ({ obj }) =>
 
   const isExecuting = isPlanExecuting(plan);
   const isArchived = isPlanArchived(plan);
+  const someVMsMigrated = hasSomeCompleteRunningVMs(plan);
 
   // If plan executing and not archived (happens when archiving a running plan), allow to cancel vms, o/w remove from plan
   let actions: PageGlobalActions;
@@ -255,9 +259,9 @@ export const MigrationVirtualMachinesList: FC<{ obj: PlanData }> = ({ obj }) =>
       ),
     ];
   } else {
-    actions = [
-      ({ selectedIds }) => <PlanVMsDeleteButton selectedIds={selectedIds || []} plan={plan} />,
-    ];
+    actions = someVMsMigrated
+      ? [({ selectedIds }) => <PlanVMsDeleteButton selectedIds={selectedIds || []} plan={plan} />]
+      : [() => <PlanVMsEditButton plan={plan} />];
   }
 
   const canSelectWhenExecuting = (item: VMData) =>
@@ -288,5 +292,9 @@ export const MigrationVirtualMachinesList: FC<{ obj: PlanData }> = ({ obj }) =>
     GlobalActionToolbarItems: actions,
   };
 
-  return <PageWithSelection {...extendedProps} />;
+  return isExecuting || someVMsMigrated ? (
+    <PageWithSelection {...extendedProps} />
+  ) : (
+    <PageWithExpansion {...extendedProps} />
+  );
 };
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/Plan/PlanVirtualMachinesList.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/Plan/PlanVirtualMachinesList.tsx
index 4be029bea..4cd25e85f 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/Plan/PlanVirtualMachinesList.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/Plan/PlanVirtualMachinesList.tsx
@@ -1,18 +1,16 @@
 import React, { FC } from 'react';
-import {
-  GlobalActionWithSelection,
-  StandardPageWithSelection,
-} from 'src/components/page/StandardPageWithSelection';
+import { StandardPage } from 'src/components/page/StandardPage';
 import { useForkliftTranslation } from 'src/utils/i18n';
 
 import { loadUserSettings, ResourceFieldFactory } from '@kubev2v/common';
+import { GlobalActionToolbarProps } from '@kubev2v/common';
 import {
   V1beta1PlanSpecVms,
   V1beta1PlanStatusConditions,
   V1beta1PlanStatusMigrationVms,
 } from '@kubev2v/types';
 
-import { PlanVMsDeleteButton } from '../components';
+import { PlanVMsEditButton } from '../components';
 import { PlanData, VMData } from '../types';
 
 import { PlanVirtualMachinesRow } from './PlanVirtualMachinesRow';
@@ -41,8 +39,8 @@ const fieldsMetadataFactory: ResourceFieldFactory = (t) => [
   },
 ];
 
-const PageWithSelection = StandardPageWithSelection<VMData>;
-type PageGlobalActions = FC<GlobalActionWithSelection<VMData>>[];
+const PageWithNoSelection = StandardPage<VMData>;
+type PageGlobalActions = FC<GlobalActionToolbarProps<VMData>>[];
 
 export const PlanVirtualMachinesList: FC<{ obj: PlanData }> = ({ obj }) => {
   const { t } = useForkliftTranslation();
@@ -79,17 +77,11 @@ export const PlanVirtualMachinesList: FC<{ obj: PlanData }> = ({ obj }) => {
   }));
   const vmDataSource: [VMData[], boolean, unknown] = [vmData || [], true, undefined];
   const vmDataToId = (item: VMData) => item?.specVM?.id;
-  const canSelect = (item: VMData) =>
-    item?.statusVM?.started === undefined || item?.statusVM?.error !== undefined;
-  const onSelect = () => undefined;
-  const initialSelectedIds = [];
 
-  const actions: PageGlobalActions = [
-    ({ selectedIds }) => <PlanVMsDeleteButton selectedIds={selectedIds || []} plan={plan} />,
-  ];
+  const actions: PageGlobalActions = [() => <PlanVMsEditButton plan={plan} />];
 
   return (
-    <PageWithSelection
+    <PageWithNoSelection
       title={t('Virtual Machines')}
       dataSource={vmDataSource}
       CellMapper={PlanVirtualMachinesRow}
@@ -98,9 +90,6 @@ export const PlanVirtualMachinesList: FC<{ obj: PlanData }> = ({ obj }) => {
       namespace={''}
       page={1}
       toId={vmDataToId}
-      canSelect={canSelect}
-      onSelect={onSelect}
-      selectedIds={initialSelectedIds}
       GlobalActionToolbarItems={actions}
     />
   );
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/components/PlanVMsEditButton.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/components/PlanVMsEditButton.tsx
new file mode 100644
index 000000000..0abee08b6
--- /dev/null
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/components/PlanVMsEditButton.tsx
@@ -0,0 +1,44 @@
+import React, { FC } from 'react';
+import { isPlanEditable } from 'src/modules/Plans/utils';
+import { hasSomeCompleteRunningVMs } from 'src/modules/Plans/views/details/utils';
+import { useModal } from 'src/modules/Providers/modals';
+import { useForkliftTranslation } from 'src/utils/i18n';
+
+import { V1beta1Plan } from '@kubev2v/types';
+import { Button, Tooltip } from '@patternfly/react-core';
+
+import { PlanVMsEditModal } from '../modals';
+
+export const PlanVMsEditButton: FC<{
+  plan: V1beta1Plan;
+}> = ({ plan }) => {
+  const { t } = useForkliftTranslation();
+  const { showModal } = useModal();
+  const planEditable = isPlanEditable(plan);
+  const someVMsMigrated = hasSomeCompleteRunningVMs(plan);
+  const disableEdit = someVMsMigrated || !planEditable;
+
+  const onClick = () => {
+    showModal(<PlanVMsEditModal plan={plan} editAction="VMS" />);
+  };
+
+  return disableEdit ? (
+    <Tooltip
+      content={
+        !planEditable
+          ? t('The edit virtual machines button is disabled while the plan is not editable.')
+          : t(
+              'The edit virtual machines button is disabled if the plan started running and at least one virtual machine was migrated successfully.',
+            )
+      }
+    >
+      <Button variant="secondary" onClick={onClick} isAriaDisabled>
+        {t('Edit virtual machines')}
+      </Button>
+    </Tooltip>
+  ) : (
+    <Button variant="secondary" onClick={onClick}>
+      {t('Edit virtual machines')}
+    </Button>
+  );
+};
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/components/index.ts b/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/components/index.ts
index db0547464..88a035dbf 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/components/index.ts
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/components/index.ts
@@ -4,4 +4,5 @@ export * from './MigrationVMsCancelButton';
 export * from './NameCellRenderer';
 export * from './PlanVMsCellProps';
 export * from './PlanVMsDeleteButton';
+export * from './PlanVMsEditButton';
 // @endindex
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/modals/PlanVMsEditModal.style.css b/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/modals/PlanVMsEditModal.style.css
new file mode 100644
index 000000000..e88ce2baf
--- /dev/null
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/modals/PlanVMsEditModal.style.css
@@ -0,0 +1,3 @@
+.forklift-edit-modal {
+  overflow: auto;
+}
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/modals/PlanVMsEditModal.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/modals/PlanVMsEditModal.tsx
new file mode 100644
index 000000000..048913925
--- /dev/null
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/modals/PlanVMsEditModal.tsx
@@ -0,0 +1,146 @@
+import React from 'react';
+import { PlanEditAction } from 'src/modules/Plans/utils/types/PlanEditAction';
+import { PlanEditPage } from 'src/modules/Plans/views/edit/PlanEditPage';
+import { useModal } from 'src/modules/Providers/modals';
+import { useInventoryVms } from 'src/modules/Providers/views';
+import { useForkliftTranslation } from 'src/utils/i18n';
+
+import {
+  NetworkMapModelGroupVersionKind,
+  ProviderModelGroupVersionKind,
+  StorageMapModelGroupVersionKind,
+  V1beta1NetworkMap,
+  V1beta1Plan,
+  V1beta1Provider,
+  V1beta1StorageMap,
+} from '@kubev2v/types';
+import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
+import { Modal, ModalVariant } from '@patternfly/react-core';
+
+import './PlanVMsDeleteModal.style.css';
+import './PlanVMsEditModal.style.css';
+
+export interface PlanVMsEditModalProps {
+  plan: V1beta1Plan;
+  editAction: PlanEditAction;
+}
+
+export const PlanVMsEditModal: React.FC<PlanVMsEditModalProps> = ({ plan, editAction }) => {
+  const { toggleModal } = useModal();
+  const { t } = useForkliftTranslation();
+  const projectName = plan?.metadata?.namespace;
+
+  // Retrieve k8s source provider
+  const [sourceProvider, sourceProviderLoaded, sourceProviderLoadError] =
+    useK8sWatchResource<V1beta1Provider>({
+      groupVersionKind: ProviderModelGroupVersionKind,
+      namespaced: true,
+      name: plan?.spec?.provider?.source?.name,
+      namespace: plan?.spec?.provider?.source?.namespace,
+    });
+
+  // Retrieve k8s target provider
+  const [targetProvider, targetProviderLoaded, targetProviderLoadError] =
+    useK8sWatchResource<V1beta1Provider>({
+      groupVersionKind: ProviderModelGroupVersionKind,
+      namespaced: true,
+      name: plan?.spec?.provider?.destination?.name,
+      namespace: plan?.spec?.provider?.destination?.namespace,
+    });
+
+  const [providers, providersLoaded, providersLoadError] = useK8sWatchResource<V1beta1Provider[]>({
+    groupVersionKind: ProviderModelGroupVersionKind,
+    namespaced: true,
+    isList: true,
+    namespace: plan?.metadata?.namespace,
+  });
+
+  // Retrieve all k8s Network Mappings
+  const [networkMaps, networkMapsLoaded, networkMapsError] = useK8sWatchResource<
+    V1beta1NetworkMap[]
+  >({
+    groupVersionKind: NetworkMapModelGroupVersionKind,
+    namespaced: true,
+    isList: true,
+    namespace: plan?.metadata?.namespace,
+  });
+
+  // Retrieve all k8s Storage Mappings
+  const [storageMaps, storageMapsLoaded, storageMapsError] = useK8sWatchResource<
+    V1beta1StorageMap[]
+  >({
+    groupVersionKind: StorageMapModelGroupVersionKind,
+    namespaced: true,
+    isList: true,
+    namespace: plan?.metadata?.namespace,
+  });
+
+  const [vmData] = useInventoryVms(
+    { provider: sourceProvider },
+    sourceProviderLoaded,
+    sourceProviderLoadError,
+  );
+  const initialSelectedIds = plan.spec.vms.map((specVm) => specVm.id);
+  const selectedVMs = vmData.filter((vm) => initialSelectedIds.includes(vm.vm.id));
+
+  const planNetworkMaps = networkMaps
+    ? networkMaps.find((net) => net?.metadata?.name === plan?.spec?.map?.network?.name)
+    : null;
+  const planStorageMaps = storageMaps
+    ? storageMaps.find((storage) => storage?.metadata?.name === plan.spec.map?.storage?.name)
+    : null;
+
+  const finishedLoading =
+    providersLoaded &&
+    sourceProviderLoaded &&
+    targetProviderLoaded &&
+    networkMapsLoaded &&
+    storageMapsLoaded &&
+    vmData.length > 0;
+  const hasErrors =
+    providersLoadError ||
+    sourceProviderLoadError ||
+    targetProviderLoadError ||
+    networkMapsError ||
+    storageMapsError;
+
+  return (
+    <Modal
+      position="top"
+      showClose={false}
+      variant={ModalVariant.large}
+      isOpen={true}
+      hasNoBodyWrapper
+      className="forklift-edit-modal"
+      disableFocusTrap
+    >
+      {hasErrors && (
+        <div>
+          <span className="text-muted">
+            {t(
+              'Something is wrong, the data was not loaded due to an error, please try to reload the page.',
+            )}
+          </span>
+        </div>
+      )}
+      {!hasErrors && finishedLoading ? (
+        <PlanEditPage
+          plan={plan}
+          projectName={projectName}
+          providers={providers}
+          sourceProvider={sourceProvider}
+          targetProvider={targetProvider}
+          editAction={editAction}
+          onClose={toggleModal}
+          selectedVMs={selectedVMs}
+          planNetworkMaps={planNetworkMaps}
+          planStorageMaps={planStorageMaps}
+        />
+      ) : (
+        <div>
+          <span className="text-muted">{t('Data is loading, please wait.')}</span>
+        </div>
+      )}
+    </Modal>
+  );
+};
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/modals/index.ts b/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/modals/index.ts
index d40f0e3ef..3af1d27c3 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/modals/index.ts
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/details/tabs/VirtualMachines/modals/index.ts
@@ -2,4 +2,5 @@
 export * from './MigrationVMsCancelModal';
 export * from './PipelineTasksModal';
 export * from './PlanVMsDeleteModal';
+export * from './PlanVMsEditModal';
 // @endindex
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/details/utils/patchPlanMappingsData.ts b/packages/forklift-console-plugin/src/modules/Plans/views/details/utils/patchPlanMappingsData.ts
index 7a254bfda..9c02fd2a1 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/details/utils/patchPlanMappingsData.ts
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/details/utils/patchPlanMappingsData.ts
@@ -23,7 +23,7 @@ export async function patchPlanMappingsData(
   updatedNetwork: V1beta1NetworkMapSpecMap[],
   updatedStorage: V1beta1StorageMapSpecMap[],
 ) {
-  await k8sPatch({
+  const updatedNetworkMap = await k8sPatch({
     model: NetworkMapModel,
     resource: planNetworkMaps,
     data: [
@@ -35,7 +35,7 @@ export async function patchPlanMappingsData(
     ],
   });
 
-  await k8sPatch({
+  const updatedStorageMap = await k8sPatch({
     model: StorageMapModel,
     resource: planStorageMaps,
     data: [
@@ -46,6 +46,11 @@ export async function patchPlanMappingsData(
       },
     ],
   });
+
+  return {
+    updatedNetworkMap,
+    updatedStorageMap,
+  };
 }
 
 /**
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/edit/PlanEditPage.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/edit/PlanEditPage.tsx
new file mode 100644
index 000000000..910491d5c
--- /dev/null
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/edit/PlanEditPage.tsx
@@ -0,0 +1,170 @@
+import React, { useEffect, useReducer } from 'react';
+import { useHistory } from 'react-router';
+import { PlanEditAction } from 'src/modules/Plans/utils/types/PlanEditAction';
+import {
+  planMappingsSectionReducer,
+  PlanMappingsSectionState,
+} from 'src/modules/Plans/views/details/tabs/Mappings/PlanMappingsSection';
+import { VmData } from 'src/modules/Providers/views/details/tabs/VirtualMachines/components/VMCellProps';
+import ProvidersUpdateVmMigrationPage from 'src/modules/Providers/views/migrate/ProvidersUpdateVmMigrationPage';
+import { startUpdate } from 'src/modules/Providers/views/migrate/reducer/actions';
+import { useFetchEffects } from 'src/modules/Providers/views/migrate/useFetchEffects';
+import { useUpdateEffect } from 'src/modules/Providers/views/migrate/useUpdateEffect';
+import { useForkliftTranslation } from 'src/utils/i18n';
+
+import { V1beta1NetworkMap, V1beta1Plan, V1beta1Provider, V1beta1StorageMap } from '@kubev2v/types';
+import { PageSection, Title } from '@patternfly/react-core';
+import { Wizard } from '@patternfly/react-core/deprecated';
+
+import { findProviderByID } from '../create/components';
+import { planCreatePageInitialState, planCreatePageReducer } from '../create/states';
+import { SelectSourceProvider } from '../create/steps';
+
+import '../create/PlanCreatePage.style.css';
+
+export const PlanEditPage: React.FC<{
+  plan: V1beta1Plan;
+  providers: V1beta1Provider[];
+  sourceProvider: V1beta1Provider;
+  targetProvider: V1beta1Provider;
+  projectName: string;
+  onClose?: () => void;
+  selectedVMs?: VmData[];
+  editAction: PlanEditAction;
+  planNetworkMaps: V1beta1NetworkMap;
+  planStorageMaps: V1beta1StorageMap;
+}> = ({
+  plan,
+  providers,
+  sourceProvider,
+  targetProvider,
+  projectName,
+  onClose,
+  selectedVMs,
+  editAction,
+  planNetworkMaps,
+  planStorageMaps,
+}) => {
+  const { t } = useForkliftTranslation();
+  const history = useHistory();
+  const startAtStep = 1;
+
+  // Init Select source provider form state
+  const [filterState, filterDispatch] = useReducer(planCreatePageReducer, {
+    ...planCreatePageInitialState,
+    selectedProviderUID: sourceProvider.metadata.uid,
+    selectedVMs: selectedVMs,
+  });
+
+  const selectedProvider =
+    filterState.selectedProviderUID !== ''
+      ? findProviderByID(filterState.selectedProviderUID, providers)
+      : undefined;
+
+  const [state, dispatch, emptyContext] = useFetchEffects({
+    data: {
+      selectedVms: filterState.selectedVMs,
+      provider: selectedProvider,
+      targetProvider,
+      plan,
+      editAction,
+    },
+  });
+
+  const initialPlanMappingsState: PlanMappingsSectionState = {
+    edit: true,
+    dataChanged: false,
+    alertMessage: null,
+    updatedNetwork: planNetworkMaps?.spec?.map || [],
+    updatedStorage: planStorageMaps?.spec?.map || [],
+    planNetworkMaps: planNetworkMaps,
+    planStorageMaps: planStorageMaps,
+    editAction,
+  };
+
+  const [planMappingsState, planMappingsDispatch] = useReducer(
+    planMappingsSectionReducer,
+    initialPlanMappingsState,
+  );
+
+  useEffect(() => {
+    if (planNetworkMaps && planStorageMaps) {
+      planMappingsDispatch({
+        type: 'SET_PLAN_MAPS',
+        payload: { planNetworkMaps, planStorageMaps },
+      });
+    }
+  }, [planNetworkMaps, planStorageMaps]);
+
+  useUpdateEffect(state, dispatch, planMappingsState);
+
+  const steps = [
+    {
+      id: 'step-1',
+      name: editAction === 'VMS' ? t('Select virtual machines') : t('Select source provider'),
+      component: (
+        <SelectSourceProvider
+          projectName={projectName}
+          filterState={filterState}
+          filterDispatch={filterDispatch}
+          state={state}
+          dispatch={dispatch}
+          providers={providers}
+          selectedProvider={selectedProvider}
+          hideProviderSection={editAction === 'VMS'}
+        />
+      ),
+      enableNext: filterState?.selectedVMs?.length > 0,
+    },
+    {
+      id: 'step-2',
+      name: editAction === 'VMS' ? t('Update mappings') : t('Update migration plan'),
+      component: (
+        <ProvidersUpdateVmMigrationPage
+          state={state}
+          dispatch={dispatch}
+          emptyContext={emptyContext}
+          planMappingsState={planMappingsState}
+          planMappingsDispatch={planMappingsDispatch}
+          planNetworkMaps={planNetworkMaps}
+          planStorageMaps={planStorageMaps}
+        />
+      ),
+      enableNext:
+        !emptyContext &&
+        !(
+          !!state?.flow?.apiError ||
+          Object.values(state?.validation || []).some((validation) => validation === 'error')
+        ),
+      canJumpTo: filterState?.selectedVMs?.length > 0,
+      nextButtonText:
+        editAction === 'VMS' ? t('Update virtual machines') : t('Update migration plan'),
+    },
+  ];
+
+  const goBack = () => history.goBack();
+  const title = 'Plans wizard';
+  return (
+    <>
+      <PageSection variant="light">
+        <Title headingLevel="h2">
+          {editAction === 'VMS' ? 'Update virtual machines' : 'Update migration plan'}
+        </Title>
+      </PageSection>
+
+      <PageSection variant="light">
+        <Wizard
+          className="forklift--create-plan--wizard-appearance-order"
+          navAriaLabel={`${title} steps`}
+          mainAriaLabel={`${title} content`}
+          steps={steps}
+          onSave={() => dispatch(startUpdate())}
+          onClose={onClose || goBack}
+          startAtStep={startAtStep}
+        />
+      </PageSection>
+    </>
+  );
+};
+
+export default PlanEditPage;
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/list/PlanRow.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/list/PlanRow.tsx
index 127d712fb..afa782c19 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/list/PlanRow.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/list/PlanRow.tsx
@@ -12,8 +12,8 @@ import {
   CellProps,
   NamespaceCell,
   PlanCell,
+  PlanStatusCell,
   ProviderLinkCell,
-  StatusCell,
   VMsCell,
 } from './components';
 
@@ -47,7 +47,7 @@ const cellRenderers: Record<string, React.FC<CellProps>> = {
   },
   ['destination']: ProviderLinkCell,
   ['source']: ProviderLinkCell,
-  ['phase']: StatusCell,
+  ['phase']: PlanStatusCell,
   ['vms']: VMsCell,
   ['description']: ({ data }: CellProps) => <TableCell>{data?.obj?.spec?.description}</TableCell>,
   ['actions']: ActionsCell,
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/list/PlansListPage.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/list/PlansListPage.tsx
index 814b510ae..ff932b781 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/list/PlansListPage.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/list/PlansListPage.tsx
@@ -74,12 +74,12 @@ export const fieldsMetadataFactory: ResourceFieldFactory = (t) => [
   {
     resourceFieldId: 'phase',
     jsonPath: getPlanPhase,
-    label: t('Status'),
+    label: t('Migration status'),
     isVisible: true,
     filter: {
       type: 'enum',
       primary: true,
-      placeholderLabel: t('Status'),
+      placeholderLabel: t('Migration status'),
       values: planPhases,
     },
     sortable: true,
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/list/components/ActionsCell.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/list/components/ActionsCell.tsx
index 8a9fe3527..c9bcd791f 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/list/components/ActionsCell.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/list/components/ActionsCell.tsx
@@ -1,20 +1,12 @@
 import React from 'react';
 import { PlanActionsDropdown } from 'src/modules/Plans/actions';
-import { PlanCutoverMigrationModal, PlanStartMigrationModal } from 'src/modules/Plans/modals';
-import {
-  canPlanReStart,
-  canPlanStart,
-  isPlanArchived,
-  isPlanExecuting,
-} from 'src/modules/Plans/utils';
+import { PlanCutoverMigrationModal } from 'src/modules/Plans/modals';
+import { isPlanArchived, isPlanExecuting } from 'src/modules/Plans/utils';
 import { useModal } from 'src/modules/Providers/modals';
 import { useForkliftTranslation } from 'src/utils/i18n';
 
-import { PlanModel } from '@kubev2v/types';
 import { Button, Flex, FlexItem } from '@patternfly/react-core';
 import CutoverIcon from '@patternfly/react-icons/dist/esm/icons/migration-icon';
-import StartIcon from '@patternfly/react-icons/dist/esm/icons/play-icon';
-import ReStartIcon from '@patternfly/react-icons/dist/esm/icons/redo-icon';
 
 import { CellProps } from './CellProps';
 
@@ -23,46 +15,20 @@ export const ActionsCell = ({ data }: CellProps) => {
   const { showModal } = useModal();
 
   const plan = data.obj;
-
-  const canStart = canPlanStart(plan);
-  const canReStart = canPlanReStart(plan);
-
   const isWarmAndExecuting = plan?.spec?.warm && isPlanExecuting(plan);
   const isArchived = isPlanArchived(plan);
 
-  const buttonStartLabel = canReStart ? t('Restart') : t('Start');
-  const buttonStartIcon = canReStart ? <ReStartIcon /> : <StartIcon />;
-  const buttonCutoverIcon = <CutoverIcon />;
-
-  const onClickPlanStartMigration = () => {
-    showModal(
-      <PlanStartMigrationModal resource={data.obj} model={PlanModel} title={buttonStartLabel} />,
-    );
-  };
-
   const onClickPlanCutoverMigration = () => {
-    showModal(<PlanCutoverMigrationModal resource={data.obj} />);
+    showModal(<PlanCutoverMigrationModal resource={plan} />);
   };
 
   return (
     <Flex flex={{ default: 'flex_3' }} flexWrap={{ default: 'nowrap' }}>
       <FlexItem grow={{ default: 'grow' }}></FlexItem>
 
-      {canStart && (
-        <FlexItem align={{ default: 'alignRight' }}>
-          <Button variant="secondary" icon={buttonStartIcon} onClick={onClickPlanStartMigration}>
-            {buttonStartLabel}
-          </Button>
-        </FlexItem>
-      )}
-
       {isWarmAndExecuting && !isArchived && (
         <FlexItem align={{ default: 'alignRight' }}>
-          <Button
-            variant="secondary"
-            icon={buttonCutoverIcon}
-            onClick={onClickPlanCutoverMigration}
-          >
+          <Button variant="secondary" icon={<CutoverIcon />} onClick={onClickPlanCutoverMigration}>
             {t('Cutover')}
           </Button>
         </FlexItem>
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/list/components/ErrorStatusCell.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/list/components/ErrorStatusCell.tsx
index 910718e1b..f5ccc91c0 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/list/components/ErrorStatusCell.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/list/components/ErrorStatusCell.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import Linkify from 'react-linkify';
 import { Link } from 'react-router-dom';
-import { getPhaseLabel, getPlanPhase } from 'src/modules/Plans/utils';
+import { getPlanPhase } from 'src/modules/Plans/utils';
 import { getResourceUrl, TableIconCell } from 'src/modules/Providers/utils';
 import { useForkliftTranslation } from 'src/utils/i18n';
 
@@ -16,7 +16,7 @@ export const ErrorStatusCell: React.FC<CellProps> = ({ data }) => {
 
   const { obj: plan } = data;
   const phase = getPlanPhase(data);
-  const phaseLabel = getPhaseLabel(phase);
+  const phaseLabel: string = phase;
 
   const planURL = getResourceUrl({
     reference: PlanModelRef,
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/list/components/PlanStatusCell.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/list/components/PlanStatusCell.tsx
new file mode 100644
index 000000000..0aba151a9
--- /dev/null
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/list/components/PlanStatusCell.tsx
@@ -0,0 +1,132 @@
+import React from 'react';
+import { usePlanMigration } from 'src/modules/Plans/hooks';
+import { PlanStartMigrationModal } from 'src/modules/Plans/modals';
+import {
+  getMigrationVmsCounts,
+  getPlanPhase,
+  isPlanArchived,
+  isPlanExecuting,
+  PlanPhase,
+} from 'src/modules/Plans/utils';
+import { useModal } from 'src/modules/Providers/modals';
+import { getResourceUrl } from 'src/modules/Providers/utils';
+import { useForkliftTranslation } from 'src/utils/i18n';
+
+import { PlanModel, PlanModelRef } from '@kubev2v/types';
+import { Button, Flex, FlexItem, Label, Spinner, Split, SplitItem } from '@patternfly/react-core';
+import StartIcon from '@patternfly/react-icons/dist/esm/icons/play-icon';
+
+import { CellProps } from './CellProps';
+import { PlanStatusVmCount } from './PlanStatusVmCount';
+
+type VmPipelineTask = {
+  vmName: string;
+  task: string;
+  status: string;
+};
+
+export const PlanStatusCell: React.FC<CellProps> = ({ data }) => {
+  const { t } = useForkliftTranslation();
+  const { showModal } = useModal();
+  const plan = data?.obj;
+
+  const vms = plan?.spec?.vms;
+  const vmStatuses = plan?.status?.migration?.vms;
+  const [lastMigration] = usePlanMigration(plan);
+
+  const isWarmAndExecuting = plan.spec?.warm && isPlanExecuting(plan);
+  const isWaitingForCutover = isWarmAndExecuting && !isPlanArchived(plan);
+
+  const vmPipelineTasks = lastMigration?.status.vms?.reduce(
+    (acc: VmPipelineTask[], migrationVm) => {
+      migrationVm.pipeline.forEach((pipelineStep) => {
+        acc.push({ vmName: migrationVm.name, task: pipelineStep.name, status: pipelineStep.phase });
+      });
+
+      return acc;
+    },
+    [],
+  );
+
+  const phase = getPlanPhase(data);
+  const isPlanLoading =
+    !isWaitingForCutover && (phase === PlanPhase.Running || phase === PlanPhase.Archiving);
+  const planURL = getResourceUrl({
+    reference: PlanModelRef,
+    name: plan?.metadata?.name,
+    namespace: plan?.metadata?.namespace,
+  });
+
+  // All VM count links point to the same place for now,
+  // but will be updated to target only affected VMs in the future.
+  // Could possibly use a querystring to dictate a table filter for the list of VMs.
+  const vmCountLinkPath = `${planURL}/vms`;
+
+  if (phase === PlanPhase.Ready) {
+    return (
+      <Button
+        variant="secondary"
+        icon={<StartIcon />}
+        onClick={() =>
+          showModal(
+            <PlanStartMigrationModal resource={plan} model={PlanModel} title={t('Start')} />,
+          )
+        }
+      >
+        {t('Start')}
+      </Button>
+    );
+  }
+
+  const vmCount = getMigrationVmsCounts(vmStatuses);
+  const completedVmPipelineTasks = vmPipelineTasks?.filter(
+    (pipelineTask) => pipelineTask.status === 'Completed',
+  );
+  const progressValue = vmPipelineTasks?.length
+    ? (100 * completedVmPipelineTasks.length) / vmPipelineTasks.length
+    : 0;
+
+  return (
+    <Flex alignItems={{ default: 'alignItemsCenter' }} spaceItems={{ default: 'spaceItemsSm' }}>
+      {isPlanLoading ? (
+        <Spinner size="md" />
+      ) : phase === PlanPhase.NotReady ? (
+        t('Validating...')
+      ) : (
+        <Label isCompact>{phase}</Label>
+      )}
+
+      {progressValue !== 0 && isPlanLoading && (
+        <FlexItem className="pf-v5-u-font-size-sm">{Math.trunc(progressValue)}%</FlexItem>
+      )}
+
+      <Split hasGutter>
+        {vmCount?.success > 0 && (
+          <SplitItem>
+            <PlanStatusVmCount
+              count={vmCount.success}
+              status="success"
+              linkPath={vmCountLinkPath}
+            />
+          </SplitItem>
+        )}
+
+        {phase !== PlanPhase.Running &&
+          phase !== PlanPhase.NotReady &&
+          vms?.length &&
+          !vmCount?.error &&
+          !vmCount.success && (
+            <SplitItem>
+              <PlanStatusVmCount count={vms.length} status="warning" linkPath={vmCountLinkPath} />
+            </SplitItem>
+          )}
+
+        {vmCount?.error > 0 && (
+          <SplitItem>
+            <PlanStatusVmCount count={vmCount?.error} status="danger" linkPath={vmCountLinkPath} />
+          </SplitItem>
+        )}
+      </Split>
+    </Flex>
+  );
+};
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/list/components/PlanStatusVmCount.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/list/components/PlanStatusVmCount.tsx
new file mode 100644
index 000000000..0fcfe21ff
--- /dev/null
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/list/components/PlanStatusVmCount.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { useForkliftTranslation } from 'src/utils';
+
+import { Flex, FlexItem, Icon, IconComponentProps } from '@patternfly/react-core';
+import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
+import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
+import ExclamationTriangleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon';
+
+interface PlanStatusVmCountProps {
+  count: number;
+  status: IconComponentProps['status'];
+  linkPath: string;
+}
+
+export const PlanStatusVmCount: React.FC<PlanStatusVmCountProps> = ({
+  count,
+  status,
+  linkPath,
+}) => {
+  const { t } = useForkliftTranslation();
+
+  const statusIcon = React.useMemo(() => {
+    switch (status) {
+      case 'success':
+        return <CheckCircleIcon />;
+      case 'warning':
+        return <ExclamationTriangleIcon />;
+      case 'danger':
+        return <ExclamationCircleIcon />;
+    }
+  }, [status]);
+
+  return (
+    <Flex alignItems={{ default: 'alignItemsCenter' }} spaceItems={{ default: 'spaceItemsSm' }}>
+      <Icon status={status}>{statusIcon}</Icon>
+
+      <FlexItem>
+        <Link to={linkPath}>{t('{{total}} VM', { count, total: count })}</Link>
+      </FlexItem>
+    </Flex>
+  );
+};
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/list/components/StatusCell.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/list/components/StatusCell.tsx
index 2a53170e7..ce68a01da 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/list/components/StatusCell.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/list/components/StatusCell.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { getPhaseLabel, getPlanPhase } from 'src/modules/Plans/utils';
+import { getPlanPhase, PlanPhase } from 'src/modules/Plans/utils';
 import { TableIconCell } from 'src/modules/Providers/utils';
 
 import { CellProps } from './CellProps';
@@ -11,17 +11,17 @@ export const StatusCell: React.FC<CellProps> = (props) => {
   const { data } = props;
 
   const phase = getPlanPhase(data);
-  const phaseLabel = getPhaseLabel(phase);
+  const phaseLabel: string = phase;
 
   switch (phase) {
-    case 'Error':
-    case 'Warning':
+    case PlanPhase.Error:
+    case PlanPhase.Warning:
       return ErrorStatusCell(props);
-    case 'Failed':
-    case 'Canceled':
-    case 'Running':
-    case 'Succeeded':
-    case 'vmError':
+    case PlanPhase.Failed:
+    case PlanPhase.Canceled:
+    case PlanPhase.Running:
+    case PlanPhase.Succeeded:
+    case PlanPhase.vmError:
       return VMsProgressCell(props);
   }
 
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/list/components/VMsCell.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/list/components/VMsCell.tsx
index 4075a312b..a287dedd5 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/list/components/VMsCell.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/list/components/VMsCell.tsx
@@ -11,13 +11,13 @@ import { CellProps } from './CellProps';
 
 export const VMsCell: React.FC<CellProps> = ({ data }) => {
   const { t } = useForkliftTranslation();
-
-  const specVms = data?.obj?.spec?.vms;
+  const plan = data?.obj;
+  const specVms = plan?.spec?.vms;
 
   const planURL = getResourceUrl({
     reference: PlanModelRef,
-    name: data?.obj?.metadata?.name,
-    namespace: data?.obj?.metadata?.namespace,
+    name: plan?.metadata?.name,
+    namespace: plan?.metadata?.namespace,
   });
 
   return (
@@ -26,7 +26,9 @@ export const VMsCell: React.FC<CellProps> = ({ data }) => {
         <SplitItem className="forklift-overview__controller-card__status-icon">
           <VirtualMachineIcon />
         </SplitItem>
-        <SplitItem>{t('{{total}} VMs', { total: specVms?.length })}</SplitItem>
+        <SplitItem>
+          {t('{{total}} VM', { count: specVms?.length, total: specVms?.length })}
+        </SplitItem>
       </Split>
     </Link>
   );
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/list/components/VMsProgressCell.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/list/components/VMsProgressCell.tsx
index a566d8978..b7c48cdbf 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/list/components/VMsProgressCell.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/list/components/VMsProgressCell.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import {
   getMigrationVmsCounts,
-  getPhaseLabel,
   getPlanPhase,
   getPlanProgressVariant,
   MigrationVmsCounts,
@@ -52,7 +51,7 @@ export const VMsProgressCell: React.FC<CellProps> = ({ data }) => {
   const vms = data?.obj?.status?.migration?.vms;
 
   const phase = getPlanPhase(data);
-  const phaseLabel = t(getPhaseLabel(phase));
+  const phaseLabel: string = phase;
 
   const planURL = getResourceUrl({
     reference: PlanModelRef,
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/list/components/index.ts b/packages/forklift-console-plugin/src/modules/Plans/views/list/components/index.ts
index 3f8035961..f95b2466e 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/list/components/index.ts
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/list/components/index.ts
@@ -5,9 +5,8 @@ export * from './ErrorStatusCell';
 export * from './NamespaceCell';
 export * from './NetworkMapLinkCell';
 export * from './PlanCell';
+export * from './PlanStatusCell';
 export * from './PlanStatusIcon';
 export * from './ProviderLinkCell';
-export * from './StatusCell';
 export * from './VMsCell';
-export * from './VMsProgressCell';
 // @endindex
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/create/ProvidersCreatePage.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/create/ProvidersCreatePage.tsx
index 86fe094b3..d572fe78e 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/create/ProvidersCreatePage.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/create/ProvidersCreatePage.tsx
@@ -2,9 +2,10 @@ import React, { useReducer } from 'react';
 import { useHistory } from 'react-router';
 import { Base64 } from 'js-base64';
 import SectionHeading from 'src/components/headers/SectionHeading';
-import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
+import { useForkliftTranslation } from 'src/utils/i18n';
 
 import { IoK8sApiCoreV1Secret, ProviderModelRef, V1beta1Provider } from '@kubev2v/types';
+import { useActiveNamespace } from '@openshift-console/dynamic-plugin-sdk';
 import {
   Alert,
   Button,
@@ -29,6 +30,7 @@ import './ProvidersCreatePage.style.css';
 interface ProvidersCreatePageState {
   newSecret: IoK8sApiCoreV1Secret;
   newProvider: V1beta1Provider;
+  projectName: string;
   validationError: ValidationMsg;
   apiError: Error | null;
 }
@@ -39,24 +41,26 @@ export const ProvidersCreatePage: React.FC<{
   const { t } = useForkliftTranslation();
   const history = useHistory();
   const [isLoading, toggleIsLoading] = useToggle();
-
+  const [activeNamespace, setActiveNamespace] = useActiveNamespace();
   const [providerNames] = useK8sWatchProviderNames({ namespace });
-
   const defaultNamespace = process?.env?.DEFAULT_NAMESPACE || 'default';
+  const projectName = activeNamespace === '#ALL_NS#' ? 'openshift-mtv' : activeNamespace;
+  const initialNamespace = namespace || projectName || defaultNamespace;
 
   const initialState: ProvidersCreatePageState = {
+    projectName,
     newSecret: {
       ...secretTemplate,
       metadata: {
         ...secretTemplate.metadata,
-        namespace: namespace || defaultNamespace,
+        namespace: initialNamespace,
       },
     },
     newProvider: {
       ...providerTemplate,
       metadata: {
         ...providerTemplate.metadata,
-        namespace: namespace || defaultNamespace,
+        namespace: initialNamespace,
       },
     },
     validationError: { type: 'error', msg: 'Missing provider name' },
@@ -109,6 +113,21 @@ export const ProvidersCreatePage: React.FC<{
           apiError: null,
         };
       }
+      case 'SET_PROJECT_NAME': {
+        const value = action.payload;
+        let validationError: ValidationMsg = { type: 'default' };
+
+        if (!value) {
+          validationError = { type: 'error', msg: 'Missing project name' };
+        }
+
+        return {
+          ...state,
+          validationError,
+          projectName: String(value),
+          apiError: null,
+        };
+      }
       case 'SET_API_ERROR': {
         const value = action.payload as Error | null;
         return { ...state, apiError: value };
@@ -230,26 +249,13 @@ export const ProvidersCreatePage: React.FC<{
           </Alert>
         )}
 
-        {!namespace && (
-          <Alert
-            className="co-alert co-alert--margin-top"
-            isInline
-            variant="warning"
-            title={t('Namespace is not defined')}
-          >
-            <ForkliftTrans>
-              This provider will be created in <strong>{defaultNamespace}</strong> namespace, if you
-              wish to choose another namespace please cancel, and choose a namespace from the top
-              bar.
-            </ForkliftTrans>
-          </Alert>
-        )}
-
         <ProvidersCreateForm
           newProvider={state.newProvider}
           newSecret={state.newSecret}
+          projectName={state.projectName}
           onNewProviderChange={onNewProviderChange}
           onNewSecretChange={onNewSecretChange}
+          onProjectNameChange={(value) => dispatch({ type: 'SET_PROJECT_NAME', payload: value })}
           providerNames={providerNames}
         />
 
@@ -259,7 +265,10 @@ export const ProvidersCreatePage: React.FC<{
           <FlexItem>
             <Button
               variant="primary"
-              onClick={onUpdate}
+              onClick={() => {
+                setActiveNamespace(state.projectName);
+                onUpdate();
+              }}
               isDisabled={state.validationError.type === 'error'}
               isLoading={isLoading}
             >
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/ProviderCreateForm.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/ProviderCreateForm.tsx
index 5853cbd1c..af5ce9fa5 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/ProviderCreateForm.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/ProviderCreateForm.tsx
@@ -1,13 +1,20 @@
 import React, { useReducer } from 'react';
 import { Base64 } from 'js-base64';
+import { ProjectNameSelect } from 'src/modules/Plans/views/create/components/ProjectNameSelect';
 import { ModalHOC } from 'src/modules/Providers/modals';
 import { validateK8sName, ValidationMsg } from 'src/modules/Providers/utils';
 import { SelectableCard } from 'src/modules/Providers/utils/components/Gallery/SelectableCard';
 import { SelectableGallery } from 'src/modules/Providers/utils/components/Gallery/SelectableGallery';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { FormGroupWithHelpText } from '@kubev2v/common';
-import { IoK8sApiCoreV1Secret, ProviderType, V1beta1Provider } from '@kubev2v/types';
+import {
+  IoK8sApiCoreV1Secret,
+  K8sResourceCommon,
+  ProviderType,
+  V1beta1Provider,
+} from '@kubev2v/types';
+import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 import {
   Flex,
   FlexItem,
@@ -21,23 +28,37 @@ import {
 import { EditProvider } from './EditProvider';
 import { EditProviderSectionHeading } from './EditProviderSectionHeading';
 import { providerCardItems } from './providerCardItems';
+
 export interface ProvidersCreateFormProps {
   newProvider: V1beta1Provider;
   newSecret: IoK8sApiCoreV1Secret;
   onNewProviderChange: (V1beta1Provider) => void;
   onNewSecretChange: (IoK8sApiCoreV1Secret) => void;
   providerNames?: string[];
+  projectName?: string;
+  onProjectNameChange?: (value: string) => void;
 }
 
 export const ProvidersCreateForm: React.FC<ProvidersCreateFormProps> = ({
   newProvider,
   newSecret,
+  projectName,
   onNewProviderChange,
   onNewSecretChange,
+  onProjectNameChange,
   providerNames = [],
 }) => {
   const { t } = useForkliftTranslation();
 
+  const [projects, projectsLoaded] = useK8sWatchResource<K8sResourceCommon[]>({
+    groupVersionKind: {
+      version: 'v1',
+      group: 'project.openshift.io',
+      kind: 'Project',
+    },
+    isList: true,
+  });
+
   const initialState = {
     validation: {
       name: { type: 'default', msg: 'Unique Kubernetes resource name identifier.' },
@@ -103,7 +124,20 @@ export const ProvidersCreateForm: React.FC<ProvidersCreateFormProps> = ({
         <EditProviderSectionHeading text={t('Provider details')} />
 
         <Form isWidthLimited className="forklift-section-secret-edit">
-          <FormGroupWithHelpText label={t('Select provider type')} isRequired fieldId="type">
+          <ProjectNameSelect
+            value={projectName}
+            options={projects.map((project) => ({
+              value: project.metadata?.name,
+              content: project.metadata?.name,
+            }))}
+            isDisabled={!projectsLoaded || !projects.length}
+            onSelect={onProjectNameChange}
+            popoverHelpContent={
+              <ForkliftTrans>The project that your provider will be created in.</ForkliftTrans>
+            }
+          />
+
+          <FormGroupWithHelpText label={t('Provider type')} isRequired fieldId="type">
             {newProvider?.spec?.type ? (
               <Flex>
                 <FlexItem className="forklift--create-provider-edit-card-selected">
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/ProvidersCreateVmMigrationContext.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/ProvidersCreateVmMigrationContext.tsx
index c520e9a1e..a3362e115 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/ProvidersCreateVmMigrationContext.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/ProvidersCreateVmMigrationContext.tsx
@@ -8,14 +8,20 @@ import {
   useState,
 } from 'react';
 import { produce } from 'immer';
+import { PlanEditAction } from 'src/modules/Plans/utils/types/PlanEditAction';
 
-import { V1beta1Provider } from '@kubev2v/types';
+import { V1beta1Plan, V1beta1Provider } from '@kubev2v/types';
 
 import { VmData } from '../details';
 
 export interface CreateVmMigrationContextData {
   selectedVms: VmData[];
   provider?: V1beta1Provider;
+  planName?: string;
+  projectName?: string;
+  targetProvider?: V1beta1Provider;
+  plan?: V1beta1Plan;
+  editAction?: PlanEditAction;
 }
 
 export interface CreateVmMigrationContextType {
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/ProvidersUpdateVmMigrationPage.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/ProvidersUpdateVmMigrationPage.tsx
new file mode 100644
index 000000000..ccf5a7a19
--- /dev/null
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/ProvidersUpdateVmMigrationPage.tsx
@@ -0,0 +1,63 @@
+import React from 'react';
+import { PlanMappingsSectionState } from 'src/modules/Plans/views/details/tabs/Mappings/PlanMappingsSection';
+
+import { LoadingDots } from '@kubev2v/common';
+import { V1beta1NetworkMap, V1beta1StorageMap } from '@kubev2v/types';
+import { Alert } from '@patternfly/react-core';
+
+import { PlansUpdateForm } from './components/PlansUpdateForm';
+import { CreateVmMigration, PageAction } from './reducer/actions';
+import { isDone } from './reducer/helpers';
+import { CreateVmMigrationPageState } from './types';
+
+const ProvidersUpdateVmMigrationPage: React.FC<{
+  state: CreateVmMigrationPageState;
+  dispatch: React.Dispatch<PageAction<CreateVmMigration, unknown>>;
+  emptyContext: boolean;
+  planMappingsState: PlanMappingsSectionState;
+  planMappingsDispatch: React.Dispatch<{
+    type: string;
+    payload?;
+  }>;
+  planNetworkMaps: V1beta1NetworkMap;
+  planStorageMaps: V1beta1StorageMap;
+}> = ({
+  state,
+  dispatch,
+  emptyContext,
+  planMappingsState,
+  planMappingsDispatch,
+  planNetworkMaps,
+  planStorageMaps,
+}) => {
+  if (emptyContext) {
+    // display empty node and wait for redirect triggered from useEffect
+    // the redirect should be triggered right after the first render()
+    // so any "empty page" would only "blink"
+    return <></>;
+  }
+
+  if (!isDone(state.flow.initialLoading) && !state.flow.apiError) {
+    return <LoadingDots />;
+  }
+
+  const FormAlerts = state.flow.apiError && (
+    <Alert className="co-alert co-alert--margin-top" isInline variant="danger" title={'API Error'}>
+      {state?.flow?.apiError?.message || state?.flow?.apiError?.toString()}
+    </Alert>
+  );
+
+  return (
+    <PlansUpdateForm
+      state={state}
+      dispatch={dispatch}
+      formAlerts={FormAlerts}
+      planMappingsState={planMappingsState}
+      planMappingsDispatch={planMappingsDispatch}
+      planNetworkMaps={planNetworkMaps}
+      planStorageMaps={planStorageMaps}
+    />
+  );
+};
+
+export default ProvidersUpdateVmMigrationPage;
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/components/PlansCreateForm.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/components/PlansCreateForm.tsx
index bb61cdf2a..f34e00fcc 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/components/PlansCreateForm.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/components/PlansCreateForm.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, useState } from 'react';
+import React, { ReactNode } from 'react';
 import { FilterableSelect } from 'src/components';
 import SectionHeading from 'src/components/headers/SectionHeading';
 import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
@@ -21,7 +21,6 @@ import {
   FormSelectOption,
   Stack,
   StackItem,
-  TextInput,
 } from '@patternfly/react-core';
 
 import { DetailsItem, getIsTarget } from '../../../utils';
@@ -34,13 +33,11 @@ import {
   removeAlert,
   replaceNetworkMapping,
   replaceStorageMapping,
-  setPlanName,
   setPlanTargetNamespace,
   setPlanTargetProvider,
 } from '../reducer/actions';
 import { CreateVmMigrationPageState, NetworkAlerts, StorageAlerts } from '../types';
 
-import { EditableDescriptionItem } from './EditableDescriptionItem';
 import { MappingList } from './MappingList';
 import { MappingListHeader } from './MappingListHeader';
 import { StateAlerts } from './StateAlerts';
@@ -143,17 +140,9 @@ export const PlansCreateForm = ({
     alerts,
   } = state;
 
-  const [isNameEdited, setIsNameEdited] = useState(true);
-
   const networkMessages = buildNetworkMessages(t);
   const storageMessages = buildStorageMessages(t);
 
-  const onChangePlan: (value: string, event: React.FormEvent<HTMLInputElement>) => void = (
-    value,
-  ) => {
-    dispatch(setPlanName(value?.trim() ?? ''));
-  };
-
   const onChangeTargetProvider: (
     value: string,
     event: React.FormEvent<HTMLSelectElement>,
@@ -170,39 +159,6 @@ export const PlansCreateForm = ({
           default: '1Col',
         }}
       >
-        {isNameEdited || validation.planName === 'error' ? (
-          <Form isWidthLimited>
-            <FormGroupWithHelpText
-              label={t('Plan name')}
-              isRequired
-              fieldId="planName"
-              validated={validation.planName}
-              helperTextInvalid={t(
-                'Name is required and must be a unique within a namespace and valid Kubernetes name.',
-              )}
-            >
-              <TextInput
-                spellCheck="false"
-                isRequired
-                type="text"
-                id="planName"
-                value={plan.metadata.name}
-                validated={validation.planName}
-                isDisabled={flow.editingDone}
-                onChange={(e, v) => onChangePlan(v, e)}
-              />
-            </FormGroupWithHelpText>
-          </Form>
-        ) : (
-          <EditableDescriptionItem
-            title={t('Plan name')}
-            content={plan.metadata.name}
-            ariaEditLabel={t('Edit plan name')}
-            onEdit={() => setIsNameEdited(true)}
-            isDisabled={flow.editingDone}
-          />
-        )}
-
         <SectionHeading
           text={t('Source provider')}
           className="forklift--create-vm-migration-plan--section-header"
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/components/PlansUpdateForm.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/components/PlansUpdateForm.tsx
new file mode 100644
index 000000000..80f3c918f
--- /dev/null
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/components/PlansUpdateForm.tsx
@@ -0,0 +1,205 @@
+import React, { ReactNode } from 'react';
+import { FilterableSelect } from 'src/components';
+import SectionHeading from 'src/components/headers/SectionHeading';
+import { PlanMappingsInitSection } from 'src/modules/Plans/views/details/tabs/Mappings/PlanMappings';
+import { PlanMappingsSectionState } from 'src/modules/Plans/views/details/tabs/Mappings/PlanMappingsSection';
+import { useForkliftTranslation } from 'src/utils/i18n';
+
+import { FormGroupWithHelpText } from '@kubev2v/common';
+import {
+  ProviderModelGroupVersionKind,
+  V1beta1NetworkMap,
+  V1beta1StorageMap,
+} from '@kubev2v/types';
+import { ResourceLink } from '@openshift-console/dynamic-plugin-sdk';
+import {
+  DescriptionList,
+  DescriptionListDescription,
+  DescriptionListGroup,
+  DescriptionListTerm,
+  Form,
+  FormSelect,
+  FormSelectOption,
+} from '@patternfly/react-core';
+
+import { DetailsItem, getIsTarget } from '../../../utils';
+import { PageAction, setPlanTargetNamespace, setPlanTargetProvider } from '../reducer/actions';
+import { CreateVmMigrationPageState } from '../types';
+
+export type PlansUpdateFormProps = {
+  children?: ReactNode;
+  formAlerts?: ReactNode;
+  formActions?: ReactNode;
+  state: CreateVmMigrationPageState;
+  dispatch: (action: PageAction<unknown, unknown>) => void;
+  planMappingsState: PlanMappingsSectionState;
+  planMappingsDispatch: React.Dispatch<{
+    type: string;
+    payload?;
+  }>;
+  planNetworkMaps: V1beta1NetworkMap;
+  planStorageMaps: V1beta1StorageMap;
+};
+
+export const PlansUpdateForm = ({
+  children,
+  state,
+  dispatch,
+  formAlerts,
+  formActions,
+  planMappingsState,
+  planMappingsDispatch,
+  planNetworkMaps,
+  planStorageMaps,
+}: PlansUpdateFormProps) => {
+  const { t } = useForkliftTranslation();
+
+  const {
+    underConstruction: { plan },
+    validation,
+    calculatedOnce: { namespacesUsedBySelectedVms },
+    existingResources: {
+      providers: availableProviders,
+      targetNamespaces: availableTargetNamespaces,
+    },
+    flow,
+  } = state;
+
+  const onChangeTargetProvider: (
+    value: string,
+    event: React.FormEvent<HTMLSelectElement>,
+  ) => void = (value) => {
+    dispatch(setPlanTargetProvider(value));
+  };
+
+  const mappingsSection = (
+    <PlanMappingsInitSection
+      plan={plan}
+      planMappingsState={planMappingsState}
+      planMappingsDispatch={planMappingsDispatch}
+      planNetworkMaps={planNetworkMaps}
+      planStorageMaps={planStorageMaps}
+    />
+  );
+
+  return (
+    <>
+      {children}
+      <DescriptionList
+        className="forklift-create-provider-edit-section"
+        columnModifier={{
+          default: '1Col',
+        }}
+      >
+        {flow.editAction !== 'VMS' && (
+          <>
+            <DescriptionListGroup>
+              <DescriptionListTerm>{t('Plan name')}</DescriptionListTerm>
+              <DescriptionListDescription>
+                <div className="forklift-page-editable-description-item">{plan.metadata.name}</div>
+              </DescriptionListDescription>
+            </DescriptionListGroup>
+
+            <SectionHeading
+              text={t('Source provider')}
+              className="forklift--create-vm-migration-plan--section-header"
+            />
+
+            <DetailsItem
+              title={t('Source provider')}
+              content={
+                <ResourceLink
+                  name={plan.spec.provider?.source?.name}
+                  namespace={plan.spec.provider?.source?.namespace}
+                  groupVersionKind={ProviderModelGroupVersionKind}
+                />
+              }
+            />
+            <DescriptionListGroup>
+              <DescriptionListTerm>{t('Selected VMs')}</DescriptionListTerm>
+              <DescriptionListDescription>
+                {t('{{vmCount}} VMs selected ', { vmCount: plan.spec.vms?.length ?? 0 })}
+              </DescriptionListDescription>
+            </DescriptionListGroup>
+
+            <SectionHeading
+              text={t('Target provider')}
+              className="forklift--create-vm-migration-plan--section-header"
+            />
+
+            <Form isWidthLimited>
+              <FormGroupWithHelpText
+                label={t('Target provider')}
+                isRequired
+                fieldId="targetProvider"
+                validated={validation.targetProvider}
+                helperTextInvalid={
+                  availableProviders.filter(getIsTarget).length === 0
+                    ? t('No provider is available')
+                    : t('The chosen provider is no longer available.')
+                }
+              >
+                <FormSelect
+                  value={plan.spec.provider?.destination?.name}
+                  onChange={(e, v) => onChangeTargetProvider(v, e)}
+                  id="targetProvider"
+                  isDisabled={flow.editingDone}
+                >
+                  {[
+                    <FormSelectOption
+                      key="placeholder"
+                      value={''}
+                      label={t('Select a provider')}
+                      isPlaceholder
+                      isDisabled
+                    />,
+                    ...availableProviders
+                      .filter(getIsTarget)
+                      .map((provider, index) => (
+                        <FormSelectOption
+                          key={provider?.metadata?.name || index}
+                          value={provider?.metadata?.name}
+                          label={
+                            provider?.metadata?.name ?? provider?.metadata?.uid ?? String(index)
+                          }
+                        />
+                      )),
+                  ]}
+                </FormSelect>
+              </FormGroupWithHelpText>
+            </Form>
+
+            <Form isWidthLimited>
+              <FormGroupWithHelpText
+                label={t('Target namespace')}
+                isRequired
+                id="targetNamespace"
+                validated={validation.targetNamespace}
+                placeholder={t('Select a namespace')}
+              >
+                <FilterableSelect
+                  selectOptions={availableTargetNamespaces.map((ns) => ({
+                    itemId: ns?.name,
+                    isDisabled:
+                      namespacesUsedBySelectedVms.includes(ns?.name) &&
+                      plan.spec.provider?.destination?.name === plan.spec.provider.source.name,
+                    children: ns?.name,
+                  }))}
+                  value={plan.spec.targetNamespace}
+                  onSelect={(value) => dispatch(setPlanTargetNamespace(value as string))}
+                  isDisabled={flow.editingDone}
+                  isScrollable
+                  canCreate
+                  createNewOptionLabel={t('Create new namespace:')}
+                />
+              </FormGroupWithHelpText>
+            </Form>
+          </>
+        )}
+        {mappingsSection}
+      </DescriptionList>
+      {formAlerts}
+      <div className="forklift--create-vm-migration-plan--form-actions">{formActions}</div>
+    </>
+  );
+};
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/reducer/actions.ts b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/reducer/actions.ts
index a17ed70fa..20b0ef6dc 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/reducer/actions.ts
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/reducer/actions.ts
@@ -23,6 +23,7 @@ export const DEFAULT_NAMESPACE = 'default';
 
 // action type names
 export const SET_NAME = 'SET_NAME';
+export const SET_PROJECT_NAME = 'SET_PROJECT_NAME';
 export const SET_DESCRIPTION = 'SET_DESCRIPTION';
 export const SET_TARGET_PROVIDER = 'SET_TARGET_PROVIDER';
 export const SET_TARGET_NAMESPACE = 'SET_TARGET_NAMESPACE';
@@ -43,6 +44,7 @@ export const SET_NICK_PROFILES = 'SET_NICK_PROFILES';
 export const SET_DISKS = 'SET_DISKS';
 export const SET_EXISTING_NET_MAPS = 'SET_EXISTING_NET_MAPS';
 export const SET_EXISTING_STORAGE_MAPS = 'SET_EXISTING_STORAGE_MAPS';
+export const START_UPDATE = 'START_UPDATE';
 export const START_CREATE = 'START_CREATE';
 export const SET_API_ERROR = 'SET_API_ERROR';
 export const REMOVE_ALERT = 'REMOVE_ALERT';
@@ -50,6 +52,7 @@ export const INIT = 'INIT';
 
 export type CreateVmMigration =
   | typeof SET_NAME
+  | typeof SET_PROJECT_NAME
   | typeof SET_DESCRIPTION
   | typeof SET_TARGET_PROVIDER
   | typeof SET_TARGET_NAMESPACE
@@ -67,6 +70,7 @@ export type CreateVmMigration =
   | typeof SET_NICK_PROFILES
   | typeof SET_DISKS
   | typeof SET_EXISTING_NET_MAPS
+  | typeof START_UPDATE
   | typeof START_CREATE
   | typeof SET_API_ERROR
   | typeof SET_EXISTING_STORAGE_MAPS
@@ -86,6 +90,10 @@ export interface PlanName {
   name: string;
 }
 
+export interface ProjectName {
+  name: string;
+}
+
 export interface PlanDescription {
   description: string;
 }
@@ -207,6 +215,13 @@ export const setPlanName = (name: string): PageAction<CreateVmMigration, PlanNam
   },
 });
 
+export const setProjectName = (name: string): PageAction<CreateVmMigration, ProjectName> => ({
+  type: 'SET_PROJECT_NAME',
+  payload: {
+    name,
+  },
+});
+
 export const setAvailableProviders = (
   availableProviders: V1beta1Provider[],
   loaded?: boolean,
@@ -368,6 +383,11 @@ export const setDisks = (
   payload: { disks, loading, error },
 });
 
+export const startUpdate = (): PageAction<CreateVmMigration, unknown> => ({
+  type: 'START_UPDATE',
+  payload: {},
+});
+
 export const startCreate = (): PageAction<CreateVmMigration, unknown> => ({
   type: 'START_CREATE',
   payload: {},
@@ -387,13 +407,21 @@ export const removeAlert = (
 
 export const initState = (
   namespace: string,
+  planName,
+  projectName,
   sourceProvider: V1beta1Provider,
   selectedVms: VmData[],
+  plan?: V1beta1Plan,
+  targetProvider?: V1beta1Provider,
 ): PageAction<CreateVmMigration, InitialStateParameters> => ({
   type: 'INIT',
   payload: {
     namespace,
+    planName,
+    projectName,
     sourceProvider,
+    targetProvider,
     selectedVms,
+    plan,
   },
 });
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/reducer/createInitialState.ts b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/reducer/createInitialState.ts
index 123f0c56a..d489abd72 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/reducer/createInitialState.ts
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/reducer/createInitialState.ts
@@ -1,6 +1,9 @@
+import { PlanEditAction } from 'src/modules/Plans/utils/types/PlanEditAction';
+
 import {
   ProviderModelGroupVersionKind as ProviderGVK,
   ProviderType,
+  V1beta1Plan,
   V1beta1Provider,
 } from '@kubev2v/types';
 
@@ -23,34 +26,44 @@ import { getObjectRef, resourceFieldsForType } from './helpers';
 export type InitialStateParameters = {
   namespace: string;
   sourceProvider: V1beta1Provider;
+  targetProvider?: V1beta1Provider;
   selectedVms: VmData[];
+  planName: string;
+  projectName: string;
+  plan?: V1beta1Plan;
+  editAction?: PlanEditAction;
 };
 
 export const createInitialState = ({
   namespace,
+  planName = '',
+  projectName,
   sourceProvider = {
     metadata: { name: 'unknown', namespace: 'unknown' },
     apiVersion: `${ProviderGVK.group}/${ProviderGVK.version}`,
     kind: ProviderGVK.kind,
   },
+  targetProvider,
   selectedVms = [],
+  plan = planTemplate,
+  editAction,
 }: InitialStateParameters): CreateVmMigrationPageState => {
   const hasVmNicWithEmptyProfile = hasNicWithEmptyProfile(sourceProvider, selectedVms);
-
   return {
     underConstruction: {
+      projectName,
       plan: {
-        ...planTemplate,
+        ...plan,
         metadata: {
-          ...planTemplate?.metadata,
-          name: '',
+          ...plan?.metadata,
+          name: planName || plan?.metadata?.name || '',
           namespace,
         },
         spec: {
-          ...planTemplate?.spec,
+          ...plan?.spec,
           provider: {
             source: getObjectRef(sourceProvider),
-            destination: undefined,
+            destination: targetProvider ? getObjectRef(targetProvider) : undefined,
           },
           targetNamespace: namespace,
           vms: selectedVms.map((data) => ({
@@ -71,7 +84,7 @@ export const createInitialState = ({
           ...networkMapTemplate?.spec,
           provider: {
             source: getObjectRef(sourceProvider),
-            destination: undefined,
+            destination: targetProvider ? getObjectRef(targetProvider) : undefined,
           },
         },
       },
@@ -86,7 +99,7 @@ export const createInitialState = ({
           ...storageMapTemplate?.spec,
           provider: {
             source: getObjectRef(sourceProvider),
-            destination: undefined,
+            destination: targetProvider ? getObjectRef(targetProvider) : undefined,
           },
         },
       },
@@ -109,9 +122,11 @@ export const createInitialState = ({
       selectedVms,
       sourceProvider,
       namespace,
+      plan,
     },
     validation: {
       planName: 'default',
+      projectName: 'default',
       targetNamespace: 'default',
       targetProvider: 'default',
       networkMappings: hasVmNicWithEmptyProfile ? 'error' : 'default',
@@ -161,6 +176,7 @@ export const createInitialState = ({
         [SET_DISKS]: !['ovirt', 'openstack'].includes(sourceProvider.spec?.type),
         [SET_NICK_PROFILES]: sourceProvider.spec?.type !== 'ovirt',
       },
+      editAction,
     },
   };
 };
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/reducer/helpers.ts b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/reducer/helpers.ts
index 470d00d55..883228ef8 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/reducer/helpers.ts
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/reducer/helpers.ts
@@ -45,14 +45,23 @@ import { hasMultiplePodNetworkMappings } from './hasMultiplePodNetworkMappings';
 export const validateUniqueName = (name: string, existingNames: string[]) =>
   existingNames.every((existingName) => existingName !== name);
 
-export const validatePlanName = (name: string, existingPlans: V1beta1Plan[]) =>
-  validateK8sName(name) &&
-  validateUniqueName(
-    name,
-    existingPlans.map((plan) => plan?.metadata?.name ?? ''),
-  )
+export const validatePlanName = (
+  name: string,
+  existingPlans: V1beta1Plan[],
+  editingPlan?: boolean,
+) => {
+  if (editingPlan) {
+    return validateK8sName(name) ? 'success' : 'error';
+  }
+
+  return validateK8sName(name) &&
+    validateUniqueName(
+      name,
+      existingPlans.map((plan) => plan?.metadata?.name ?? ''),
+    )
     ? 'success'
     : 'error';
+};
 
 export const validateTargetNamespace = (namespace: string, alreadyInUseBySelectedVms: boolean) =>
   !!namespace && validateK8sName(namespace) && !alreadyInUseBySelectedVms ? 'success' : 'error';
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/reducer/reducer.ts b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/reducer/reducer.ts
index a616f316f..f746618ce 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/reducer/reducer.ts
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/reducer/reducer.ts
@@ -47,9 +47,11 @@ import {
   SET_EXISTING_STORAGE_MAPS,
   SET_NAME,
   SET_NICK_PROFILES,
+  SET_PROJECT_NAME,
   SET_TARGET_NAMESPACE,
   SET_TARGET_PROVIDER,
   START_CREATE,
+  START_UPDATE,
 } from './actions';
 import { addMapping, deleteMapping, replaceMapping } from './changeMapping';
 import { createInitialState, InitialStateParameters } from './createInitialState';
@@ -80,7 +82,15 @@ const handlers: {
 } = {
   [SET_NAME](draft, { payload: { name } }: PageAction<CreateVmMigration, PlanName>) {
     draft.underConstruction.plan.metadata.name = name;
-    draft.validation.planName = validatePlanName(name, draft.existingResources.plans);
+    draft.validation.planName = validatePlanName(
+      name,
+      draft.existingResources.plans,
+      Boolean(draft.flow.editAction),
+    );
+  },
+  [SET_PROJECT_NAME](draft, { payload: { name } }: PageAction<CreateVmMigration, PlanName>) {
+    draft.underConstruction.projectName = name;
+    draft.validation.projectName = name ? 'success' : 'error';
   },
   [SET_TARGET_NAMESPACE](
     draft,
@@ -135,6 +145,7 @@ const handlers: {
     draft.validation.planName = validatePlanName(
       draft.underConstruction.plan.metadata.name,
       existingPlans,
+      Boolean(draft.flow.editAction),
     );
   },
   [SET_AVAILABLE_TARGET_NAMESPACES](
@@ -289,6 +300,9 @@ const handlers: {
     // triggered from useEffect on any data change
     existingResources.storageMaps = existingStorageMaps;
   },
+  [START_UPDATE]({ flow }) {
+    flow.editingDone = true;
+  },
   [START_CREATE]({
     flow,
     receivedAsParams: { sourceProvider },
@@ -472,10 +486,26 @@ const handlers: {
   [INIT](
     draft,
     {
-      payload: { namespace, sourceProvider, selectedVms },
+      payload: {
+        namespace,
+        sourceProvider,
+        targetProvider,
+        selectedVms,
+        plan,
+        planName,
+        projectName,
+      },
     }: PageAction<CreateVmMigration, InitialStateParameters>,
   ) {
-    const newDraft = createInitialState({ namespace, sourceProvider, selectedVms });
+    const newDraft = createInitialState({
+      namespace,
+      sourceProvider,
+      targetProvider,
+      selectedVms,
+      plan,
+      planName,
+      projectName,
+    });
 
     draft.underConstruction = newDraft.underConstruction;
     draft.calculatedOnce = newDraft.calculatedOnce;
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/types.ts b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/types.ts
index 615b16c91..fd5c8c0a7 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/types.ts
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/types.ts
@@ -1,4 +1,5 @@
 import { FC } from 'react';
+import { PlanEditAction } from 'src/modules/Plans/utils/types/PlanEditAction';
 
 import { ResourceFieldFactory, RowProps } from '@kubev2v/common';
 import {
@@ -24,12 +25,14 @@ import { CreateVmMigration } from './reducer/actions';
 export interface CreateVmMigrationPageState {
   underConstruction: {
     plan: V1beta1Plan;
+    projectName: string;
     netMap: V1beta1NetworkMap;
     storageMap: V1beta1StorageMap;
   };
 
   validation: {
     planName: Validation;
+    projectName: Validation;
     targetNamespace: Validation;
     targetProvider: Validation;
     networkMappings: Validation;
@@ -87,6 +90,7 @@ export interface CreateVmMigrationPageState {
     selectedVms: VmData[];
     sourceProvider: V1beta1Provider;
     namespace: string;
+    plan?: V1beta1Plan;
   };
   // placeholder for helper data
   workArea: {
@@ -96,6 +100,7 @@ export interface CreateVmMigrationPageState {
     editingDone: boolean;
     apiError?: Error;
     initialLoading: { [keys in CreateVmMigration]?: boolean };
+    editAction?: PlanEditAction;
   };
 }
 export interface MappingSource {
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/useFetchEffects.ts b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/useFetchEffects.ts
index af3059a86..28d789797 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/useFetchEffects.ts
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/useFetchEffects.ts
@@ -44,7 +44,15 @@ import { CreateVmMigrationPageState } from './types';
 export const useFetchEffects = (
   createVmMigrationContext: CreateVmMigrationContextType,
 ): [CreateVmMigrationPageState, Dispatch<PageAction<CreateVmMigration, unknown>>, boolean] => {
-  const { selectedVms, provider: sourceProvider } = createVmMigrationContext?.data || {};
+  const {
+    selectedVms,
+    provider: sourceProvider,
+    targetProvider: tProvider,
+    plan,
+    planName,
+    projectName,
+    editAction,
+  } = createVmMigrationContext?.data || {};
 
   // error state - the page was entered directly without choosing the VMs
   const emptyContext = !selectedVms?.length || !sourceProvider;
@@ -52,7 +60,16 @@ export const useFetchEffects = (
 
   const [state, dispatch] = useImmerReducer(
     reducer,
-    { namespace, sourceProvider, selectedVms },
+    {
+      namespace,
+      sourceProvider,
+      targetProvider: tProvider,
+      selectedVms,
+      plan,
+      planName,
+      projectName,
+      editAction,
+    },
     createInitialState,
   );
 
@@ -73,7 +90,11 @@ export const useFetchEffects = (
   };
 
   useEffect(
-    () => !editingDone && dispatch(initState(namespace, sourceProvider, selectedVms)),
+    () =>
+      !editingDone &&
+      dispatch(
+        initState(namespace, planName, projectName, sourceProvider, selectedVms, plan, tProvider),
+      ),
     [selectedVms],
   );
 
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/useUpdateEffect.ts b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/useUpdateEffect.ts
new file mode 100644
index 000000000..76b69dd3d
--- /dev/null
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/useUpdateEffect.ts
@@ -0,0 +1,155 @@
+import { useEffect, useRef } from 'react';
+import { useHistory } from 'react-router';
+import { produce } from 'immer';
+import { PlanMappingsSectionState } from 'src/modules/Plans/views/details/tabs/Mappings/PlanMappingsSection';
+import { patchPlanMappingsData } from 'src/modules/Plans/views/details/utils/patchPlanMappingsData';
+import { deepCopy } from 'src/utils';
+
+import {
+  NetworkMapModel,
+  PlanModel,
+  PlanModelRef,
+  StorageMapModel,
+  V1beta1NetworkMap,
+  V1beta1NetworkMapSpecMap,
+  V1beta1Plan,
+  V1beta1StorageMap,
+  V1beta1StorageMapSpecMap,
+} from '@kubev2v/types';
+import { K8sModel, k8sPatch, k8sUpdate } from '@openshift-console/dynamic-plugin-sdk';
+
+import { getResourceUrl } from '../../utils';
+
+import { setAPiError } from './reducer/actions';
+import { getObjectRef } from './reducer/helpers';
+import { CreateVmMigrationPageState } from './types';
+
+const updatePlan = async (
+  plan: V1beta1Plan,
+  netMap: V1beta1NetworkMap,
+  storageMap: V1beta1StorageMap,
+) => {
+  const updatedPlan = await k8sUpdate({
+    model: PlanModel,
+    data: plan,
+  });
+  const ownerReferences = [getObjectRef(updatedPlan)];
+  return [ownerReferences, netMap, storageMap];
+};
+
+const addOwnerRef = async (model: K8sModel, resource, ownerReferences) => {
+  const cleanOwnerReferences = ownerReferences.map((ref) => ({
+    ...ref,
+    namespace: undefined,
+  }));
+
+  return await k8sPatch({
+    model,
+    resource,
+    data: [
+      {
+        op: 'add',
+        path: '/metadata/ownerReferences',
+        value: cleanOwnerReferences,
+      },
+    ],
+  });
+};
+
+export const useUpdateEffect = (
+  state: CreateVmMigrationPageState,
+  dispatch,
+  planMappingsState: PlanMappingsSectionState,
+) => {
+  const history = useHistory();
+  const mounted = useRef(true);
+  useEffect(
+    () => () => {
+      mounted.current = false;
+    },
+    [],
+  );
+
+  useEffect(() => {
+    const {
+      flow,
+      underConstruction: { plan },
+    } = state;
+    if (!flow.editingDone || !mounted.current) {
+      return;
+    }
+
+    Promise.all([
+      updateMappings(
+        planMappingsState.planNetworkMaps,
+        planMappingsState.planStorageMaps,
+        planMappingsState.updatedNetwork,
+        planMappingsState.updatedStorage,
+      ),
+    ])
+      .then(([{ updatedNetworkMap, updatedStorageMap }]) => {
+        return updatePlan(
+          produce(plan, (draft) => {
+            draft.spec.map.network = getObjectRef(updatedNetworkMap);
+            draft.spec.map.storage = getObjectRef(updatedStorageMap);
+          }),
+          updatedNetworkMap,
+          updatedStorageMap,
+        );
+      })
+      .then(([ownerReferences, networkMap, storageMap]) =>
+        Promise.all([
+          addOwnerRef(StorageMapModel, storageMap, ownerReferences),
+          addOwnerRef(NetworkMapModel, networkMap, ownerReferences),
+        ]),
+      )
+      .then(
+        () =>
+          mounted.current &&
+          history.push(
+            getResourceUrl({
+              reference: PlanModelRef,
+              namespace: plan.metadata.namespace,
+              name: plan.metadata.name,
+            }),
+          ),
+      )
+      .catch((error) => mounted.current && dispatch(setAPiError(error)));
+  }, [state.flow.editingDone]);
+};
+
+/**
+ * Updates the destination name and namespace in the network map entries.
+ * If the destination name contains a '/', it splits the name into two parts.
+ * The first part becomes the new namespace, and the second part becomes the new name.
+ *
+ * @param {NetworkMap} networkMap - The network map object to update.
+ * @returns {NetworkMap} The updated network map object.
+ */
+export function updateNetworkMapDestination(networkMap: V1beta1NetworkMap): V1beta1NetworkMap {
+  const networkMapCopy = deepCopy(networkMap);
+
+  networkMapCopy.spec.map?.forEach((entry) => {
+    const parts = entry?.destination?.name?.split('/');
+    if (parts?.length === 2) {
+      entry.destination.namespace = parts[0];
+      entry.destination.name = parts[1];
+    }
+  });
+  return networkMapCopy;
+}
+
+async function updateMappings(
+  planNetworkMaps: V1beta1NetworkMap,
+  planStorageMaps: V1beta1StorageMap,
+  updatedNetwork: V1beta1NetworkMapSpecMap[],
+  updatedStorage: V1beta1StorageMapSpecMap[],
+) {
+  const { updatedNetworkMap, updatedStorageMap } = await patchPlanMappingsData(
+    planNetworkMaps,
+    planStorageMaps,
+    updatedNetwork,
+    updatedStorage,
+  );
+  return { updatedNetworkMap, updatedStorageMap };
+}