diff --git a/charts/application-hub/Chart.yaml b/charts/application-hub/Chart.yaml
index 8817eac..56edc0d 100644
--- a/charts/application-hub/Chart.yaml
+++ b/charts/application-hub/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.0.57
+version: 2.0.58
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/application-hub/files/hub/jupyter_config.py b/charts/application-hub/files/hub/jupyter_config.py
index 76a1114..126517f 100644
--- a/charts/application-hub/files/hub/jupyter_config.py
+++ b/charts/application-hub/files/hub/jupyter_config.py
@@ -168,7 +168,8 @@ async def pre_spawn_start(self, user, spawner):
 
 
 jupyterhub_env = os.environ["JUPYTERHUB_ENV"].upper()
-jupyterhub_hub_host = "application-hub-hub.proc"
+app_hub_namespace = os.getenv("APP_HUB_NAMESPACE", "app-hub")
+jupyterhub_hub_host = f"application-hub-hub.{app_hub_namespace}"
 jupyterhub_single_user_image = os.environ["JUPYTERHUB_SINGLE_USER_IMAGE_NOTEBOOKS"]
 
 resource_manager_workspace_prefix = os.environ["RESOURCE_MANAGER_WORKSPACE_PREFIX"]
@@ -235,7 +236,7 @@ async def pre_spawn_start(self, user, spawner):
 c.KubeSpawner.node_selector = {"node-role.kubernetes.io/worker": "true"}
 
 # Namespace
-c.KubeSpawner.namespace = "proc"
+c.KubeSpawner.namespace = app_hub_namespace
 
 # User namespace
 c.KubeSpawner.enable_user_namespaces = True
diff --git a/charts/application-hub/values.yaml b/charts/application-hub/values.yaml
index 3d856ec..5956cd6 100644
--- a/charts/application-hub/values.yaml
+++ b/charts/application-hub/values.yaml
@@ -156,6 +156,7 @@ jupyterhub:
     extraEnv: 
       JUPYTERHUB_ENV: "dev"
       JUPYTERHUB_SINGLE_USER_IMAGE_NOTEBOOKS: "jupyter/minimal-notebook:2343e33dec46"
+      APP_HUB_NAMESPACE: "app-hub"
       STORAGE_CLASS: "managed-nfs-storage"
       RESOURCE_MANAGER_WORKSPACE_PREFIX: "develop-user"