diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c5e1a5f..600d043 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -45,11 +45,13 @@ jobs:
               echo "::set-output name=wc_project_id::475eff0658d0f3300ca18971418d261b"
               echo "::set-output name=testnet_squid_api_url::https://subsquid.squids.live/subsquid-network-testnet/v/v1/graphql"
               echo "::set-output name=mainnet_squid_api_url::https://subsquid.squids.live/subsquid-network-mainnet/v/v1/graphql"
+              echo "::set-output name=enable_demo_features::false"
           else
               echo "::set-output name=app_env::dev"
               echo "::set-output name=wc_project_id::ec2facac9eaaca7cc0584baadc935c01"
               echo "::set-output name=testnet_squid_api_url::https://subsquid.squids.live/subsquid-network-testnet/v/v1/graphql"
               echo "::set-output name=mainnet_squid_api_url::https://subsquid.squids.live/subsquid-network-mainnet/v/v1/graphql"
+              echo "::set-output name=enable_demo_features::true"
           fi
         env:
           REF: ${{ github.ref }}
diff --git a/src/hooks/demoFeaturesEnabled.ts b/src/hooks/demoFeaturesEnabled.ts
index 3835ba7..f78cf75 100644
--- a/src/hooks/demoFeaturesEnabled.ts
+++ b/src/hooks/demoFeaturesEnabled.ts
@@ -1,7 +1,3 @@
-import process from 'process';
-
 export function demoFeaturesEnabled() {
-  return (
-    process.env.ENABLE_DEMO_FEATURES === 'true' || localStorage.getItem('demo-features') === 'true'
-  );
+  return process.env.ENABLE_DEMO_FEATURES === 'true';
 }
diff --git a/src/layouts/NetworkLayout/NetworkLayout.tsx b/src/layouts/NetworkLayout/NetworkLayout.tsx
index ef12742..7bc1e47 100644
--- a/src/layouts/NetworkLayout/NetworkLayout.tsx
+++ b/src/layouts/NetworkLayout/NetworkLayout.tsx
@@ -16,6 +16,7 @@ import { Outlet } from 'react-router-dom';
 import { Logo } from '@components/Logo';
 import { NetworkSwitcher } from '@components/NetworkSwitcher';
 import { TopBanner, useBannerHeight } from '@components/TopBanner';
+import { demoFeaturesEnabled } from '@hooks/demoFeaturesEnabled';
 import { MenuIcon } from '@icons/MenuIcon';
 import { UserMenu } from '@layouts/NetworkLayout/UserMenu.tsx';
 import { useSwitchNetwork } from '@network/useSwitchNetwork';
@@ -290,7 +291,7 @@ export const NetworkLayout = ({
             ) : null}
           </AppToolbarSidebar>
           <AppToolbarContent />
-          <NetworkSwitcher hideText={isMobile} />
+          {demoFeaturesEnabled() ? <NetworkSwitcher hideText={isMobile} /> : null}
           {/*{narrowXs ? null : <AppToolbarDivider />}*/}
           {narrowXs ? <AppToolbarContent /> : null}
           <UserMenu />
diff --git a/src/pages/DashboardPage/Assets.tsx b/src/pages/DashboardPage/Assets.tsx
index 0bd7962..b7ea6f6 100644
--- a/src/pages/DashboardPage/Assets.tsx
+++ b/src/pages/DashboardPage/Assets.tsx
@@ -73,7 +73,7 @@ export function MyAssets() {
 
   return (
     <Box>
-      <NetworkPageTitle title="Assets" endAdornment={<ClaimButton />} />
+      <NetworkPageTitle title="My Assets" endAdornment={<ClaimButton />} />
 
       {isLoading ? (
         <Loader />
diff --git a/src/pages/DelegationsPage/DelegationsPage.tsx b/src/pages/DelegationsPage/DelegationsPage.tsx
index 2fed615..b74ff98 100644
--- a/src/pages/DelegationsPage/DelegationsPage.tsx
+++ b/src/pages/DelegationsPage/DelegationsPage.tsx
@@ -24,7 +24,7 @@ export function MyDelegations() {
 
   return (
     <Box>
-      <NetworkPageTitle title="Delegations" />
+      <NetworkPageTitle title="My Delegations" />
       {isLoading ? (
         <Loader />
       ) : delegations.length ? (
diff --git a/src/pages/GatewaysPage/GatewaysPage.tsx b/src/pages/GatewaysPage/GatewaysPage.tsx
index fd3d01c..5938b98 100644
--- a/src/pages/GatewaysPage/GatewaysPage.tsx
+++ b/src/pages/GatewaysPage/GatewaysPage.tsx
@@ -22,7 +22,7 @@ export function MyGateways() {
   return (
     <Box>
       <NetworkPageTitle
-        title="My gateways"
+        title="My Gateways"
         endAdornment={
           <Stack direction="row" spacing={2}>
             <Button variant="contained" component={Link} to="/gateways/add">
diff --git a/src/pages/WorkersPage/WorkersPage.tsx b/src/pages/WorkersPage/WorkersPage.tsx
index 7bab12b..e679c15 100644
--- a/src/pages/WorkersPage/WorkersPage.tsx
+++ b/src/pages/WorkersPage/WorkersPage.tsx
@@ -27,7 +27,7 @@ export function MyWorkers() {
   return (
     <Box>
       <NetworkPageTitle
-        title="My workers"
+        title="My Workers"
         endAdornment={
           <Button variant="contained" disabled={!isConnected} component={Link} to="/workers/add">
             Add worker