diff --git a/telco-core/configuration/reference-crs-kube-compare/required/networking/metallb/addr-pool.yaml b/telco-core/configuration/reference-crs-kube-compare/required/networking/metallb/addr-pool.yaml
index 520135855..927a31b37 100644
--- a/telco-core/configuration/reference-crs-kube-compare/required/networking/metallb/addr-pool.yaml
+++ b/telco-core/configuration/reference-crs-kube-compare/required/networking/metallb/addr-pool.yaml
@@ -11,10 +11,10 @@ spec:
 {{ .spec.addresses | toYaml | indent 2}}
 {{ end }}
   #- 3.3.3.0/24
-{{ if .spec.autoAssign }}
+{{ if hasKey .spec "autoAssign" }}
   autoAssign: {{ .spec.autoAssign }}
 {{ end }}
-{{ if .spec.avoidBuggyIPs }}
+{{ if hasKey .spec "avoidBuggyIPs" }}
   avoidBuggyIPs: {{ .spec.avoidBuggyIPs }}
 {{ end }}
 {{ if .spec.serviceAllocation }}
diff --git a/telco-core/configuration/reference-crs-kube-compare/required/networking/metallb/bfd-profile.yaml b/telco-core/configuration/reference-crs-kube-compare/required/networking/metallb/bfd-profile.yaml
index 7d8edaee0..059778982 100644
--- a/telco-core/configuration/reference-crs-kube-compare/required/networking/metallb/bfd-profile.yaml
+++ b/telco-core/configuration/reference-crs-kube-compare/required/networking/metallb/bfd-profile.yaml
@@ -12,7 +12,7 @@ spec:
   echoInterval: {{ if .spec.echoInterval }} {{ .spec.echoInterval }} {{ else }} "50ms" {{ end }} # default 50ms
   {{ end }}
   detectMultiplier: {{ if .spec.detectMultiplier }} {{ .spec.detectMultiplier }} {{ else }} "3" {{ end }} # default 3
-  {{- if .spec.echoMode }}
+  {{- if hasKey .spec "echoMode" }}
   echoMode: {{ .spec.echoMode }}
   {{- end }}
   passiveMode: true
diff --git a/telco-core/configuration/reference-crs-kube-compare/required/networking/metallb/bgp-peer.yaml b/telco-core/configuration/reference-crs-kube-compare/required/networking/metallb/bgp-peer.yaml
index ce3645e93..d66a443f6 100644
--- a/telco-core/configuration/reference-crs-kube-compare/required/networking/metallb/bgp-peer.yaml
+++ b/telco-core/configuration/reference-crs-kube-compare/required/networking/metallb/bgp-peer.yaml
@@ -10,7 +10,7 @@ spec:
   routerID: {{ .spec.routerID }}
   bfdProfile: {{ .spec.bfdProfile }}
   passwordSecret: {{ .spec.passwordSecret | toJson }}
-  {{- if .spec.disableMP }}
+  {{- if hasKey .spec "disableMP" }}
   disableMP: {{ .spec.disableMP }}
   {{- end }}
   peerPort: {{ .spec.peerPort }}
diff --git a/telco-hub/configuration/reference-crs-kube-compare/required/acm/acmProvisioning.yaml b/telco-hub/configuration/reference-crs-kube-compare/required/acm/acmProvisioning.yaml
index cf507c492..b59dd0133 100644
--- a/telco-hub/configuration/reference-crs-kube-compare/required/acm/acmProvisioning.yaml
+++ b/telco-hub/configuration/reference-crs-kube-compare/required/acm/acmProvisioning.yaml
@@ -11,6 +11,6 @@ spec:
   # some servers do not support virtual media installations
   # when the image is served using the https protocol
   # disableVirtualMediaTLS: true
-  {{- if .spec.disableVirtualMediaTLS }}
-  disableVirtualMediaTLS: true
+  {{- if hasKey .spec "disableVirtualMediaTLS" }}
+  disableVirtualMediaTLS: {{ .spec.disableVirtualMediaTLS }}
   {{- end }}