diff --git a/charts/enterprise/blocky/Chart.yaml b/charts/enterprise/blocky/Chart.yaml
index 5fd8bfe952a..0c1d843559a 100644
--- a/charts/enterprise/blocky/Chart.yaml
+++ b/charts/enterprise/blocky/Chart.yaml
@@ -26,7 +26,7 @@ sources:
   - https://0xerr0r.github.io/blocky/
   - https://github.com/0xERR0R/blocky
   - https://github.com/Mozart409/blocky-frontend
-version: 4.0.22
+version: 4.0.23
 annotations:
   truecharts.org/catagories: |
     - network
diff --git a/charts/enterprise/blocky/templates/_k8sgateway.tpl b/charts/enterprise/blocky/templates/_k8sgateway.tpl
index 7735013f760..87f4865b83b 100644
--- a/charts/enterprise/blocky/templates/_k8sgateway.tpl
+++ b/charts/enterprise/blocky/templates/_k8sgateway.tpl
@@ -78,7 +78,8 @@ data:
            fallthrough
         }
         {{- end }}
-        k8s_gateway "{{ required "Delegated domain ('domain') is mandatory " .domain }}" {
+        {{- end }}
+        k8s_gateway {{ range .Values.k8sgateway.domains }}"{{ required "Delegated domain ('domain') is mandatory " .domain }}"{{ end }} {
           apex {{ $values.apex | default $fqdn }}
           ttl {{ $values.ttl }}
           {{- if $values.secondary }}
@@ -89,7 +90,7 @@ data:
           {{- end }}
           fallthrough
         }
-        {{- end }}
+
         prometheus 0.0.0.0:9153
         {{- if .Values.k8sgateway.forward.enabled }}
         forward . {{ .Values.k8sgateway.forward.primary }} {{ .Values.k8sgateway.forward.secondary }} {
diff --git a/charts/stable/k8s-gateway/Chart.yaml b/charts/stable/k8s-gateway/Chart.yaml
index 7c8d306968e..8292e6f0cb7 100644
--- a/charts/stable/k8s-gateway/Chart.yaml
+++ b/charts/stable/k8s-gateway/Chart.yaml
@@ -21,7 +21,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/k8s-gateway
   - https://github.com/ori-edge/k8s_gateway
 type: application
-version: 8.0.9
+version: 8.0.10
 annotations:
   truecharts.org/catagories: |
     - networking
diff --git a/charts/stable/k8s-gateway/templates/_configmap.tpl b/charts/stable/k8s-gateway/templates/_configmap.tpl
index c91a06788b3..c13bc87007f 100644
--- a/charts/stable/k8s-gateway/templates/_configmap.tpl
+++ b/charts/stable/k8s-gateway/templates/_configmap.tpl
@@ -37,7 +37,8 @@ data:
            fallthrough
         }
         {{- end }}
-        k8s_gateway "{{ required "Delegated domain ('domain') is mandatory " .domain }}" {
+        {{- end }}
+        k8s_gateway {{ range .Values.domains }}"{{ required "Delegated domain ('domain') is mandatory " .domain }}"{{ end }} {
           apex {{ $values.apex | default $fqdn }}
           ttl {{ $values.ttl }}
           {{- if $values.secondary }}
@@ -48,7 +49,7 @@ data:
           {{- end }}
           fallthrough
         }
-        {{- end }}
+
         prometheus 0.0.0.0:9153
         {{- if .Values.forward.enabled }}
         forward . {{ .Values.forward.primary }} {{ .Values.forward.secondary }} {