diff --git a/medcat-trainer/webapp/frontend/src/runtimeConfig.ts b/medcat-trainer/webapp/frontend/src/runtimeConfig.ts
index a23b111e6..6acc7d016 100644
--- a/medcat-trainer/webapp/frontend/src/runtimeConfig.ts
+++ b/medcat-trainer/webapp/frontend/src/runtimeConfig.ts
@@ -28,12 +28,12 @@ declare global {
  */
 const DEFAULT_CONFIG: RuntimeConfig = {
   USE_OIDC: '0',
-  KEYCLOAK_URL: 'http://keycloak.cogstack.localhost/',
-  KEYCLOAK_REALM: 'cogstack-realm',
-  KEYCLOAK_CLIENT_ID: 'cogstack-medcattrainer-frontend',
-  LOGOUT_REDIRECT_URI: 'http://launch.cogstack.localhost/',
-  KEYCLOAK_TOKEN_MIN_VALIDITY: 10000,
-  KEYCLOAK_TOKEN_REFRESH_INTERVAL: 30
+  KEYCLOAK_URL: '',
+  KEYCLOAK_REALM: '',
+  KEYCLOAK_CLIENT_ID: '',
+  LOGOUT_REDIRECT_URI: '',
+  KEYCLOAK_TOKEN_MIN_VALIDITY: 0,
+  KEYCLOAK_TOKEN_REFRESH_INTERVAL: 0
 };
 
 /**
diff --git a/medcat-trainer/webapp/scripts/nginx-entrypoint.sh b/medcat-trainer/webapp/scripts/nginx-entrypoint.sh
index 8d44f63cc..fecfb0fe7 100644
--- a/medcat-trainer/webapp/scripts/nginx-entrypoint.sh
+++ b/medcat-trainer/webapp/scripts/nginx-entrypoint.sh
@@ -3,30 +3,40 @@ set -e
 
 echo "Generating runtime config.json from template..."
 
-# Verify required environment variables are set
-if [ -z "$VITE_USE_OIDC" ]; then
-  echo "ERROR: VITE_USE_OIDC environment variable is required"
-  exit 1
-fi
-
-if [ -z "$VITE_KEYCLOAK_URL" ]; then
-  echo "ERROR: VITE_KEYCLOAK_URL environment variable is required"
-  exit 1
-fi
-
-if [ -z "$VITE_KEYCLOAK_REALM" ]; then
-  echo "ERROR: VITE_KEYCLOAK_REALM environment variable is required"
-  exit 1
-fi
-
-if [ -z "$VITE_KEYCLOAK_CLIENT_ID" ]; then
-  echo "ERROR: VITE_KEYCLOAK_CLIENT_ID environment variable is required"
-  exit 1
-fi
-
-if [ -z "$VITE_LOGOUT_REDIRECT_URI" ]; then
-  echo "ERROR: VITE_LOGOUT_REDIRECT_URI environment variable is required"
-  exit 1
+# Set VITE_USE_OIDC to 0 if not provided (traditional auth mode)
+export VITE_USE_OIDC="${VITE_USE_OIDC:-0}"
+
+# If OIDC is enabled, require all OIDC-related variables
+if [ "$VITE_USE_OIDC" = "1" ]; then
+  echo "OIDC mode enabled - validating OIDC environment variables..."
+
+  if [ -z "$VITE_KEYCLOAK_URL" ]; then
+    echo "ERROR: VITE_KEYCLOAK_URL environment variable is required when VITE_USE_OIDC=1"
+    exit 1
+  fi
+
+  if [ -z "$VITE_KEYCLOAK_REALM" ]; then
+    echo "ERROR: VITE_KEYCLOAK_REALM environment variable is required when VITE_USE_OIDC=1"
+    exit 1
+  fi
+
+  if [ -z "$VITE_KEYCLOAK_CLIENT_ID" ]; then
+    echo "ERROR: VITE_KEYCLOAK_CLIENT_ID environment variable is required when VITE_USE_OIDC=1"
+    exit 1
+  fi
+
+  if [ -z "$VITE_LOGOUT_REDIRECT_URI" ]; then
+    echo "ERROR: VITE_LOGOUT_REDIRECT_URI environment variable is required when VITE_USE_OIDC=1"
+    exit 1
+  fi
+
+else
+  echo "Traditional auth mode enabled (VITE_USE_OIDC=0)"
+  # Traditional auth mode - set defaults for unused variables
+  export VITE_KEYCLOAK_URL="${VITE_KEYCLOAK_URL:-http://localhost}"
+  export VITE_KEYCLOAK_REALM="${VITE_KEYCLOAK_REALM:-default}"
+  export VITE_KEYCLOAK_CLIENT_ID="${VITE_KEYCLOAK_CLIENT_ID:-medcattrainer}"
+  export VITE_LOGOUT_REDIRECT_URI="${VITE_LOGOUT_REDIRECT_URI:-/}"
 fi
 
 # Check if template exists