diff --git a/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml b/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml
index 40ff8f420..ac3168209 100644
--- a/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml
+++ b/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml
@@ -244,6 +244,14 @@ spec:
               - targets: ["opnsense.${SECRET_CLUSTER_DOMAIN_ROOT}:9273"]
                 labels:
                   app: "opnsense"
+          - job_name: "hass"
+            scrape_interval: 60s
+            metrics_path: "/api/prometheus"
+            bearer_token: "${SECRET_HASS_TOKEN}"
+            static_configs:
+              - targets: ["home-assistant.home.svc.cluster.local:8123"]
+                labels:
+                  app: "hass"
           # Example scrape config for probing ingresses via the Blackbox Exporter.
           #
           # The relabeling allows the actual ingress scrape endpoint to be configured
@@ -258,16 +266,10 @@ spec:
             kubernetes_sd_configs:
               - role: ingress
             relabel_configs:
-              - source_labels:
-                  [__meta_kubernetes_ingress_annotation_prometheus_io_probe]
+              - source_labels: [__meta_kubernetes_ingress_annotation_prometheus_io_probe]
                 action: keep
                 regex: true
-              - source_labels:
-                  [
-                    __meta_kubernetes_ingress_scheme,
-                    __address__,
-                    __meta_kubernetes_ingress_path,
-                  ]
+              - source_labels: [__meta_kubernetes_ingress_scheme, __address__, __meta_kubernetes_ingress_path]
                 regex: (.+);(.+);(.+)
                 replacement: ${1}://${2}${3}
                 target_label: __param_target
@@ -289,12 +291,10 @@ spec:
             kubernetes_sd_configs:
               - role: service
             relabel_configs:
-              - source_labels:
-                  [__meta_kubernetes_service_annotation_prometheus_io_probe]
+              - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_probe]
                 action: keep
                 regex: true
-              - source_labels:
-                  [__meta_kubernetes_service_annotation_prometheus_io_protocol]
+              - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_protocol]
                 action: keep
                 regex: http
               - source_labels: [__address__]
@@ -317,12 +317,10 @@ spec:
             kubernetes_sd_configs:
               - role: service
             relabel_configs:
-              - source_labels:
-                  [__meta_kubernetes_service_annotation_prometheus_io_probe]
+              - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_probe]
                 action: keep
                 regex: true
-              - source_labels:
-                  [__meta_kubernetes_service_annotation_prometheus_io_protocol]
+              - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_protocol]
                 action: keep
                 regex: tcp
               - source_labels: [__address__]
@@ -340,10 +338,10 @@ spec:
         affinity:
           podAntiAffinity:
             requiredDuringSchedulingIgnoredDuringExecution:
-            - labelSelector:
-                matchExpressions:
-                - key: app
-                  operator: In
-                  values:
-                  - prometheus
-              topologyKey: "kubernetes.io/hostname"
\ No newline at end of file
+              - labelSelector:
+                  matchExpressions:
+                    - key: app
+                      operator: In
+                      values:
+                        - prometheus
+                topologyKey: "kubernetes.io/hostname"
diff --git a/cluster/base-custom/secrets/cluster-secrets.yaml b/cluster/base-custom/secrets/cluster-secrets.yaml
index a8fba33a4..6ae60c247 100644
--- a/cluster/base-custom/secrets/cluster-secrets.yaml
+++ b/cluster/base-custom/secrets/cluster-secrets.yaml
@@ -39,6 +39,7 @@ stringData:
     SECRET_HASS_LATITUDE: ENC[AES256_GCM,data:izfpG1NAYfwa1s4VPPiQRno=,iv:VYve/iaGWu9GjxcIvvYKEUoKGWFB5gGgyB7wUo36Brk=,tag:ApRKvjThSI6D1zPD6kAHZw==,type:str]
     SECRET_HASS_LONGITUDE: ENC[AES256_GCM,data:Mg5knjt8Pr0BzDHMy7puX34=,iv:243rKl1O8v+ZC8l+KZKCMeHe9d4cXDRjoN/U3xFbf58=,tag:NOZn8ol/+TCC5V7qPZLn9g==,type:str]
     SECRET_HASS_ELEVATION: ENC[AES256_GCM,data:3mM=,iv:DXnrd+piHbZuZxjUBkfYZRj80qpcK1+sxthmobSsptY=,tag:sSFj0MjdhEsZf8PNwlV1zw==,type:str]
+    SECRET_HASS_TOKEN: ENC[AES256_GCM,data:oUdrwiZHcBdwC5Vo9PMdsN4b90KF6lpk/P2ANzUotWJ1ebsxmHaBweTPT+4xl+66nf7pwLjZBP9qTealk1gbLHHne8y1f7HC+px1EaZYC8wYOxxJ7goWK0PqZMXLmV5s3Pk6HUv/NguGpkYRHuWUqomT4jl+OpwkNRgQxRx01JR3BBabxI1RtwRG+FVR8BWsPMhfFUkxOnZPp5tnUby3JKqIcsBGmVgPOTzVl/ZMs6klF+k0HT+G,iv:sRnbteAo0398SVpq7xML9rY+uQdaNd8cIZMRRRwWJ9s=,tag:swixBMkuVVDeGifIZSS66A==,type:str]
     SECRET_HEALTHCHECKS_DB_PASSWORD: ENC[AES256_GCM,data:imYaGmvuD/zBV3d/EAv6tQ==,iv:TQFaK2mMuHVwn7oX/jfKZ3A+yqfnHRIpPC9x21nyfQg=,tag:wp8PEw6I7k9GkwX7essE+A==,type:str]
     SECRET_HEALTHECKS_SECRET_KEY: ENC[AES256_GCM,data:jvAdgzQ/8s2euwI5LqXLqmhxaiZF/H8U4oKX6LwNnTU=,iv:tMCiJPZsdPsJPO0iwLe9GRQ6wunBHQ5JV+rRhk5OCuo=,tag:ZhQqmA/Ozk9C2/GR033LKQ==,type:str]
     SECRET_HEALTHCHECKS_SUPERUSER_EMAIL: ENC[AES256_GCM,data:VMr7m58Zq2DOzgg9V+ZdcAyQ3RPsjLDWmMhU,iv:Nlw/yprD6GiW0Yj09LAtakGscQ65wTUWFU+m8639i3M=,tag:W5YfjpWT+6j0chSXfrpXiA==,type:str]
@@ -73,8 +74,8 @@ sops:
     gcp_kms: []
     azure_kv: []
     hc_vault: []
-    lastmodified: '2021-04-21T08:33:46Z'
-    mac: ENC[AES256_GCM,data:WWZA9FlFQ2cskxDuzz3R6ks57km08N8R1N1+vnLaE8/7eCHizQzLU+nPqJv0S6zy+JdNsofd96kylm+YsFozDEGE+75d2i/6MDMApmJjOen6A9LrJBmXgLjHGrzegqhDxVon1T1slDRVg88Y95DQhA/TMUZtpCFXFYAmRSJGvzs=,iv:oF9KoGTDjXaYeJ/OznAAlVmTd1c3ci9bvy7uJT8HiC0=,tag:fdiH3fZ245LNYP98aGfEew==,type:str]
+    lastmodified: '2021-04-24T21:41:48Z'
+    mac: ENC[AES256_GCM,data:lq2maQ8R7tzFwiTK6fpQ+wZrJEYbAO3GuBDxsEEzTI79FoQEFTmr1vHwG6WWLg/immy9Yg9Ut3DINvYW/Z2Sz23382KZICsR8RECViSZLQFagaE7iHLV0TIEFr7DRc4VciFrzVwLaK8nOhDiFY3vL+9nG5O66WXazZ3FZ0C18KE=,iv:3gavCUYbEKcRYk1Cs8dgK43ENgyitiql/jJl8+i7rCc=,tag:rKPjeH8ylZ9QBB57yN14gw==,type:str]
     pgp:
     -   created_at: '2021-04-19T23:03:06Z'
         enc: |