diff --git a/charts/home-assistant/Chart.yaml b/charts/home-assistant/Chart.yaml
index b5a86c5..1067b2e 100644
--- a/charts/home-assistant/Chart.yaml
+++ b/charts/home-assistant/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.4
+version: 0.1.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/home-assistant/templates/_common.tpl b/charts/home-assistant/templates/_common.tpl
deleted file mode 100644
index a208358..0000000
--- a/charts/home-assistant/templates/_common.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-{{/*
-Create HomeAssistant app version
-*/}}
-{{- define "home-assistant.defaultTag" -}}
-{{- default .Chart.AppVersion .Values.image.tag }}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "home-assistant.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Return valid version label
-*/}}
-{{- define "home-assistant.versionLabelValue" -}}
-{{ regexReplaceAll "[^-A-Za-z0-9_.]" (include "home-assistant.defaultTag" .) "-" | trunc 63 | trimAll "-" | trimAll "_" | trimAll "." | quote }}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "home-assistant.labels" -}}
-helm.sh/chart: {{ include "home-assistant.chart" .context }}
-{{ include "home-assistant.selectorLabels" (dict "context" .context "component" .component "name" .name) }}
-app.kubernetes.io/managed-by: {{ .context.Release.Service }}
-app.kubernetes.io/part-of: home-assistant
-app.kubernetes.io/version: {{ include "home-assistant.versionLabelValue" .context }}
-{{- with .context.Values.additionalLabels }}
-{{ toYaml . }}
-{{- end }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "home-assistant.selectorLabels" -}}
-{{- if .name -}}
-app.kubernetes.io/name: {{ include "home-assistant.name" .context }}-{{ .name }}
-{{ end -}}
-app.kubernetes.io/instance: {{ .context.Release.Name }}
-{{- if .component }}
-app.kubernetes.io/component: {{ .component }}
-{{- end }}
-{{- end }}
diff --git a/charts/home-assistant/templates/servicemonitor.yaml b/charts/home-assistant/templates/servicemonitor.yaml
index 22abeb2..3687575 100644
--- a/charts/home-assistant/templates/servicemonitor.yaml
+++ b/charts/home-assistant/templates/servicemonitor.yaml
@@ -41,7 +41,7 @@ spec:
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}
-  selector:
-    matchLabels:
-      {{- include "home-assistant.selectorLabels" (dict "context" . "component" .Values.name "name" (printf "%s-metrics" .Values.name)) | nindent 6 }}
+  # selector:
+  #   matchLabels:
+  #     {{- include "home-assistant.selectorLabels" (dict "context" . "component" .Values.name "name" (printf "%s-metrics" .Values.name)) | nindent 6 }}
 {{- end }}