diff --git a/src/Components/CreateImageWizard/steps/FileSystem/FileSystemTable.tsx b/src/Components/CreateImageWizard/steps/FileSystem/FileSystemTable.tsx
index 9ff12256..4d2041d3 100644
--- a/src/Components/CreateImageWizard/steps/FileSystem/FileSystemTable.tsx
+++ b/src/Components/CreateImageWizard/steps/FileSystem/FileSystemTable.tsx
@@ -193,6 +193,7 @@ const MountpointPrefix = ({ partition }: MountpointPrefixPropTypes) => {
 
   const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
     <MenuToggle
+      ouiaId="mount-point"
       ref={toggleRef}
       onClick={onToggleClick}
       isExpanded={isOpen}
@@ -206,7 +207,6 @@ const MountpointPrefix = ({ partition }: MountpointPrefixPropTypes) => {
 
   return (
     <Select
-      ouiaId="mount-point"
       isOpen={isOpen}
       selected={prefix}
       onSelect={onSelect}
@@ -339,6 +339,7 @@ const SizeUnit = ({ partition }: SizeUnitPropTypes) => {
 
   const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
     <MenuToggle
+      ouiaId="unit"
       ref={toggleRef}
       onClick={onToggleClick}
       isExpanded={isOpen}
@@ -350,7 +351,6 @@ const SizeUnit = ({ partition }: SizeUnitPropTypes) => {
 
   return (
     <Select
-      ouiaId="unit"
       isOpen={isOpen}
       selected={partition.unit}
       onSelect={onSelect}
diff --git a/src/Components/CreateImageWizard/steps/ImageOutput/ArchSelect.tsx b/src/Components/CreateImageWizard/steps/ImageOutput/ArchSelect.tsx
index 7db02363..543d9ae2 100644
--- a/src/Components/CreateImageWizard/steps/ImageOutput/ArchSelect.tsx
+++ b/src/Components/CreateImageWizard/steps/ImageOutput/ArchSelect.tsx
@@ -57,6 +57,7 @@ const ArchSelect = () => {
 
   const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
     <MenuToggle
+      ouiaId="arch_select"
       ref={toggleRef}
       onClick={onToggleClick}
       isExpanded={isOpen}
@@ -70,7 +71,6 @@ const ArchSelect = () => {
   return (
     <FormGroup isRequired={true} label="Architecture">
       <Select
-        ouiaId="arch_select"
         isOpen={isOpen}
         selected={arch}
         onSelect={setArch}
diff --git a/src/Components/CreateImageWizard/steps/ImageOutput/ReleaseSelect.tsx b/src/Components/CreateImageWizard/steps/ImageOutput/ReleaseSelect.tsx
index 4807beac..df678f9d 100644
--- a/src/Components/CreateImageWizard/steps/ImageOutput/ReleaseSelect.tsx
+++ b/src/Components/CreateImageWizard/steps/ImageOutput/ReleaseSelect.tsx
@@ -134,6 +134,7 @@ const ReleaseSelect = () => {
 
   const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
     <MenuToggle
+      ouiaId="release_select"
       ref={toggleRef}
       onClick={onToggleClick}
       isExpanded={isOpen}
@@ -147,7 +148,6 @@ const ReleaseSelect = () => {
   return (
     <FormGroup isRequired={true} label="Release">
       <Select
-        ouiaId="release_select"
         isOpen={isOpen}
         selected={releases.get(distribution)}
         onSelect={handleSelect}
diff --git a/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/AzureHyperVSelect.tsx b/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/AzureHyperVSelect.tsx
index 5258d2ee..35da2e14 100644
--- a/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/AzureHyperVSelect.tsx
+++ b/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/AzureHyperVSelect.tsx
@@ -46,6 +46,7 @@ export const AzureHyperVSelect = () => {
 
   const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
     <MenuToggle
+      ouiaId="hyperv_gen_select"
       ref={toggleRef}
       data-testid="azure-hyper-v-generation-select"
       onClick={() => setIsOpen(!isOpen)}
@@ -60,7 +61,6 @@ export const AzureHyperVSelect = () => {
     <>
       <FormGroup isRequired label="HyperV Generation">
         <Select
-          ouiaId="hyperv_gen_select"
           isScrollable
           isOpen={isOpen}
           selected={hyperVGeneration === 'V1' ? 'Generation 1' : 'Generation 2'}