diff --git a/freeleaps/helm-pkg/authentication/templates/authentication/authentication-config.yaml b/freeleaps/helm-pkg/authentication/templates/authentication/authentication-config.yaml
index 33ec9624..747cf28e 100644
--- a/freeleaps/helm-pkg/authentication/templates/authentication/authentication-config.yaml
+++ b/freeleaps/helm-pkg/authentication/templates/authentication/authentication-config.yaml
@@ -16,6 +16,6 @@ data:
   MONGODB_NAME: {{ .Values.authentication.configs.mongodbName | b64enc | quote }}
   MONGODB_PORT: {{ .Values.authentication.configs.mongodbPort | toString | b64enc }}
   MONGODB_URI: {{ .Values.authentication.configs.mongodbUri | b64enc | quote }}
-  METRICS_ENABLED: {{ if .Values.authentication.serviceMonitor.enabled | default false | toString | b64enc }}
-  PROBES_ENABLED: {{ if .Values.authentication.probes | default false | toString | b64enc }}
+  METRICS_ENABLED: {{ .Values.authentication.serviceMonitor.enabled | default false | toString | b64enc }}
+  PROBES_ENABLED: {{ if and .Values.authentication.probes (gt (len .Values.authentication.probes) 0) }}{{ "true" | b64enc }}{{ else }}{{ "false" | b64enc }}{{ end }}
   
\ No newline at end of file
diff --git a/freeleaps/helm-pkg/centralStorage/templates/central-storage/central-storage-config.yaml b/freeleaps/helm-pkg/centralStorage/templates/central-storage/central-storage-config.yaml
index 0aa6d9f1..056bccf8 100644
--- a/freeleaps/helm-pkg/centralStorage/templates/central-storage/central-storage-config.yaml
+++ b/freeleaps/helm-pkg/centralStorage/templates/central-storage/central-storage-config.yaml
@@ -14,6 +14,6 @@ data:
   MONGODB_URI: {{ .Values.centralStorage.configs.mongodbUri | b64enc | quote }}
   AZURE_STORAGE_DOCUMENT_API_KEY: {{ .Values.centralStorage.configs.azureStorageDocumentApiKey | b64enc | quote }}
   AZURE_STORAGE_DOCUMENT_API_ENDPOINT: {{ .Values.centralStorage.configs.azureStorageDocumentApiEndpoint | b64enc | quote }}
-  METRICS_ENABLED: {{ if .Values.centralStorage.serviceMonitor.enabled | default false | toString | b64enc }}
-  PROBES_ENABLED: {{ if .Values.centralStorage.probes | default false | toString | b64enc }}
+  METRICS_ENABLED: {{ .Values.centralStorage.serviceMonitor.enabled | default false | toString | b64enc }}
+  PROBES_ENABLED: {{ if and .Values.centralStorage.probes (gt (len .Values.centralStorage.probes) 0) }}{{ "true" | b64enc }}{{ else }}{{ "false" | b64enc }}{{ end }}
   
\ No newline at end of file
diff --git a/freeleaps/helm-pkg/content/templates/content/content-config.yaml b/freeleaps/helm-pkg/content/templates/content/content-config.yaml
index 99e02411..2f247dca 100644
--- a/freeleaps/helm-pkg/content/templates/content/content-config.yaml
+++ b/freeleaps/helm-pkg/content/templates/content/content-config.yaml
@@ -14,6 +14,6 @@ data:
   MONGODB_URI: {{ .Values.content.configs.mongodbUri | b64enc | quote }}
   FREELEAPS_WWW_AS_AZURE_CLIENT_SECRET: {{ .Values.content.configs.freeleapsWwwAsAzureClientSecret | b64enc | quote }}
   CENTRAL_STORAGE_WEBAPI_URL_BASE: {{ .Values.content.configs.centralStorageWebapiUrlBase | b64enc | quote }}
-  METRICS_ENABLED: {{ if .Values.content.serviceMonitor.enabled | default false | toString | b64enc }}
-  PROBES_ENABLED: {{ if .Values.content.probes | default false | toString | b64enc }}
+  METRICS_ENABLED: {{ .Values.content.serviceMonitor.enabled | default false | toString | b64enc }}
+  PROBES_ENABLED: {{ if and .Values.content.probes (gt (len .Values.content.probes) 0) }}{{ "true" | b64enc }}{{ else }}{{ "false" | b64enc }}{{ end }}
   
\ No newline at end of file
diff --git a/freeleaps/helm-pkg/notification/templates/notification/notification-config.yaml b/freeleaps/helm-pkg/notification/templates/notification/notification-config.yaml
index 88451a07..367554b9 100644
--- a/freeleaps/helm-pkg/notification/templates/notification/notification-config.yaml
+++ b/freeleaps/helm-pkg/notification/templates/notification/notification-config.yaml
@@ -21,6 +21,6 @@ data:
   SENDGRID_API_KEY: {{ .Values.notification.configs.sendgridApiKey | b64enc | quote }}
   TWILIO_ACCOUNT_SID: {{ .Values.notification.configs.twilioAccountSid | b64enc | quote }}
   TWILIO_AUTH_TOKEN: {{ .Values.notification.configs.twilioAuthToken | b64enc | quote }}
-  METRICS_ENABLED: {{ if .Values.notification.serviceMonitor.enabled | default false | toString | b64enc }}
-  PROBES_ENABLED: {{ if .Values.notification.probes | default false | toString | b64enc }}
+  METRICS_ENABLED: {{ .Values.notification.serviceMonitor.enabled | default false | toString | b64enc }}
+  PROBES_ENABLED: {{ if and .Values.notification.probes (gt (len .Values.notification.probes) 0) }}{{ "true" | b64enc }}{{ else }}{{ "false" | b64enc }}{{ end }}
   
\ No newline at end of file
diff --git a/freeleaps/helm-pkg/payment/templates/payment/payment-config.yaml b/freeleaps/helm-pkg/payment/templates/payment/payment-config.yaml
index 64a19c32..f0626fde 100644
--- a/freeleaps/helm-pkg/payment/templates/payment/payment-config.yaml
+++ b/freeleaps/helm-pkg/payment/templates/payment/payment-config.yaml
@@ -16,4 +16,6 @@ data:
   SITE_URL_ROOT: {{ .Values.payment.configs.siteUrlRoot | b64enc | quote }}
   METRICS_ENABLED: {{ if .Values.payment.serviceMonitor.enabled | default false | toString | b64enc }}
   PROBES_ENABLED: {{ if .Values.payment.probes | default false | toString | b64enc }}
+  METRICS_ENABLED: {{ .Values.payment.serviceMonitor.enabled | default false | toString | b64enc }}
+  PROBES_ENABLED: {{ if and .Values.payment.probes (gt (len .Values.payment.probes) 0) }}{{ "true" | b64enc }}{{ else }}{{ "false" | b64enc }}{{ end }}
   
\ No newline at end of file