diff --git a/src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemConfiguration.tsx b/src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemConfiguration.tsx
index dd24d4f8..763577dd 100644
--- a/src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemConfiguration.tsx
+++ b/src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemConfiguration.tsx
@@ -58,8 +58,8 @@ const FileSystemConfiguration = () => {
       <Content>
         <Content component={ContentVariants.h3}>Configure partitions</Content>
       </Content>
-      {partitions?.find((partition) =>
-        partition?.mountpoint?.includes('/usr')
+      {partitions.find((partition) =>
+        partition.mountpoint.includes('/usr')
       ) && <UsrSubDirectoriesDisabled />}
       <Content>
         <Content>
diff --git a/src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemTable.tsx b/src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemTable.tsx
index 93e3aa76..4e269537 100644
--- a/src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemTable.tsx
+++ b/src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemTable.tsx
@@ -520,7 +520,7 @@ const FileSystemTable = () => {
         onDragLeave={onDragLeave}
         ref={bodyRef}
       >
-        {partitions &&
+        {partitions.length > 0 &&
           partitions.map((partition) => (
             <Row
               onDrop={onDrop}
diff --git a/src/Components/CreateImageWizard/steps/FileSystem/index.tsx b/src/Components/CreateImageWizard/steps/FileSystem/index.tsx
index 5aae227e..39b3fb0d 100644
--- a/src/Components/CreateImageWizard/steps/FileSystem/index.tsx
+++ b/src/Components/CreateImageWizard/steps/FileSystem/index.tsx
@@ -9,6 +9,7 @@ import FileSystemPartition from './components/FileSystemPartition';
 import { useAppSelector } from '../../../../store/hooks';
 import { selectFileSystemConfigurationType } from '../../../../store/wizardSlice';
 import { useHasSpecificTargetOnly } from '../../utilities/hasSpecificTargetOnly';
+
 export type FileSystemConfigurationType = 'automatic' | 'manual';
 
 const FileSystemStep = () => {
@@ -30,13 +31,11 @@ const FileSystemStep = () => {
           <FileSystemPartition />
           <FileSystemAutomaticPartition />
         </>
-      ) : fileSystemConfigurationType === 'manual' ? (
+      ) : (
         <>
           <FileSystemPartition />
           <FileSystemConfiguration />
         </>
-      ) : (
-        fileSystemConfigurationType === 'oscap' && <FileSystemConfiguration />
       )}
     </Form>
   );
diff --git a/src/Components/CreateImageWizard/steps/Review/ReviewStepTextLists.tsx b/src/Components/CreateImageWizard/steps/Review/ReviewStepTextLists.tsx
index 03fc4b01..ce0c76ec 100644
--- a/src/Components/CreateImageWizard/steps/Review/ReviewStepTextLists.tsx
+++ b/src/Components/CreateImageWizard/steps/Review/ReviewStepTextLists.tsx
@@ -202,7 +202,7 @@ type MinSizeProps = {
 
 export const MinSize = ({ partitions }: MinSizeProps) => {
   let minSize = '';
-  if (partitions) {
+  if (partitions.length > 0) {
     let size = 0;
     for (const partition of partitions) {
       size += Number(partition.min_size) * getConversionFactor(partition.unit);