diff --git a/setup/cluster-nodes/patch.templates/controlplane.yaml b/setup/cluster-nodes/patch.templates/controlplane.yaml
index 821040c..afc2d72 100644
--- a/setup/cluster-nodes/patch.templates/controlplane.yaml
+++ b/setup/cluster-nodes/patch.templates/controlplane.yaml
@@ -1,7 +1,7 @@
 machine:
   install:
     disk: {{ index .cluster.nodes.active "{{NODE_NAME}}" "disk" }}
-    image: factory.talos.dev/metal-installer/{{ .cluster.nodes.talos.schematicId}}:{{ .cluster.nodes.talos.version}}
+    image: factory.talos.dev/metal-installer/{{SCHEMATIC_ID}}:{{VERSION}}
   network:
     hostname: "{{NODE_NAME}}"
     interfaces:
diff --git a/setup/cluster-services/README.md b/setup/cluster-services/README.md
index a23d906..2d0f6a7 100644
--- a/setup/cluster-services/README.md
+++ b/setup/cluster-services/README.md
@@ -1,6 +1,6 @@
 # Infrastructure setup scripts
 
-Creates a fully functional personal cloud infrastructure on a bare metal Kubernetes (k3s) cluster that provides:
+Creates a fully functional personal cloud infrastructure on a bare metal Kubernetes cluster that provides:
 
 1. **External access** to services via configured domain names (using ${DOMAIN})
 2. **Internal-only access** to admin interfaces (via internal.${DOMAIN} subdomains)
diff --git a/setup/cluster-services/coredns/install.sh b/setup/cluster-services/coredns/install.sh
index 9895095..6a3d31d 100755
--- a/setup/cluster-services/coredns/install.sh
+++ b/setup/cluster-services/coredns/install.sh
@@ -14,7 +14,7 @@ fi
 CLUSTER_SETUP_DIR="${WC_HOME}/setup/cluster-services"
 COREDNS_DIR="${CLUSTER_SETUP_DIR}/coredns"
 
-print_header "Setting up CoreDNS for k3s"
+print_header "Setting up CoreDNS"
 
 # Templates should already be compiled by wild-cluster-services-generate
 echo "Using pre-compiled CoreDNS templates..."
@@ -23,7 +23,8 @@ if [ ! -d "${COREDNS_DIR}/kustomize" ]; then
     exit 1
 fi
 
-# Apply the k3s-compatible custom DNS override (k3s will preserve this)
+# Apply the custom DNS override
+# TODO: Is this needed now that we are no longer on k3s?
 echo "Applying CoreDNS custom override configuration..."
 kubectl apply -f "${COREDNS_DIR}/kustomize/coredns-custom-config.yaml"