diff --git a/charts/codezero/Chart.yaml b/charts/codezero/Chart.yaml
index bac7f7c..501ec0c 100644
--- a/charts/codezero/Chart.yaml
+++ b/charts/codezero/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: 0.1.0
+version: 0.1.2
 
 # 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/codezero/templates/orchestrator/deployment.yaml b/charts/codezero/templates/orchestrator/deployment.yaml
index 4f42842..1638de4 100644
--- a/charts/codezero/templates/orchestrator/deployment.yaml
+++ b/charts/codezero/templates/orchestrator/deployment.yaml
@@ -38,6 +38,10 @@ spec:
               value: /etc/ssl/certs/space/tls.pem
             - name: CZ_CLUSTER_CERT_KEY
               value: /etc/ssl/certs/space/tls.key
+            {{- if .Values.codezero.hub.url }}
+            - name: CZ_HUB_URL
+              value: {{ .Values.codezero.hub.url }}/
+            {{- end }}
             - name: CZ_PORT
               value: '8900'
             - name: NODE_ENV
diff --git a/charts/codezero/templates/system/deployment.yaml b/charts/codezero/templates/system/deployment.yaml
index a4d05db..d33a28a 100644
--- a/charts/codezero/templates/system/deployment.yaml
+++ b/charts/codezero/templates/system/deployment.yaml
@@ -32,6 +32,10 @@ spec:
               value: /etc/ssl/certs/space/tls.pem
             - name: CZ_CLUSTER_CERT_KEY
               value: /etc/ssl/certs/space/tls.key
+            {{- if .Values.codezero.hub.url }}
+            - name: CZ_HUB_URL
+              value: {{ .Values.codezero.hub.url }}
+            {{- end }}
             - name: CZ_SPACE_ID
               valueFrom:
                 configMapKeyRef:
diff --git a/charts/codezero/templates/system/secret.yaml b/charts/codezero/templates/system/secret.yaml
index 95c8755..74e9d9e 100644
--- a/charts/codezero/templates/system/secret.yaml
+++ b/charts/codezero/templates/system/secret.yaml
@@ -7,7 +7,4 @@ kind: Secret
 metadata:
   name: {{ include "system.fullname" . }}
 data:
-  {{- if .Values.codezero.hub.url }}
-  CZ_HUB_URL: {{ .Values.codezero.hub.url | b64enc }}
-  {{- end }}
   CZ_HUB_SPACE_TOKEN: {{ .Values.codezero.space.token | b64enc }}