diff --git a/bootstrap/templates/kubernetes/apps/kube-system/cilium/config/cilium-l2.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/cilium/config/cilium-l2.yaml.j2
index 7065f1fa..db6cd461 100644
--- a/bootstrap/templates/kubernetes/apps/kube-system/cilium/config/cilium-l2.yaml.j2
+++ b/bootstrap/templates/kubernetes/apps/kube-system/cilium/config/cilium-l2.yaml.j2
@@ -22,5 +22,5 @@ metadata:
 spec:
   allowFirstLastIPs: "Yes"
   blocks:
-    - cidr: "${NODE_CIDR}"
+    - cidr: "#{ bootstrap_node_network }#"
 #% endif %#
diff --git a/bootstrap/templates/kubernetes/apps/kube-system/cilium/config/cilium-l3.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/cilium/config/cilium-l3.yaml.j2
index fa51e2da..2b649ca9 100644
--- a/bootstrap/templates/kubernetes/apps/kube-system/cilium/config/cilium-l3.yaml.j2
+++ b/bootstrap/templates/kubernetes/apps/kube-system/cilium/config/cilium-l3.yaml.j2
@@ -36,5 +36,5 @@ metadata:
 spec:
   allowFirstLastIPs: "Yes"
   blocks:
-    - cidr: "${BGP_ADVERTISED_CIDR}"
+    - cidr: "#{ bootstrap_bgp.advertised_network }#"
 #% endif %#
diff --git a/bootstrap/templates/kubernetes/flux/apps.yaml.j2 b/bootstrap/templates/kubernetes/flux/apps.yaml.j2
index 2284be62..c4ebba99 100644
--- a/bootstrap/templates/kubernetes/flux/apps.yaml.j2
+++ b/bootstrap/templates/kubernetes/flux/apps.yaml.j2
@@ -22,10 +22,10 @@ spec:
       - kind: Secret
         name: cluster-secrets
       - kind: ConfigMap
-        name: cluster-settings-user
+        name: cluster-user-settings
         optional: true
       - kind: Secret
-        name: cluster-secrets-user
+        name: cluster-user-secrets
         optional: true
   patches:
     - patch: |-
@@ -45,10 +45,10 @@ spec:
               - kind: Secret
                 name: cluster-secrets
               - kind: ConfigMap
-                name: cluster-settings-user
+                name: cluster-user-settings
                 optional: true
               - kind: Secret
-                name: cluster-secrets-user
+                name: cluster-user-secrets
                 optional: true
       target:
         group: kustomize.toolkit.fluxcd.io
diff --git a/bootstrap/templates/kubernetes/flux/repositories/helm/prometheus-community.yaml.j2 b/bootstrap/templates/kubernetes/flux/repositories/helm/prometheus-community.yaml.j2
index 78c4f0c0..318a1a51 100644
--- a/bootstrap/templates/kubernetes/flux/repositories/helm/prometheus-community.yaml.j2
+++ b/bootstrap/templates/kubernetes/flux/repositories/helm/prometheus-community.yaml.j2
@@ -1,5 +1,4 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
 apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
diff --git a/bootstrap/templates/kubernetes/flux/vars/cluster-secrets.sops.yaml.j2 b/bootstrap/templates/kubernetes/flux/vars/cluster-secrets.sops.yaml.j2
index 71a496d7..549fad34 100644
--- a/bootstrap/templates/kubernetes/flux/vars/cluster-secrets.sops.yaml.j2
+++ b/bootstrap/templates/kubernetes/flux/vars/cluster-secrets.sops.yaml.j2
@@ -5,9 +5,10 @@ metadata:
   name: cluster-secrets
   namespace: flux-system
 stringData:
-  SECRET_EXAMPLE: Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit...
   #% if bootstrap_cloudflare.enabled %#
   SECRET_DOMAIN: "#{ bootstrap_cloudflare.domain }#"
   SECRET_ACME_EMAIL: "#{ bootstrap_cloudflare.acme.email }#"
   SECRET_CLOUDFLARE_TUNNEL_ID: "#{ bootstrap_cloudflare.tunnel.id }#"
+  #% else %#
+  SECRET_EXAMPLE: Global secrets for your cluster go in this file, this file is encrypted with sops
   #% endif %#
diff --git a/bootstrap/templates/kubernetes/flux/vars/cluster-settings.yaml.j2 b/bootstrap/templates/kubernetes/flux/vars/cluster-settings.yaml.j2
index f99c0e2b..b64f194e 100644
--- a/bootstrap/templates/kubernetes/flux/vars/cluster-settings.yaml.j2
+++ b/bootstrap/templates/kubernetes/flux/vars/cluster-settings.yaml.j2
@@ -5,7 +5,4 @@ metadata:
   name: cluster-settings
   namespace: flux-system
 data:
-  NODE_CIDR: "#{ bootstrap_node_network }#"
-  #% if bootstrap_bgp.enabled %#
-  BGP_ADVERTISED_CIDR: "#{ bootstrap_bgp.advertised_network }#"
-  #% endif %#
+  SETTING_EXAMPLE: Global settings for your cluster go in this file, this file is NOT encrypted