diff --git a/charts/iperf3-monitor/grafana/iperf3-dashboard.json b/charts/iperf3-monitor/grafana/iperf3-dashboard.json
deleted file mode 100644
index 58c2b3f..0000000
--- a/charts/iperf3-monitor/grafana/iperf3-dashboard.json
+++ /dev/null
@@ -1,194 +0,0 @@
-{
-"__inputs": [],
-"__requires": [
-{
-"type": "grafana",
-"id": "grafana",
-"name": "Grafana",
-"version": "8.0.0"
-},
-{
-"type": "datasource",
-"id": "prometheus",
-"name": "Prometheus",
-"version": "1.0.0"
-}
-],
-"annotations": {
-"list": [
-{
-"builtIn": 1,
-"datasource": {
-"type": "grafana",
-"uid": "-- Grafana --"
-},
-"enable": true,
-"hide": true,
-"iconColor": "rgba(0, 211, 255, 1)",
-"name": "Annotations & Alerts",
-"type": "dashboard"
-}
-]
-},
-"editable": true,
-"fiscalYearStartMonth": 0,
-"gnetId": null,
-"graphTooltip": 0,
-"id": null,
-"links": [],
-"panels": [
-{
-"datasource": {
-"type": "prometheus",
-"uid": "prometheus"
-},
-"gridPos": {
-"h": 9,
-"w": 24,
-"x": 0,
-"y": 0
-},
-"id": 2,
-"targets": [
-{
-"expr": "avg(iperf_network_bandwidth_mbps) by (source_node, destination_node)",
-"format": "heatmap",
-"legendFormat": "{{source_node}} -> {{destination_node}}",
-"refId": "A"
-}
-],
-"cards": { "cardPadding": null, "cardRound": null },
-"color": {
-"mode": "spectrum",
-"scheme": "red-yellow-green",
-"exponent": 0.5,
-"reverse": false
-},
-"dataFormat": "tsbuckets",
-"yAxis": { "show": true, "format": "short" },
-"xAxis": { "show": true }
-},
-{
-"title": "Bandwidth Over Time (Source: $source_node, Dest: $destination_node)",
-"type": "timeseries",
-"datasource": {
-"type": "prometheus",
-"uid": "prometheus"
-},
-"gridPos": {
-"h": 8,
-"w": 12,
-"x": 0,
-"y": 9
-},
-"targets": [
-{
-"expr": "iperf_network_bandwidth_mbps{source_node=~\"^$source_node$\", destination_node=~\"^$destination_node$\", protocol=~\"^$protocol$\"}",
-"legendFormat": "Bandwidth",
-"refId": "A"
-}
-],
-"fieldConfig": {
-"defaults": {
-"unit": "mbps"
-}
-}
-},
-{
-"title": "Jitter Over Time (Source: $source_node, Dest: $destination_node)",
-"type": "timeseries",
-"datasource": {
-"type": "prometheus",
-"uid": "prometheus"
-},
-"gridPos": {
-"h": 8,
-"w": 12,
-"x": 12,
-"y": 9
-},
-"targets": [
-{
-"expr": "iperf_network_jitter_ms{source_node=~\"^$source_node$\", destination_node=~\"^$destination_node$\", protocol=\"udp\"}",
-"legendFormat": "Jitter",
-"refId": "A"
-}
-],
-"fieldConfig": {
-"defaults": {
-"unit": "ms"
-}
-}
-}
-],
-"refresh": "30s",
-"schemaVersion": 36,
-"style": "dark",
-"tags": ["iperf3", "network", "kubernetes"],
-"templating": {
-"list": [
-{
-"current": {},
-"datasource": {
-"type": "prometheus",
-"uid": "prometheus"
-},
-"definition": "label_values(iperf_network_bandwidth_mbps, source_node)",
-"hide": 0,
-"includeAll": false,
-"multi": false,
-"name": "source_node",
-"options": [],
-"query": "label_values(iperf_network_bandwidth_mbps, source_node)",
-"refresh": 1,
-"regex": "",
-"skipUrlSync": false,
-"sort": 1,
-"type": "query"
-},
-{
-"current": {},
-"datasource": {
-"type": "prometheus",
-"uid": "prometheus"
-},
-"definition": "label_values(iperf_network_bandwidth_mbps{source_node=~\"^$source_node$\"}, destination_node)",
-"hide": 0,
-"includeAll": false,
-"multi": false,
-"name": "destination_node",
-"options": [],
-"query": "label_values(iperf_network_bandwidth_mbps{source_node=~\"^$source_node$\"}, destination_node)",
-"refresh": 1,
-"regex": "",
-"skipUrlSync": false,
-"sort": 1,
-"type": "query"
-},
-{
-"current": { "selected": true, "text": "tcp", "value": "tcp" },
-"hide": 0,
-"includeAll": false,
-"multi": false,
-"name": "protocol",
-"options": [
-{ "selected": true, "text": "tcp", "value": "tcp" },
-{ "selected": false, "text": "udp", "value": "udp" }
-],
-"query": "tcp,udp",
-"skipUrlSync": false,
-"type": "custom"
-}
-]
-},
-"time": {
-"from": "now-1h",
-"to": "now"
-},
-"timepicker": {},
-"timezone": "browser",
-"title": "Kubernetes iperf3 Network Performance",
-"uid": "k8s-iperf3-dashboard",
-"version": 1,
-"weekStart": ""
-}
diff --git a/charts/iperf3-monitor/templates/exporter-controller.yaml b/charts/iperf3-monitor/templates/exporter-controller.yaml
index 3fa7673..dffa5b1 100644
--- a/charts/iperf3-monitor/templates/exporter-controller.yaml
+++ b/charts/iperf3-monitor/templates/exporter-controller.yaml
@@ -124,6 +124,6 @@ Ensure defaultPodOptionsStrategy exists, as common lib expects it at the root of
 Call the common library's main render function for controllers.
 This function iterates through all controllers defined under $localValues.controllers
 (in our case, just "exporter") and renders them using their specified type and configuration.
-The context passed must mirror the global Helm context, including 'Values', 'Chart', 'Release', and 'Capabilities'.
+The context passed must mirror the global Helm context, including 'Values', 'Chart', 'Release', 'Capabilities', and 'Template'.
 */}}
-{{- include "bjw-s.common.render.controllers" (dict "Values" $localValues "Chart" $chart "Release" $release "Capabilities" .Capabilities) | nindent 0 -}}
+{{- include "bjw-s.common.render.controllers" (dict "Values" $localValues "Chart" $chart "Release" $release "Capabilities" .Capabilities "Template" .Template) | nindent 0 -}}
diff --git a/charts/iperf3-monitor/templates/grafana-dashboard-configmap.yaml b/charts/iperf3-monitor/templates/grafana-dashboard-configmap.yaml
deleted file mode 100644
index f28b429..0000000
--- a/charts/iperf3-monitor/templates/grafana-dashboard-configmap.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Release.Name }}-grafana-dashboard
-  labels:
-    grafana_dashboard: "1"
-    app.kubernetes.io/name: {{ include "iperf3-monitor.name" . }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-data:
-  iperf3-dashboard.json: |
-    {{ .Files.Get "grafana/iperf3-dashboard.json" | nindent 4 }}