diff --git a/src/Components/CreateImageWizard/CreateImageWizard.tsx b/src/Components/CreateImageWizard/CreateImageWizard.tsx
index 01065a9a..f3c11d70 100644
--- a/src/Components/CreateImageWizard/CreateImageWizard.tsx
+++ b/src/Components/CreateImageWizard/CreateImageWizard.tsx
@@ -194,10 +194,6 @@ const CreateImageWizard = ({ isEdit }: CreateImageWizardProps) => {
   // Feature flags
   const complianceEnabled = useFlag('image-builder.compliance.enabled');
   const isUsersEnabled = useFlag('image-builder.users.enabled');
-  const isHostnameEnabled = useFlag('image-builder.hostname.enabled');
-  const isKernelEnabled = useFlag('image-builder.kernel.enabled');
-  const isFirewallEnabled = useFlag('image-builder.firewall.enabled');
-  const isServicesStepEnabled = useFlag('image-builder.services.enabled');
 
   // IMPORTANT: Ensure the wizard starts with a fresh initial state
   useEffect(() => {
@@ -596,7 +592,6 @@ const CreateImageWizard = ({ isEdit }: CreateImageWizardProps) => {
                 id="wizard-hostname"
                 key="wizard-hostname"
                 navItem={customStatusNavItem}
-                isHidden={!isHostnameEnabled}
                 status={hostnameValidation.disabledNext ? 'error' : 'default'}
                 footer={
                   <CustomWizardFooter
@@ -612,7 +607,6 @@ const CreateImageWizard = ({ isEdit }: CreateImageWizardProps) => {
                 id="wizard-kernel"
                 key="wizard-kernel"
                 navItem={customStatusNavItem}
-                isHidden={!isKernelEnabled}
                 status={kernelValidation.disabledNext ? 'error' : 'default'}
                 footer={
                   <CustomWizardFooter
@@ -628,7 +622,6 @@ const CreateImageWizard = ({ isEdit }: CreateImageWizardProps) => {
                 id="wizard-firewall"
                 key="wizard-firewall"
                 navItem={customStatusNavItem}
-                isHidden={!isFirewallEnabled}
                 status={firewallValidation.disabledNext ? 'error' : 'default'}
                 footer={
                   <CustomWizardFooter
@@ -644,7 +637,6 @@ const CreateImageWizard = ({ isEdit }: CreateImageWizardProps) => {
                 id="wizard-services"
                 key="wizard-services"
                 navItem={customStatusNavItem}
-                isHidden={!isServicesStepEnabled}
                 status={servicesValidation.disabledNext ? 'error' : 'default'}
                 footer={
                   <CustomWizardFooter
diff --git a/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx b/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx
index f5daccc5..adc7c898 100644
--- a/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx
+++ b/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx
@@ -106,11 +106,6 @@ const Review = () => {
   const [isExpandableFirstBoot, setIsExpandedFirstBoot] = useState(true);
   const [isExpandedUsers, setIsExpandedUsers] = useState(true);
 
-  const isHostnameEnabled = useFlag('image-builder.hostname.enabled');
-  const isKernelEnabled = useFlag('image-builder.kernel.enabled');
-  const isFirewallEnabled = useFlag('image-builder.firewall.enabled');
-  const isServicesStepEnabled = useFlag('image-builder.services.enabled');
-
   const onToggleImageOutput = (isExpandedImageOutput: boolean) =>
     setIsExpandedImageOutput(isExpandedImageOutput);
   const onToggleTargetEnvs = (isExpandedTargetEnvs: boolean) =>
@@ -429,7 +424,7 @@ const Review = () => {
           <LocaleList />
         </ExpandableSection>
       )}
-      {isHostnameEnabled && hostname && (
+      {hostname && (
         <ExpandableSection
           toggleContent={composeExpandable(
             'Hostname',
@@ -446,7 +441,7 @@ const Review = () => {
           <HostnameList />
         </ExpandableSection>
       )}
-      {isKernelEnabled && (kernel.name || kernel.append.length > 0) && (
+      {(kernel.name || kernel.append.length > 0) && (
         <ExpandableSection
           toggleContent={composeExpandable(
             'Kernel',
@@ -463,46 +458,44 @@ const Review = () => {
           <KernelList />
         </ExpandableSection>
       )}
-      {isFirewallEnabled &&
-        (firewall.ports.length > 0 ||
-          firewall.services.disabled.length > 0 ||
-          firewall.services.enabled.length > 0) && (
-          <ExpandableSection
-            toggleContent={composeExpandable(
-              'Firewall',
-              'revisit-firewall',
-              'wizard-firewall'
-            )}
-            onToggle={(_event, isExpandedFirewall) =>
-              onToggleFirewall(isExpandedFirewall)
-            }
-            isExpanded={isExpandedFirewall}
-            isIndented
-            data-testid="firewall-expandable"
-          >
-            <FirewallList />
-          </ExpandableSection>
-        )}
-      {isServicesStepEnabled &&
-        (services.enabled.length > 0 ||
-          services.disabled.length > 0 ||
-          services.masked.length > 0) && (
-          <ExpandableSection
-            toggleContent={composeExpandable(
-              'Systemd services',
-              'revisit-services',
-              'wizard-services'
-            )}
-            onToggle={(_event, isExpandedServices) =>
-              onToggleServices(isExpandedServices)
-            }
-            isExpanded={isExpandedServices}
-            isIndented
-            data-testid="services-expandable"
-          >
-            <ServicesList />
-          </ExpandableSection>
-        )}
+      {(firewall.ports.length > 0 ||
+        firewall.services.disabled.length > 0 ||
+        firewall.services.enabled.length > 0) && (
+        <ExpandableSection
+          toggleContent={composeExpandable(
+            'Firewall',
+            'revisit-firewall',
+            'wizard-firewall'
+          )}
+          onToggle={(_event, isExpandedFirewall) =>
+            onToggleFirewall(isExpandedFirewall)
+          }
+          isExpanded={isExpandedFirewall}
+          isIndented
+          data-testid="firewall-expandable"
+        >
+          <FirewallList />
+        </ExpandableSection>
+      )}
+      {(services.enabled.length > 0 ||
+        services.disabled.length > 0 ||
+        services.masked.length > 0) && (
+        <ExpandableSection
+          toggleContent={composeExpandable(
+            'Systemd services',
+            'revisit-services',
+            'wizard-services'
+          )}
+          onToggle={(_event, isExpandedServices) =>
+            onToggleServices(isExpandedServices)
+          }
+          isExpanded={isExpandedServices}
+          isIndented
+          data-testid="services-expandable"
+        >
+          <ServicesList />
+        </ExpandableSection>
+      )}
       <ExpandableSection
         toggleContent={composeExpandable(
           'First boot',
diff --git a/src/Utilities/useGetEnvironment.ts b/src/Utilities/useGetEnvironment.ts
index 443e6dd0..bb6545a9 100644
--- a/src/Utilities/useGetEnvironment.ts
+++ b/src/Utilities/useGetEnvironment.ts
@@ -40,10 +40,6 @@ export const useFlagWithEphemDefault = (
 const onPremFlag = (flag: string): boolean => {
   switch (flag) {
     case 'image-builder.users.enabled':
-    case 'image-builder.hostname.enabled':
-    case 'image-builder.kernel.enabled':
-    case 'image-builder.firewall.enabled':
-    case 'image-builder.services.enabled':
     case 'image-builder.templates.enabled':
       return true;
     default:
diff --git a/src/test/Components/CreateImageWizard/steps/Oscap/Compliance.test.tsx b/src/test/Components/CreateImageWizard/steps/Oscap/Compliance.test.tsx
index 9c2fc736..8a9f3f55 100644
--- a/src/test/Components/CreateImageWizard/steps/Oscap/Compliance.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Oscap/Compliance.test.tsx
@@ -52,6 +52,10 @@ const goToReviewStep = async () => {
   await clickNext(); // Additional packages
   await clickNext(); // Timezone
   await clickNext(); // Locale
+  await clickNext(); // Hostname
+  await clickNext(); // Kernel
+  await clickNext(); // Firewall
+  await clickNext(); // Systemd services
   await clickNext(); // First boot
   await clickNext(); // Details
   await enterBlueprintName('Compliance test');
diff --git a/src/test/setup.ts b/src/test/setup.ts
index 47276e0e..9427d5ac 100644
--- a/src/test/setup.ts
+++ b/src/test/setup.ts
@@ -63,14 +63,6 @@ vi.mock('@unleash/proxy-client-react', () => ({
         return true;
       case 'image-builder.import.enabled':
         return true;
-      case 'image-builder.hostname.enabled':
-        return true;
-      case 'image-builder.kernel.enabled':
-        return true;
-      case 'image-builder.firewall.enabled':
-        return true;
-      case 'image-builder.services.enabled':
-        return true;
       case 'edgeParity.image-list':
         return true;
       case 'image-builder.edge.local-image-table':