diff --git a/src/layouts/main/main-layout.tsx b/src/layouts/main/main-layout.tsx
index 7e654bdc..7504da2f 100644
--- a/src/layouts/main/main-layout.tsx
+++ b/src/layouts/main/main-layout.tsx
@@ -15,7 +15,6 @@ import { Link, LinkButton } from 'src/components/link';
 import LogoKoyeb from 'src/components/logo-koyeb.svg?react';
 import Logo from 'src/components/logo.svg?react';
 import { OrganizationAvatar } from 'src/components/organization-avatar';
-import { useFeatureFlag } from 'src/hooks/feature-flag';
 import { useLocation } from 'src/hooks/router';
 import { useLocalStorage, useSessionStorage } from 'src/hooks/storage';
 import { useThemeModeOrPreferred } from 'src/hooks/theme';
@@ -210,14 +209,8 @@ const isReadyEvent = createValidationGuard(z.object({ ready: z.literal(true) }))
 function usePageContext(): PageContextProps {
   const { data: user } = useUserQuery();
   const { pageContextBaseUrl } = getConfig();
-  const pageContextFlag = useFeatureFlag('page-context');
-
-  const enabled = [
-    //
-    pageContextBaseUrl !== undefined,
-    user?.flags.includes('ADMIN'),
-    pageContextFlag,
-  ].every(Boolean);
+
+  const enabled = Boolean(pageContextBaseUrl !== undefined && user?.flags.includes('ADMIN'));
 
   const [expanded, setExpanded] = useLocalStorage<boolean>('page-context-expanded');
 
diff --git a/src/modules/deployment/deployment-logs/build-steps.tsx b/src/modules/deployment/deployment-logs/build-steps.tsx
index 9e818350..b46242c7 100644
--- a/src/modules/deployment/deployment-logs/build-steps.tsx
+++ b/src/modules/deployment/deployment-logs/build-steps.tsx
@@ -1,7 +1,6 @@
 import clsx from 'clsx';
 
 import { ComputeDeployment, DeploymentBuildStep } from 'src/api/model';
-import { useFeatureFlag } from 'src/hooks/feature-flag';
 import { useNow } from 'src/hooks/timers';
 import { Translate } from 'src/intl/translate';
 
@@ -14,10 +13,9 @@ type BuildStepsProps = {
 };
 
 export function BuildSteps({ deployment }: BuildStepsProps) {
-  const buildStepsFlag = useFeatureFlag('build-steps');
   const steps = deployment.build?.steps;
 
-  if (!buildStepsFlag || steps === undefined) {
+  if (steps === undefined) {
     return null;
   }