diff --git a/src/Components/CreateImageWizard/CreateImageWizard.tsx b/src/Components/CreateImageWizard/CreateImageWizard.tsx
index bdf1eaa0..01065a9a 100644
--- a/src/Components/CreateImageWizard/CreateImageWizard.tsx
+++ b/src/Components/CreateImageWizard/CreateImageWizard.tsx
@@ -192,7 +192,6 @@ const CreateImageWizard = ({ isEdit }: CreateImageWizardProps) => {
   const [searchParams] = useSearchParams();
   const { isFedoraEnv } = useGetEnvironment();
   // Feature flags
-  const isFirstBootEnabled = useFlag('image-builder.firstboot.enabled');
   const complianceEnabled = useFlag('image-builder.compliance.enabled');
   const isUsersEnabled = useFlag('image-builder.users.enabled');
   const isHostnameEnabled = useFlag('image-builder.hostname.enabled');
@@ -662,7 +661,7 @@ const CreateImageWizard = ({ isEdit }: CreateImageWizardProps) => {
                 key="wizard-first-boot"
                 navItem={customStatusNavItem}
                 status={firstBootValidation.disabledNext ? 'error' : 'default'}
-                isHidden={!isFirstBootEnabled}
+                isHidden={!!process.env.IS_ON_PREMISE || isFedoraEnv}
                 footer={
                   <CustomWizardFooter
                     disableNext={firstBootValidation.disabledNext}
diff --git a/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx b/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx
index bfb11108..f5daccc5 100644
--- a/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx
+++ b/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx
@@ -198,7 +198,6 @@ const Review = () => {
     );
   };
 
-  const isFirstBootEnabled = useFlag('image-builder.firstboot.enabled');
   const isUsersEnabled = useFlag('image-builder.users.enabled');
   const { isFedoraEnv } = useGetEnvironment();
   return (
@@ -504,23 +503,21 @@ const Review = () => {
             <ServicesList />
           </ExpandableSection>
         )}
-      {isFirstBootEnabled && (
-        <ExpandableSection
-          toggleContent={composeExpandable(
-            'First boot',
-            'revisit-first-boot',
-            'wizard-first-boot'
-          )}
-          onToggle={(_event, isExpandableFirstBoot) =>
-            onToggleFirstBoot(isExpandableFirstBoot)
-          }
-          isExpanded={isExpandableFirstBoot}
-          isIndented
-          data-testid="firstboot-expandable"
-        >
-          <FirstBootList />
-        </ExpandableSection>
-      )}
+      <ExpandableSection
+        toggleContent={composeExpandable(
+          'First boot',
+          'revisit-first-boot',
+          'wizard-first-boot'
+        )}
+        onToggle={(_event, isExpandableFirstBoot) =>
+          onToggleFirstBoot(isExpandableFirstBoot)
+        }
+        isExpanded={isExpandableFirstBoot}
+        isIndented
+        data-testid="firstboot-expandable"
+      >
+        <FirstBootList />
+      </ExpandableSection>
       {(blueprintName || blueprintDescription) && (
         <ExpandableSection
           toggleContent={composeExpandable(
diff --git a/src/test/Components/CreateImageWizard/steps/Oscap/Compliance.test.tsx b/src/test/Components/CreateImageWizard/steps/Oscap/Compliance.test.tsx
index a534f8de..9c2fc736 100644
--- a/src/test/Components/CreateImageWizard/steps/Oscap/Compliance.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Oscap/Compliance.test.tsx
@@ -52,6 +52,7 @@ const goToReviewStep = async () => {
   await clickNext(); // Additional packages
   await clickNext(); // Timezone
   await clickNext(); // Locale
+  await clickNext(); // First boot
   await clickNext(); // Details
   await enterBlueprintName('Compliance test');
   await clickNext(); // Review
diff --git a/src/test/setup.ts b/src/test/setup.ts
index 2b7e58fc..47276e0e 100644
--- a/src/test/setup.ts
+++ b/src/test/setup.ts
@@ -63,8 +63,6 @@ vi.mock('@unleash/proxy-client-react', () => ({
         return true;
       case 'image-builder.import.enabled':
         return true;
-      case 'image-builder.firstboot.enabled':
-        return true;
       case 'image-builder.hostname.enabled':
         return true;
       case 'image-builder.kernel.enabled':