diff --git a/chronos-umbrella/templates/NOTES.txt b/chronos-umbrella/templates/NOTES.txt
index 6bbb75c..879d855 100644
--- a/chronos-umbrella/templates/NOTES.txt
+++ b/chronos-umbrella/templates/NOTES.txt
@@ -12,14 +12,3 @@
   $ helm -n {{.Release.Namespace}} get all {{ .Release.Name }}
   $ watch kubectl -n {{.Release.Namespace}} get pods
 
-You can attach to:
-* Aether CLI pod with
-$ kubectl -n {{.Release.Namespace}} exec -it $(kubectl -n {{.Release.Namespace}} get pods -l type=cli -o name) -- /bin/sh
-* Aether Portal at http://<server_IP>:31190
-
-If you are using KinD as a Kubernetes server, you will have to use a "port-forward" to access the Aether ROC GUI e.g.
-$ kubectl -n {{.Release.Namespace}} port-forward service/aether-roc-gui 8183:80
-and then access the GUI at
-* http://localhost:8183
-
-The aether-roc-api is then available at http://localhost:8183/aether-roc-api
diff --git a/chronos-umbrella/templates/dashboards-templated.yaml b/chronos-umbrella/templates/dashboards-templated.yaml
new file mode 100644
index 0000000..ec7f7cd
--- /dev/null
+++ b/chronos-umbrella/templates/dashboards-templated.yaml
@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-dashboards-templated
+  namespace: {{ .Release.Namespace }}
+  labels:
+          chronos_dashboard: "chronos-dashboard"
+data:
+{{ (.Files.Glob "files/dashboards/**/*.json").AsConfig | indent 2 }}
diff --git a/chronos-umbrella/templates/datasources-templated.yaml b/chronos-umbrella/templates/datasources-templated.yaml
new file mode 100644
index 0000000..8268d68
--- /dev/null
+++ b/chronos-umbrella/templates/datasources-templated.yaml
@@ -0,0 +1,24 @@
+# SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-datasources-templated
+  namespace: {{ .Release.Namespace }}
+  labels:
+          chronos_datasource: "chronos-datasource"
+data:
+  prom-datasources.yaml: |
+     apiVersion: 1
+     datasources:
+     {{- range .Values.grafana.source }}
+     - name: datasource-{{ .name }}
+       url: {{ .protocol }}://{{ .service }}:{{ .port }}
+       type: prometheus
+       access: proxy
+       jsonData:
+         oauthPassThru: true
+     {{- end }}
+