diff --git a/packages/app/Dockerfile b/packages/app/Dockerfile
index 4c7525d2a..fd3852157 100644
--- a/packages/app/Dockerfile
+++ b/packages/app/Dockerfile
@@ -28,9 +28,11 @@ FROM base AS builder
 ARG OTEL_EXPORTER_OTLP_ENDPOINT
 ARG OTEL_SERVICE_NAME
 ARG IS_LOCAL_MODE
+ARG IS_SELF_HOSTED_MODE
 ENV NEXT_PUBLIC_OTEL_EXPORTER_OTLP_ENDPOINT $OTEL_EXPORTER_OTLP_ENDPOINT
 ENV NEXT_PUBLIC_OTEL_SERVICE_NAME $OTEL_SERVICE_NAME
 ENV NEXT_PUBLIC_IS_LOCAL_MODE $IS_LOCAL_MODE
+ENV NEXT_PUBLIC_IS_SELF_HOSTED_MODE ${IS_SELF_HOSTED_MODE}
 ENV NX_DAEMON false
 
 COPY ./packages/app/src ./packages/app/src
diff --git a/packages/app/src/AppNav.tsx b/packages/app/src/AppNav.tsx
index caad2f930..c0758662f 100644
--- a/packages/app/src/AppNav.tsx
+++ b/packages/app/src/AppNav.tsx
@@ -42,7 +42,7 @@ import {
   AppNavLink,
   AppNavUserMenu,
 } from './AppNav.components';
-import { IS_K8S_DASHBOARD_ENABLED, IS_LOCAL_MODE } from './config';
+import { IS_K8S_DASHBOARD_ENABLED, IS_LOCAL_MODE, IS_SELF_HOSTED_MODE } from './config';
 import Icon from './Icon';
 import InstallInstructionModal from './InstallInstructionsModal';
 import Logo from './Logo';
@@ -850,7 +850,7 @@ export default function AppNav({ fixed = false }: { fixed?: boolean }) {
                 className="px-3 mb-2 mt-4"
               >
                 <OnboardingChecklist onAddDataClick={openInstallInstructions} />
-                <AppNavCloudBanner />
+                {!IS_SELF_HOSTED_MODE && <AppNavCloudBanner />}
               </div>
             </>
           )}
diff --git a/packages/app/src/AuthPage.tsx b/packages/app/src/AuthPage.tsx
index ff9137785..01ffdb3b1 100644
--- a/packages/app/src/AuthPage.tsx
+++ b/packages/app/src/AuthPage.tsx
@@ -33,7 +33,7 @@ export default function AuthPage({ action }: { action: 'register' | 'login' }) {
   const isLoggedIn = Boolean(!teamIsLoading && team && !team.isDemo);
 
   useEffect(() => {
-    if (isLoggedIn) {
+    if (isLoggedIn || IS_SELF_HOSTED_MODE) {
       router.push('/search');
     }
   }, [isLoggedIn, router]);
diff --git a/packages/app/src/LandingPage.tsx b/packages/app/src/LandingPage.tsx
index 4f6483119..2e2a16a6e 100644
--- a/packages/app/src/LandingPage.tsx
+++ b/packages/app/src/LandingPage.tsx
@@ -3,7 +3,7 @@ import { useRouter } from 'next/router';
 
 import api from '@/api';
 import AuthLoadingBlocker from '@/AuthLoadingBlocker';
-import { IS_LOCAL_MODE } from '@/config';
+import { IS_LOCAL_MODE, IS_SELF_HOSTED_MODE } from '@/config';
 
 export default function LandingPage() {
   const { data: installation, isLoading: installationIsLoading } =
@@ -14,7 +14,7 @@ export default function LandingPage() {
   const isLoggedIn = Boolean(!teamIsLoading && team);
 
   useEffect(() => {
-    if (isLoggedIn || IS_LOCAL_MODE) {
+    if (isLoggedIn || IS_LOCAL_MODE || IS_SELF_HOSTED_MODE) {
       router.push('/search');
     }
   }, [isLoggedIn, router]);
diff --git a/packages/app/src/config.ts b/packages/app/src/config.ts
index 47cb480f9..4d18e89fd 100644
--- a/packages/app/src/config.ts
+++ b/packages/app/src/config.ts
@@ -28,6 +28,8 @@ export const IS_LOCAL_MODE = //true;
   // @ts-ignore
   (process.env.NEXT_PUBLIC_IS_LOCAL_MODE ?? 'false') === 'true';
 
+export const IS_SELF_HOSTED_MODE = (process.env.NEXT_PUBLIC_IS_SELF_HOSTED_MODE ?? 'false') === 'true';
+
 // Features in development
 export const IS_K8S_DASHBOARD_ENABLED = true;
 export const IS_METRICS_ENABLED = true;