diff --git a/charts/dashboard/templates/dashboard-props-cm.yaml b/charts/dashboard/templates/dashboard-props-cm.yaml
index 13255626..fbdfef7e 100644
--- a/charts/dashboard/templates/dashboard-props-cm.yaml
+++ b/charts/dashboard/templates/dashboard-props-cm.yaml
@@ -11,11 +11,11 @@ metadata:
 data:
   appProps.json: |
     {
-      "authIssuerUrl": {{ required ".Values.oidcIssuerUrl" .Values.oidcIssuerUrl | quote }},
-      "authClientId": {{ required ".Values.oidcClientId" .Values.oidcClientId | quote }},
-      "currentHost": {{ required ".Values.juno.assetServerURL missing" .Values.juno.assetServerURL | quote}},
-      "apiEndpoint": {{ required ".Values.k8sApiEndpoint" .Values.k8sApiEndpoint | quote }},
-      "environment": {{ required ".Values.environment" .Values.environment | quote }},
-      "demoUserToken": {{ required ".Values.demoUser.token" .Values.demoUser.token | quote }}
+      "authIssuerUrl": {{ required ".Values.dashboard.oidcIssuerUrl" .Values.dashboard.oidcIssuerUrl | quote }},
+      "authClientId": {{ required ".Values.dashboard.oidcClientId" .Values.dashboard.oidcClientId | quote }},
+      "currentHost": {{ required ".Values.dashboard.juno.assetServerURL missing" .Values.dashboard.juno.assetServerURL | quote}},
+      "apiEndpoint": {{ required ".Values.dashboard.k8sApiEndpoint" .Values.dashboard.k8sApiEndpoint | quote }},
+      "environment": {{ required ".Values.dashboard.environment" .Values.dashboard.environment | quote }},
+      "demoUserToken": {{ required ".Values.dashboard.demoUser.token" .Values.dashboard.demoUser.token | quote }}
     }
 
diff --git a/charts/dashboard/templates/deployment.yaml b/charts/dashboard/templates/deployment.yaml
index 2024a8e0..d262c54e 100644
--- a/charts/dashboard/templates/deployment.yaml
+++ b/charts/dashboard/templates/deployment.yaml
@@ -31,8 +31,8 @@ spec:
       terminationGracePeriodSeconds: 60
       containers:
         - name: dashboard
-          image: "{{ required ".Values.image.repository missing" .Values.image.repository }}:{{ required ".Values.image.tag missing" .Values.image.tag }}"
-          imagePullPolicy: {{ required ".Values.image.pullPolicy missing" .Values.image.pullPolicy }}
+          image: "{{ required ".Values.dashboard.image.repository missing" .Values.dashboard.image.repository }}:{{ required ".Values.dashboard.image.tag missing" .Values.dashboard.image.tag }}"
+          imagePullPolicy: {{ required ".Values.dashboard.image.pullPolicy missing" .Values.dashboard.image.pullPolicy }}
           ports:
             - name: dashboard
               containerPort: 80
diff --git a/charts/dashboard/templates/ingress.yaml b/charts/dashboard/templates/ingress.yaml
index 6d393ab8..07e032e2 100644
--- a/charts/dashboard/templates/ingress.yaml
+++ b/charts/dashboard/templates/ingress.yaml
@@ -10,9 +10,9 @@ metadata:
   annotations:
     kubernetes.io/tls-acme: "true"
 spec:
-  ingressClassName: {{ required ".Values.ingress.className missing" .Values.ingress.className }}
+  ingressClassName: {{ required ".Values.dashboard.ingress.className missing" .Values.dashboard.ingress.className }}
   rules:
-    - host: "test-{{ required ".Values.host missing" .Values.host }}"
+    - host: "test-{{ required ".Values.dashboard.host missing" .Values.dashboard.host }}"
       http:
         paths:
           - path: /
@@ -22,7 +22,7 @@ spec:
                 name: {{ .Release.Name }}-dashboard
                 port:
                   number: 80
-    - host: "*.{{ required ".Values.host missing" .Values.host }}"
+    - host: "*.{{ required ".Values.dashboard.host missing" .Values.dashboard.host }}"
       http:
         paths:
           - path: /
@@ -35,6 +35,6 @@ spec:
 
   tls:
     - hosts:
-        - "{{ required ".Values.host missing" .Values.host }}"
-        - "*.{{ required ".Values.host missing" .Values.host }}"
+        - "{{ required ".Values.dashboard.host missing" .Values.dashboard.host }}"
+        - "*.{{ required ".Values.dashboard.host missing" .Values.dashboard.host }}"
       secretName: "tls-{{ .Release.Name }}-dashboard"