diff --git a/group_vars/all.yml b/group_vars/all.yml
index 77eed46..7ce51aa 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -1,6 +1,8 @@
 ---
 ansible_user: pirate
-helm_arch: arm
+
+# For a 32-bit OS, set to 'arm'. For 64-bit OS, set to 'arm64'.
+helm_arch: arm64
 
 # Turing Pi.
 # ingress_server_ip: 10.0.100.74
diff --git a/roles/cluster_monitoring/defaults/main.yml b/roles/cluster_monitoring/defaults/main.yml
index ca3fa02..dd99fb4 100644
--- a/roles/cluster_monitoring/defaults/main.yml
+++ b/roles/cluster_monitoring/defaults/main.yml
@@ -1,8 +1,10 @@
 ---
 # The version of the cluster-monitoring repo to check out. See commits:
 # https://github.com/carlosedp/cluster-monitoring/commits/master
-cluster_monitoring_version: 5b75c81
+cluster_monitoring_version: 40c9318
 
 # Whether to force updating the cluster-monitoring repository. Set this to true
 # if you change the cluster_monitoring_version above.
 cluster_monitoring_update_repo: false
+
+grafana_from_email: myemail@example.com
diff --git a/roles/cluster_monitoring/templates/vars.jsonnet.j2 b/roles/cluster_monitoring/templates/vars.jsonnet.j2
index 5564af6..6de19dc 100644
--- a/roles/cluster_monitoring/templates/vars.jsonnet.j2
+++ b/roles/cluster_monitoring/templates/vars.jsonnet.j2
@@ -60,6 +60,6 @@
 
   // Grafana "from" email
   grafana: {
-    from_address: 'myemail@example.com',
+    from_address: '{{ grafana_from_email }}',
   },
 }