diff --git a/bootstrap/templates/addons/kube-prometheus-stack/app/helmvalues.yaml.j2 b/bootstrap/templates/addons/kube-prometheus-stack/app/helmvalues.yaml.j2
index 43ce08ec..e022d5a4 100644
--- a/bootstrap/templates/addons/kube-prometheus-stack/app/helmvalues.yaml.j2
+++ b/bootstrap/templates/addons/kube-prometheus-stack/app/helmvalues.yaml.j2
@@ -62,7 +62,7 @@ data:
             regex: (apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket)
     kubeControllerManager:
       enabled: true
-      endpoints: &cp
+      endpoints:
       {% for item in bootstrap_nodes.master %}
         - {{ item.address }}
       {% endfor %}
@@ -74,10 +74,16 @@ data:
             regex: "(apiserver_audit|apiserver_client|apiserver_delegated|apiserver_envelope|apiserver_storage|apiserver_webhooks|attachdetach_controller|authenticated_user|authentication|cronjob_controller|disabled_metric|endpoint_slice|ephemeral_volume|garbagecollector_controller|get_token|go|hidden_metric|job_controller|kubernetes_build|kubernetes_feature|leader_election|node_collector|node_ipam|process_cpu|process_max|process_open|process_resident|process_start|process_virtual|pv_collector|registered_metric|replicaset_controller|rest_client|retroactive_storageclass|root_ca|running_managed|scrape_duration|scrape_samples|scrape_series|service_controller|storage_count|storage_operation|ttl_after|volume_operation|workqueue)_(.+)"
     kubeEtcd:
       enabled: true
-      endpoints: *cp
+      endpoints:
+      {% for item in bootstrap_nodes.master %}
+        - {{ item.address }}
+      {% endfor %}
     kubeScheduler:
       enabled: true
-      endpoints: *cp
+      endpoints:
+      {% for item in bootstrap_nodes.master %}
+        - {{ item.address }}
+      {% endfor %}
       serviceMonitor:
         metricRelabelings:
           # Remove duplicate labels provided by k3s
@@ -95,10 +101,10 @@ data:
           hajimari.io/icon: simple-icons:prometheus
         pathType: Prefix
         hosts:
-          - &host "prometheus.${SECRET_DOMAIN}"
+          - "prometheus.${SECRET_DOMAIN}"
         tls:
           - hosts:
-              - *host
+              - "prometheus.${SECRET_DOMAIN}"
       prometheusSpec:
         ruleSelectorNilUsesHelmValues: false
         serviceMonitorSelectorNilUsesHelmValues: false
diff --git a/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmvalues.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmvalues.yaml.j2
index 798e02d5..6da68b2b 100644
--- a/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmvalues.yaml.j2
+++ b/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmvalues.yaml.j2
@@ -52,10 +52,10 @@ data:
           annotations:
             hajimari.io/icon: simple-icons:cilium
           hosts:
-            - &host "hubble.${SECRET_DOMAIN}"
+            - "hubble.${SECRET_DOMAIN}"
           tls:
             - hosts:
-                - *host
+                - "hubble.${SECRET_DOMAIN}"
     ipam:
       mode: kubernetes
     ipv4NativeRoutingCIDR: "${CLUSTER_CIDR}"