diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index 7b2d3b5..b930db0 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: piTemperatureMonitoring
+name: pi-temperature-monitoring
 description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.
diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt
index 064954c..55c1293 100644
--- a/helm/templates/NOTES.txt
+++ b/helm/templates/NOTES.txt
@@ -6,16 +6,16 @@
   {{- end }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "piTemperatureMonitoring.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "pi-temperature-monitoring.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "piTemperatureMonitoring.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "piTemperatureMonitoring.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "pi-temperature-monitoring.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "pi-temperature-monitoring.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   echo http://$SERVICE_IP:{{ .Values.service.port }}
 {{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "piTemperatureMonitoring.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "pi-temperature-monitoring.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
index d2212cd..265c6df 100644
--- a/helm/templates/_helpers.tpl
+++ b/helm/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "piTemperatureMonitoring.name" -}}
+{{- define "pi-temperature-monitoring.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -10,7 +10,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "piTemperatureMonitoring.fullname" -}}
+{{- define "pi-temperature-monitoring.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "piTemperatureMonitoring.chart" -}}
+{{- define "pi-temperature-monitoring.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "piTemperatureMonitoring.labels" -}}
-helm.sh/chart: {{ include "piTemperatureMonitoring.chart" . }}
-{{ include "piTemperatureMonitoring.selectorLabels" . }}
+{{- define "pi-temperature-monitoring.labels" -}}
+helm.sh/chart: {{ include "pi-temperature-monitoring.chart" . }}
+{{ include "pi-temperature-monitoring.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "piTemperatureMonitoring.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "piTemperatureMonitoring.name" . }}
+{{- define "pi-temperature-monitoring.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "pi-temperature-monitoring.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "piTemperatureMonitoring.serviceAccountName" -}}
+{{- define "pi-temperature-monitoring.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "piTemperatureMonitoring.fullname" .) .Values.serviceAccount.name }}
+{{- default (include "pi-temperature-monitoring.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
diff --git a/helm/templates/daemon-set.yaml b/helm/templates/daemon-set.yaml
index e44df33..a51a315 100644
--- a/helm/templates/daemon-set.yaml
+++ b/helm/templates/daemon-set.yaml
@@ -1,13 +1,13 @@
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: {{ include "piTemperatureMonitoring.fullname" . }}
+  name: {{ include "pi-temperature-monitoring.fullname" . }}
   labels:
-    {{- include "piTemperatureMonitoring.labels" . | nindent 4 }}
+    {{- include "pi-temperature-monitoring.labels" . | nindent 4 }}
 spec:
   selector:
     matchLabels:
-      {{- include "piTemperatureMonitoring.selectorLabels" . | nindent 6 }}
+      {{- include "pi-temperature-monitoring.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -15,7 +15,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "piTemperatureMonitoring.selectorLabels" . | nindent 8 }}
+        {{- include "pi-temperature-monitoring.selectorLabels" . | nindent 8 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -23,7 +23,11 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          {{ if .Values.image.tag }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          {{ else }}
+          image: "{{ .Values.image.repository }}"
+          {{ end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: NODE_NAME
@@ -37,11 +41,27 @@ spec:
           livenessProbe:
             httpGet:
               path: /
-              port: http
+              port: prometheus
           readinessProbe:
             httpGet:
               path: /
-              port: http
+              port: prometheus
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-
+          volumeMounts:
+            - name: usrbin
+              mountPath: /usr/bin
+              readOnly: true
+            - name: libs
+              mountPath: /lib/aarch64-linux-gnu
+              readOnly: true
+            # Not clear how to do `--device /dev/vchiq` -
+            # https://stackoverflow.com/questions/59290752/how-to-use-device-dev-video0-with-kubernetes says
+            # it might not be possible?
+      volumes:
+        - name: usrbin
+          hostPath:
+            path: /usr/bin
+        - name: libs
+          hostPath:
+            path: /lib/aarch64-linux-gnu
diff --git a/helm/templates/service-monitor.yaml b/helm/templates/service-monitor.yaml
new file mode 100644
index 0000000..595bb9a
--- /dev/null
+++ b/helm/templates/service-monitor.yaml
@@ -0,0 +1,13 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    app: prometheus-operator
+    release: prometheus # Taken from https://cogarius.medium.com/3-3-complete-guide-to-ci-cd-pipelines-with-drone-io-on-kubernetes-drone-metrics-with-prometheus-c2668e42b03f
+  name: pi-temperature-monitoring
+spec:
+  endpoints:
+    - port: prometheus
+  selector:
+    matchLabels:
+      {{- include "pi-temperature-monitoring.selectorLabels" . | nindent 4 }}
\ No newline at end of file
diff --git a/helm/templates/service.yaml b/helm/templates/service.yaml
index 55ff318..155262d 100644
--- a/helm/templates/service.yaml
+++ b/helm/templates/service.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "piTemperatureMonitoring.fullname" . }}
+  name: {{ include "pi-temperature-monitoring.fullname" . }}
   labels:
-    {{- include "piTemperatureMonitoring.labels" . | nindent 4 }}
+    {{- include "pi-temperature-monitoring.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -12,4 +12,4 @@ spec:
       protocol: TCP
       name: prometheus
   selector:
-    {{- include "piTemperatureMonitoring.selectorLabels" . | nindent 4 }}
+    {{- include "pi-temperature-monitoring.selectorLabels" . | nindent 4 }}
diff --git a/helm/values.yaml b/helm/values.yaml
index 0827ee8..2634c9c 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -1,4 +1,4 @@
-# Default values for piTemperatureMonitoring.
+# Default values for pi-temperature-monitoring.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
@@ -6,9 +6,9 @@ replicaCount: 1
 
 image:
   repository: "gitea.scubbo.org/scubbo/pi-temperature-monitoring"
-  pullPolicy: IfNotPresent
+  pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
+  tag: "latest"
 
 imagePullSecrets: []
 nameOverride: ""
@@ -19,7 +19,8 @@ podAnnotations: {}
 podSecurityContext: {}
   # fsGroup: 2000
 
-securityContext: {}
+securityContext:
+  privileged: true
   # capabilities:
   #   drop:
   #   - ALL