diff --git a/charts/dashboard/templates/dashboard-props-cm.yaml b/charts/dashboard/templates/dashboard-props-cm.yaml
index fbdfef7e..13255626 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.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 }}
+      "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 }}
     }
 
diff --git a/charts/dashboard/templates/deployment.yaml b/charts/dashboard/templates/deployment.yaml
index 23ba14bd..6c94e2ae 100644
--- a/charts/dashboard/templates/deployment.yaml
+++ b/charts/dashboard/templates/deployment.yaml
@@ -14,7 +14,7 @@ spec:
     matchLabels:
       app: dashboard
   revisionHistoryLimit: 3
-  replicas: "{{ required ".Values.dashboard.replicas missing" .Values.dashboard.replicas }}
+  replicas: "{{ required ".Values.replicas missing" .Values.replicas }}
   strategy:
     type: RollingUpdate
     rollingUpdate:
@@ -26,15 +26,15 @@ spec:
         app: dashboard
       annotations:
         checksum/props-cm: {{ include (print $.Template.BasePath "/dashboard-props-cm.yaml") . | sha256sum }}
-        imageDigest: {{ .Values.dashboard.image.digest | quote }}
+        imageDigest: {{ .Values.image.digest | quote }}
     spec:
       # The preStop hook below sleeps 30 seconds, extend the gracePeriod accordingly
       terminationGracePeriodSeconds: 60
       containers:
         - name: dashboard
-          image: "{{ required ".Values.dashboard.image.repository missing" .Values.dashboard.image.repository }}:{{ required ".Values.dashboard.image.tag missing" .Values.dashboard.image.tag }}"
-          # image: "{{ required ".Values.dashboard.image.repository missing" .Values.dashboard.image.repository }}@{{ .Values.image.digest }}"
-          imagePullPolicy: {{ required ".Values.dashboard.image.pullPolicy missing" .Values.dashboard.image.pullPolicy }}
+          image: "{{ required ".Values.image.repository missing" .Values.image.repository }}:{{ required ".Values.image.tag missing" .Values.image.tag }}"
+          # image: "{{ required ".Values.image.repository missing" .Values.image.repository }}@{{ .Values.image.digest }}"
+          imagePullPolicy: {{ required ".Values.image.pullPolicy missing" .Values.image.pullPolicy }}
           ports:
             - name: dashboard
               containerPort: 80
diff --git a/charts/dashboard/templates/ingress.yaml b/charts/dashboard/templates/ingress.yaml
index 738878b4..980c246d 100644
--- a/charts/dashboard/templates/ingress.yaml
+++ b/charts/dashboard/templates/ingress.yaml
@@ -12,7 +12,7 @@ metadata:
 spec:
   ingressClassName: {{ required ".Values.ingress.className missing" .Values.ingress.className }}
   rules:
-    - host: "test-{{ required ".Values.dashboard.host missing" .Values.dashboard.host }}"
+    - host: "test-{{ required ".Values.host missing" .Values.host }}"
       http:
         paths:
           - path: /
@@ -22,7 +22,7 @@ spec:
                 name: {{ .Release.Name }}-dashboard
                 port:
                   number: 80
-    - host: "*.test-{{ required ".Values.dashboard.host missing" .Values.dashboard.host }}"
+    - host: "*.test-{{ required ".Values.host missing" .Values.host }}"
       http:
         paths:
           - path: /
@@ -35,6 +35,6 @@ spec:
 
   tls:
     - hosts:
-        - "{{ required ".Values.dashboard.host missing" .Values.dashboard.host }}"
-        - "*.{{ required ".Values.dashboard.host missing" .Values.dashboard.host }}"
+        - "{{ required ".Values.host missing" .Values.host }}"
+        - "*.{{ required ".Values.host missing" .Values.host }}"
       secretName: "tls-{{ .Release.Name }}-dashboard"