diff --git a/src/Components/CreateImageWizard/formComponents/FileSystemConfiguration.js b/src/Components/CreateImageWizard/formComponents/FileSystemConfiguration.js
index a4609530..dc40467a 100644
--- a/src/Components/CreateImageWizard/formComponents/FileSystemConfiguration.js
+++ b/src/Components/CreateImageWizard/formComponents/FileSystemConfiguration.js
@@ -398,6 +398,7 @@ const FileSystemConfiguration = ({ ...props }) => {
           </TableComposable>
           <TextContent>
             <Button
+              ouiaId="add-partition"
               data-testid="file-system-add-partition"
               className="pf-u-text-align-left"
               variant="link"
diff --git a/src/Components/CreateImageWizard/formComponents/MountPoint.js b/src/Components/CreateImageWizard/formComponents/MountPoint.js
index 09b5231e..5a65d2d0 100644
--- a/src/Components/CreateImageWizard/formComponents/MountPoint.js
+++ b/src/Components/CreateImageWizard/formComponents/MountPoint.js
@@ -64,6 +64,7 @@ const MountPoint = ({ ...props }) => {
   return (
     <>
       <Select
+        ouiaId="mount-point"
         className="pf-u-w-50"
         isOpen={isOpen}
         onToggle={onToggle}
@@ -78,6 +79,7 @@ const MountPoint = ({ ...props }) => {
       </Select>
       {prefix !== '/' && !prefix.startsWith('/boot') && (
         <TextInput
+          ouiaId="mount-suffix"
           className="pf-u-w-50"
           type="text"
           value={suffix}
diff --git a/src/Components/CreateImageWizard/formComponents/SizeUnit.js b/src/Components/CreateImageWizard/formComponents/SizeUnit.js
index d693fd24..944f884f 100644
--- a/src/Components/CreateImageWizard/formComponents/SizeUnit.js
+++ b/src/Components/CreateImageWizard/formComponents/SizeUnit.js
@@ -43,6 +43,7 @@ const SizeUnit = ({ ...props }) => {
   return (
     <>
       <TextInput
+        ouiaId="size"
         className="pf-u-w-50"
         type="text"
         value={size}
@@ -50,6 +51,7 @@ const SizeUnit = ({ ...props }) => {
         onChange={(v) => setSize(isNaN(parseInt(v)) ? 0 : parseInt(v))}
       />
       <Select
+        ouiaId="unit"
         className="pf-u-w-50"
         isOpen={isOpen}
         onToggle={onToggle}