diff --git a/charts/stable/wireguard/Chart.yaml b/charts/stable/wireguard/Chart.yaml
index 89a11571cf9..53ded84a371 100644
--- a/charts/stable/wireguard/Chart.yaml
+++ b/charts/stable/wireguard/Chart.yaml
@@ -37,5 +37,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/wireguard
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/wireguard
 type: application
-version: 11.6.0
-
+version: 11.6.1
diff --git a/charts/stable/wireguard/templates/_configmap.tpl b/charts/stable/wireguard/templates/_configmap.tpl
index 0763b8b84b6..c70f0bccd57 100644
--- a/charts/stable/wireguard/templates/_configmap.tpl
+++ b/charts/stable/wireguard/templates/_configmap.tpl
@@ -6,15 +6,10 @@ data:
   IPTABLES_BACKEND: nft
   KILLSWITCH: {{ .Values.wg.killswitch | quote }}
   {{- if .Values.wg.killswitch }}
-    {{- $excludedIP4net := "172.16.0.0/12" }}
-    {{- range .Values.wg.excludedIP4networks }}
-      {{- $excludedIP4net = ( printf "%v;%v" $excludedIP4net . ) }}
-    {{- end }}
+    {{- $excludedIP4Networks := prepend .Values.wg.excludedIP4networks .Values.chartContext.podCIDR }}
+    {{- $excludedIP4net := (join ";" $excludedIP4Networks) }}
   KILLSWITCH_EXCLUDEDNETWORKS_IPV4: {{ $excludedIP4net | quote }}
-    {{- $excludedIP6net := "" }}
-    {{- range .Values.wg.excludedIP6networks }}
-      {{- $excludedIP6net = ( printf "%v;%v" $excludedIP6net . ) }}
-    {{- end }}
-  KILLSWITCH_EXCLUDEDNETWORKS_IPV6: {{ $excludedIP4net | quote }}
+    {{- $excludedIP6net := (join ";" .Values.wg.excludedIP6networks) }}
+  KILLSWITCH_EXCLUDEDNETWORKS_IPV6: {{ $excludedIP6net | quote }}
   {{- end }}
 {{- end -}}