diff --git a/backend/common/core/config.py b/backend/common/core/config.py
index 4e09c201..df7efba0 100644
--- a/backend/common/core/config.py
+++ b/backend/common/core/config.py
@@ -28,7 +28,9 @@ class Settings(BaseSettings):
         extra="ignore",
     )
     PROJECT_NAME: str = "SQLBot"
-    API_V1_STR: str = "/api/v1"
+    #CONTEXT_PATH: str = "/sqlbot"
+    CONTEXT_PATH: str = ""
+    API_V1_STR: str = CONTEXT_PATH + "/api/v1"
     SECRET_KEY: str = secrets.token_urlsafe(32)
     # 60 minutes * 24 hours * 8 days = 8 days
     ACCESS_TOKEN_EXPIRE_MINUTES: int = 60 * 24 * 8
diff --git a/backend/common/utils/whitelist.py b/backend/common/utils/whitelist.py
index 8a11d1d2..9080062e 100644
--- a/backend/common/utils/whitelist.py
+++ b/backend/common/utils/whitelist.py
@@ -67,6 +67,13 @@ def is_whitelisted(self, path: str) -> bool:
         prefix = settings.API_V1_STR
         if path.startswith(prefix):
             path = path[len(prefix):]
+            
+        context_prefix = settings.CONTEXT_PATH
+        if context_prefix and path.startswith(context_prefix):
+            path = path[len(context_prefix):]
+        
+        if not path:
+            path = '/'
         if path in self.whitelist:
             return True