diff --git a/apps/staking/app/mystakes/modules/StakedNodesModule.tsx b/apps/staking/app/mystakes/modules/StakedNodesModule.tsx
index 409a21b9..5ef93a53 100644
--- a/apps/staking/app/mystakes/modules/StakedNodesModule.tsx
+++ b/apps/staking/app/mystakes/modules/StakedNodesModule.tsx
@@ -49,7 +49,7 @@ export function StakedNodesWithAddress({ address }: { address: Address }) {
     }
     
     return [
-      data.stakes.concat(data.historical_stakes),
+      [...data.stakes, ...data.historical_stakes],
       data.network.block_height,
       data.network.block_timestamp,
     ];
diff --git a/apps/staking/app/register/NodeRegistrations.tsx b/apps/staking/app/register/NodeRegistrations.tsx
index 71289aa1..595ffb8c 100644
--- a/apps/staking/app/register/NodeRegistrations.tsx
+++ b/apps/staking/app/register/NodeRegistrations.tsx
@@ -94,11 +94,11 @@ export default function NodeRegistrations() {
       return [];
     }
 
-    if (!stakesData || stakesData.stakes.length === 0) {
+    if (!stakesData || !stakesData?.stakes?.length) {
       return registrationsData?.registrations ?? [];
     }
 
-    const stakedNodeEd25519Pubkeys = stakesData.stakes.map(
+    const stakedNodeEd25519Pubkeys = stakesData?.stakes?.map(
       ({ service_node_pubkey }) => service_node_pubkey
     );
 
diff --git a/apps/staking/components/DropdownHamburgerMenu.tsx b/apps/staking/components/DropdownHamburgerMenu.tsx
index a4fadf2f..c8f11c4d 100644
--- a/apps/staking/components/DropdownHamburgerMenu.tsx
+++ b/apps/staking/components/DropdownHamburgerMenu.tsx
@@ -24,6 +24,18 @@ function DropdownMenuItemNavLink({ label, children, ...props }: NavLinkProps) {
 export function DropdownHamburgerMenu() {
   const dictionary = useTranslations('navigation.hamburgerDropdown');
   const navDictionary = useTranslations('navigation');
+
+  const routes: typeof ROUTES = [];
+  ROUTES.forEach(({ dictionaryKey, href }) => {
+    if (
+      process.env.NEXT_PUBLIC_HIDE_FAUCET?.toLowerCase() === 'true' &&
+      dictionaryKey === 'faucet'
+    ) {
+      return;
+    }
+    routes.push({ dictionaryKey, href });
+  });
+
   return (
     <DropdownMenu>
       <DropdownMenuTrigger asChild>
@@ -37,7 +49,7 @@ export function DropdownHamburgerMenu() {
         </Button>
       </DropdownMenuTrigger>
       <DropdownMenuContent className="w-max">
-        {ROUTES.map(({ dictionaryKey, href }) => (
+        {routes.map(({ dictionaryKey, href }) => (
           <DropdownMenuItemNavLink
             key={href}
             href={href}
diff --git a/apps/staking/components/Footer.tsx b/apps/staking/components/Footer.tsx
index fa232690..3e97ce3e 100644
--- a/apps/staking/components/Footer.tsx
+++ b/apps/staking/components/Footer.tsx
@@ -7,7 +7,18 @@ import { useTranslations } from 'next-intl';
 export function Footer() {
   const dictionary = useTranslations('navigation');
 
-  const menuItems = [...ROUTES, ...EXTERNAL_ROUTES].map(
+  const routes: typeof ROUTES = [];
+  ROUTES.forEach(({ dictionaryKey, href }) => {
+    if (
+      process.env.NEXT_PUBLIC_HIDE_FAUCET?.toLowerCase() === 'true' &&
+      dictionaryKey === 'faucet'
+    ) {
+      return;
+    }
+    routes.push({ dictionaryKey, href });
+  });
+  
+  const menuItems = [...routes, ...EXTERNAL_ROUTES].map(
     ({ dictionaryKey, href, linkType = 'internal' }) => ({
       title: dictionary(dictionaryKey),
       href: href,
diff --git a/apps/staking/components/Header.tsx b/apps/staking/components/Header.tsx
index 17fd83aa..c6ecd393 100644
--- a/apps/staking/components/Header.tsx
+++ b/apps/staking/components/Header.tsx
@@ -10,14 +10,28 @@ import { getTranslations } from 'next-intl/server';
 
 export default async function Header() {
   const dictionary = await getTranslations('navigation');
+  const isCanary = process.env.NEXT_PUBLIC_IS_CANARY?.toLowerCase() === 'true';
+
+  const routes: typeof ROUTES = [];
+  ROUTES.forEach(({ dictionaryKey, href }) => {
+    if (
+      process.env.NEXT_PUBLIC_HIDE_FAUCET?.toLowerCase() === 'true' &&
+      dictionaryKey === 'faucet'
+    ) {
+      return;
+    }
+    routes.push({ dictionaryKey, href });
+  });
+
   return (
     <nav className="z-30 flex items-center justify-between p-6">
       <div className={cn('flex flex-row gap-10 pr-4')}>
-        <Link href="/">
+        <Link href="/" className="relative">
           <Image src="/images/logo.png" alt="Session Token Logo" width={144} height={50} />
+          {isCanary ? <span className="absolute -top-4 left-1 h-max w-max text-sm">🐤</span> : null}
         </Link>
         <div className="hidden flex-row gap-10 lg:flex">
-          {ROUTES.map(({ dictionaryKey, href }) => (
+          {routes.map(({ dictionaryKey, href }) => (
             <NavLink key={href} href={href} label={dictionary(dictionaryKey)} />
           ))}
         </div>
diff --git a/apps/staking/next.config.mjs b/apps/staking/next.config.mjs
index eb0b20dc..350e348f 100644
--- a/apps/staking/next.config.mjs
+++ b/apps/staking/next.config.mjs
@@ -49,6 +49,11 @@ const nextConfig = {
   },
   webpack: (config) => {
     config.externals.push('pino-pretty', 'lokijs', 'encoding');
+    if (process.env.NO_MINIFY?.toLowerCase() === 'true') {
+      config.optimization = {
+        minimize: false,
+      };
+    }
     return config;
   },
   redirects: async () => {
diff --git a/apps/staking/package.json b/apps/staking/package.json
index e52cefc8..5f70d208 100644
--- a/apps/staking/package.json
+++ b/apps/staking/package.json
@@ -5,6 +5,7 @@
   "scripts": {
     "dev": "next dev",
     "build": "next build",
+    "build:large": "NO_MINIFY=true next build",
     "start": "next start",
     "check-types": "tsc --noEmit",
     "check-telemetry": "next telemetry",
diff --git a/turbo.json b/turbo.json
index 1815a458..1684fe0d 100644
--- a/turbo.json
+++ b/turbo.json
@@ -17,6 +17,9 @@
         ".env.local"
       ],
       "env": [
+        "NO_MINIFY",
+        "NEXT_PUBLIC_IS_CANARY",
+        "NEXT_PUBLIC_HIDE_FAUCET",
         "NEXT_PUBLIC_SENT_STAKING_API_URL",
         "NEXT_PUBLIC_SENT_EXPLORER_API_URL",
         "NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID",