diff --git a/apps/adk-ui/src/contexts/App/runtime-config.ts b/apps/adk-ui/src/contexts/App/runtime-config.ts
index 56ef0d88..37480c22 100644
--- a/apps/adk-ui/src/contexts/App/runtime-config.ts
+++ b/apps/adk-ui/src/contexts/App/runtime-config.ts
@@ -22,7 +22,6 @@ export const runtimeConfig: RuntimeConfig = {
     defaults: contextTokenPermissionsDefaults,
   }),
   isAuthEnabled: process.env.OIDC_ENABLED !== 'false',
-  isLocalDevAutoLogin:
-    process.env.OIDC_ENABLED !== 'false' && (process.env.OIDC_PROVIDER_ISSUER?.includes('localtest.me') ?? false),
+  isLocalDevAutoLogin: process.env.LOCAL_DEV_AUTO_LOGIN === 'true',
   appName: process.env.APP_NAME || 'Kagenti ADK',
 };
diff --git a/apps/adk-ui/template.env b/apps/adk-ui/template.env
index 5de6f39f..09ba24cb 100644
--- a/apps/adk-ui/template.env
+++ b/apps/adk-ui/template.env
@@ -27,6 +27,9 @@ OIDC_PROVIDER_ISSUER=http://keycloak.localtest.me:8080/realms/adk
 # defaults to OIDC_PROVIDER_ISSUER if not set — only needed when internal and public URLs differ (e.g. dev mode)
 OIDC_PROVIDER_EXTERNAL_ISSUER=http://keycloak.localtest.me:8080/realms/adk
 
+# Enable auto-login for local dev (default: false)
+LOCAL_DEV_AUTO_LOGIN=false
+
 # next-auth random string
 NEXTAUTH_SECRET=
 NEXTAUTH_URL="http://localhost:3000"
diff --git a/helm/templates/ui/deployment.yaml b/helm/templates/ui/deployment.yaml
index 5d7ff07c..e84c7379 100644
--- a/helm/templates/ui/deployment.yaml
+++ b/helm/templates/ui/deployment.yaml
@@ -55,6 +55,8 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           env:
+            - name: LOCAL_DEV_AUTO_LOGIN
+              value: {{ .Values.features.uiLocalSetup | quote }}
             - name: API_URL
               value: "http://adk-server-svc:{{.Values.server.service.port}}"
             - name: APP_NAME