diff --git a/k8s/manifests/charts/ck-loadbalancer/templates/cilium/bgp-policy.yaml b/k8s/manifests/charts/ck-loadbalancer/templates/cilium/bgp-policy.yaml
index 89ec08ae76..42e8b5979f 100644
--- a/k8s/manifests/charts/ck-loadbalancer/templates/cilium/bgp-policy.yaml
+++ b/k8s/manifests/charts/ck-loadbalancer/templates/cilium/bgp-policy.yaml
@@ -1,10 +1,10 @@
-{{- if (.Values.bgp.enabled) }}
 {{- if (eq .Values.driver "cilium") }}
+{{- if (.Values.bgp.enabled) }}
 
 apiVersion: "cilium.io/v2alpha1"
 kind: CiliumBGPPeeringPolicy
 metadata:
-  name: {{ include "ck-loadbalancer.fullname" . }}
+  name: {{ include "ck-loadbalancer.fullname" . | quote }}
   labels:
     {{- include "ck-loadbalancer.labels" . | nindent 4 }}
 spec:
diff --git a/k8s/manifests/charts/ck-loadbalancer/templates/cilium/l2-policy.yaml b/k8s/manifests/charts/ck-loadbalancer/templates/cilium/l2-policy.yaml
index 8c1d0a8690..7ab96c3bc5 100644
--- a/k8s/manifests/charts/ck-loadbalancer/templates/cilium/l2-policy.yaml
+++ b/k8s/manifests/charts/ck-loadbalancer/templates/cilium/l2-policy.yaml
@@ -1,10 +1,10 @@
-{{- if .Values.l2.enabled }}
 {{- if (eq .Values.driver "cilium") }}
+{{- if .Values.l2.enabled }}
 
 apiVersion: "cilium.io/v2alpha1"
 kind: CiliumL2AnnouncementPolicy
 metadata:
-  name: {{ include "ck-loadbalancer.fullname" . }}
+  name: {{ include "ck-loadbalancer.fullname" . | quote }}
   labels:
     {{- include "ck-loadbalancer.labels" . | nindent 4 }}
 spec:
diff --git a/k8s/manifests/charts/ck-loadbalancer/templates/metallb/l2-policy.yaml b/k8s/manifests/charts/ck-loadbalancer/templates/metallb/l2-policy.yaml
index bbf3ccbad8..17936ebf17 100644
--- a/k8s/manifests/charts/ck-loadbalancer/templates/metallb/l2-policy.yaml
+++ b/k8s/manifests/charts/ck-loadbalancer/templates/metallb/l2-policy.yaml
@@ -1,15 +1,15 @@
-{{- if .Values.l2.enabled }}
 {{- if (eq .Values.driver "metallb") -}}
+{{- if .Values.l2.enabled }}
 
 apiVersion: "metallb.io/v1beta1"
 kind: L2Advertisement
 metadata:
-  name: {{ include "ck-loadbalancer.fullname" . }}
+  name: {{ include "ck-loadbalancer.fullname" . | quote }}
   labels:
     {{- include "ck-loadbalancer.labels" . | nindent 4 }}
 spec:
   ipAddressPools:
-  - {{ include "ck-loadbalancer.fullname" . }}
+  - {{ include "ck-loadbalancer.fullname" . | quote }}
 
   {{- if gt (len .Values.l2.interfaces ) 0 -}}
   {{- with .Values.l2.interfaces }}