diff --git a/bootstrap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/app/helmrelease.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/app/helmrelease.yaml.j2
index 32014eb1..0b7e519d 100644
--- a/bootstrap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/app/helmrelease.yaml.j2
+++ b/bootstrap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/app/helmrelease.yaml.j2
@@ -24,6 +24,5 @@ spec:
   uninstall:
     keepHistory: false
   values:
-    providerRegex: |
-      ^k(m|w)\d\d?$
+    providerRegex: ^(#{ (bootstrap_nodes.master + bootstrap_nodes.worker | default([])) | map(attribute='name') | join('|') }#)$
 #% endif %#
diff --git a/bootstrap/templates/kubernetes/talos/kubelet-csr-approver/kustomization.yaml b/bootstrap/templates/kubernetes/talos/kubelet-csr-approver/kustomization.yaml.j2
similarity index 80%
rename from bootstrap/templates/kubernetes/talos/kubelet-csr-approver/kustomization.yaml
rename to bootstrap/templates/kubernetes/talos/kubelet-csr-approver/kustomization.yaml.j2
index 700801f1..b23df682 100644
--- a/bootstrap/templates/kubernetes/talos/kubelet-csr-approver/kustomization.yaml
+++ b/bootstrap/templates/kubernetes/talos/kubelet-csr-approver/kustomization.yaml.j2
@@ -10,7 +10,7 @@ helmCharts:
     releaseName: kubelet-csr-approver
     namespace: kube-system
     valuesInline:
-      providerRegex: ^k(m|w)\d\d?$
+      providerRegex: ^(#{ (bootstrap_nodes.master + bootstrap_nodes.worker | default([])) | map(attribute='name') | join('|') }#)$
       bypassDnsResolution: true
 commonAnnotations:
   meta.helm.sh/release-name: kubelet-csr-approver