diff --git a/src/Components/CreateImageWizard/steps/ImageOutput/TargetEnvironment.tsx b/src/Components/CreateImageWizard/steps/ImageOutput/TargetEnvironment.tsx
index dacd1f02..ede934d9 100644
--- a/src/Components/CreateImageWizard/steps/ImageOutput/TargetEnvironment.tsx
+++ b/src/Components/CreateImageWizard/steps/ImageOutput/TargetEnvironment.tsx
@@ -12,7 +12,6 @@ import {
   Tile,
 } from '@patternfly/react-core';
 import { HelpIcon } from '@patternfly/react-icons';
-import { useFlag } from '@unleash/proxy-client-react';
 
 import { useAppSelector, useAppDispatch } from '../../../../store/hooks';
 import {
@@ -31,6 +30,7 @@ import {
   selectDistribution,
   selectImageTypes,
 } from '../../../../store/wizardSlice';
+import { useFlag } from '../../../../Utilities/useGetEnvironment';
 
 const TargetEnvironment = () => {
   const arch = useAppSelector(selectArchitecture);
diff --git a/src/Components/CreateImageWizard/steps/Oscap/index.tsx b/src/Components/CreateImageWizard/steps/Oscap/index.tsx
index ae292656..b5fd136b 100644
--- a/src/Components/CreateImageWizard/steps/Oscap/index.tsx
+++ b/src/Components/CreateImageWizard/steps/Oscap/index.tsx
@@ -9,7 +9,6 @@ import {
   Title,
 } from '@patternfly/react-core';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';
-import { useFlag } from '@unleash/proxy-client-react';
 
 import { Oscap, removeBetaFromRelease } from './Oscap';
 
@@ -35,7 +34,10 @@ import {
   selectComplianceType,
   clearKernelAppend,
 } from '../../../../store/wizardSlice';
-import { useGetEnvironment } from '../../../../Utilities/useGetEnvironment';
+import {
+  useFlag,
+  useGetEnvironment,
+} from '../../../../Utilities/useGetEnvironment';
 
 const OscapStep = () => {
   const dispatch = useAppDispatch();
diff --git a/src/Components/CreateImageWizard/steps/Packages/index.tsx b/src/Components/CreateImageWizard/steps/Packages/index.tsx
index ed870230..35501ddd 100644
--- a/src/Components/CreateImageWizard/steps/Packages/index.tsx
+++ b/src/Components/CreateImageWizard/steps/Packages/index.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 
 import { Alert, Text, Form, Title } from '@patternfly/react-core';
-import { useFlag } from '@unleash/proxy-client-react';
 
 import PackageRecommendations from './PackageRecommendations';
 import Packages from './Packages';
@@ -9,6 +8,7 @@ import Packages from './Packages';
 import { RHEL_8, RHEL_9 } from '../../../../constants';
 import { useAppSelector } from '../../../../store/hooks';
 import { selectDistribution } from '../../../../store/wizardSlice';
+import { useFlag } from '../../../../Utilities/useGetEnvironment';
 
 const PackagesStep = () => {
   const packageRecommendationsFlag = useFlag('image-builder.pkgrecs.enabled');
diff --git a/src/Components/edge/ImageDetails.tsx b/src/Components/edge/ImageDetails.tsx
index 1b15829c..89d45586 100644
--- a/src/Components/edge/ImageDetails.tsx
+++ b/src/Components/edge/ImageDetails.tsx
@@ -3,7 +3,6 @@ import React from 'react';
 import AsyncComponent from '@redhat-cloud-services/frontend-components/AsyncComponent';
 import ErrorState from '@redhat-cloud-services/frontend-components/ErrorState';
 import Unavailable from '@redhat-cloud-services/frontend-components/Unavailable';
-import { useFlag } from '@unleash/proxy-client-react';
 import { useDispatch } from 'react-redux';
 import { useNavigate, useLocation, useParams } from 'react-router-dom';
 
@@ -12,6 +11,7 @@ import {
   manageEdgeImagesUrlName,
 } from '../../Utilities/edge';
 import { resolveRelPath } from '../../Utilities/path';
+import { useFlag } from '../../Utilities/useGetEnvironment';
 
 const ImageDetail = () => {
   const dispatch = useDispatch();
diff --git a/src/Components/edge/ImagesTable.tsx b/src/Components/edge/ImagesTable.tsx
index b8c9a17e..d8c54de6 100644
--- a/src/Components/edge/ImagesTable.tsx
+++ b/src/Components/edge/ImagesTable.tsx
@@ -3,7 +3,6 @@ import React from 'react';
 import AsyncComponent from '@redhat-cloud-services/frontend-components/AsyncComponent';
 import ErrorState from '@redhat-cloud-services/frontend-components/ErrorState';
 import Unavailable from '@redhat-cloud-services/frontend-components/Unavailable';
-import { useFlag } from '@unleash/proxy-client-react';
 import { useDispatch } from 'react-redux';
 import { useNavigate, useLocation } from 'react-router-dom';
 
@@ -13,6 +12,7 @@ import {
   manageEdgeImagesUrlName,
 } from '../../Utilities/edge';
 import { resolveRelPath } from '../../Utilities/path';
+import { useFlag } from '../../Utilities/useGetEnvironment';
 
 const ImagesTable = () => {
   const dispatch = useDispatch();