diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/fido2/templates/_helpers.tpl b/pygluu/kubernetes/templates/helm/gluu/charts/fido2/templates/_helpers.tpl
index a282ec36..bafe45ca 100644
--- a/pygluu/kubernetes/templates/helm/gluu/charts/fido2/templates/_helpers.tpl
+++ b/pygluu/kubernetes/templates/helm/gluu/charts/fido2/templates/_helpers.tpl
@@ -72,9 +72,7 @@ Create GLUU_JAVA_OPTIONS ENV for passing custom work and detailed logs
 */}}
 {{- define "fido2.customJavaOptions"}}
 {{ $custom := "" }}
-{{- if .Values.global.fido2.gluuCustomJavaOptions }}
 {{ $custom = printf "%s" .Values.global.fido2.gluuCustomJavaOptions }}
-{{- end}}
 {{ $memory := .Values.resources.limits.memory | replace "Mi" "" | int -}}
 {{- $maxDirectMemory := printf "-XX:MaxDirectMemorySize=%dm" $memory -}}
 {{- $xmx := printf "-Xmx%dm" (sub $memory 300) -}}
diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/templates/_helpers.tpl b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/templates/_helpers.tpl
index 231de03d..97f8dd45 100644
--- a/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/templates/_helpers.tpl
+++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/templates/_helpers.tpl
@@ -72,9 +72,7 @@ Create GLUU_JAVA_OPTIONS ENV for passing custom work and detailed logs
 */}}
 {{- define "oxauth.customJavaOptions"}}
 {{ $custom := "" }}
-{{- if .Values.global.oxauth.gluuCustomJavaOptions }}
 {{ $custom = printf "%s" .Values.global.oxauth.gluuCustomJavaOptions }}
-{{- end}}
 {{ $memory := .Values.resources.limits.memory | replace "Mi" "" | int -}}
 {{- $maxDirectMemory := printf "-XX:MaxDirectMemorySize=%dm" $memory -}}
 {{- $xmx := printf "-Xmx%dm" (sub $memory 300) -}}
diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/templates/_helpers.tpl b/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/templates/_helpers.tpl
index 826c41cf..0357248c 100644
--- a/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/templates/_helpers.tpl
+++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/templates/_helpers.tpl
@@ -73,9 +73,7 @@ Create GLUU_JAVA_OPTIONS ENV for passing custom work and detailed logs
 {{- define "oxd-server.customJavaOptions"}}
 {{ $custom := "" }}
 {{- $gluuCustomJavaOptions := index .Values.global "oxd-server" "gluuCustomJavaOptions" }}
-{{- if $gluuCustomJavaOptions }}
 {{- $custom := printf "%s" $gluuCustomJavaOptions }}
-{{- end}}
 {{ $memory := .Values.resources.limits.memory | replace "Mi" "" | int -}}
 {{- $maxDirectMemory := printf "-XX:MaxDirectMemorySize=%dm" $memory -}}
 {{- $xmx := printf "-Xmx%dm" (sub $memory 300) -}}
diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/templates/_helpers.tpl b/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/templates/_helpers.tpl
index c1972e64..b9f3836c 100644
--- a/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/templates/_helpers.tpl
+++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/templates/_helpers.tpl
@@ -84,9 +84,7 @@ Create GLUU_JAVA_OPTIONS ENV for passing custom work and detailed logs
 {{ $container := "" }}
 {{ $xmlsec := "" }}
 {{ $custom := "" }}
-{{- if .Values.global.oxshibboleth.gluuCustomJavaOptions }}
 {{ $custom = printf "%s " .Values.global.oxshibboleth.gluuCustomJavaOptions }}
-{{- end}}
 {{- if .Values.global.oxshibboleth.appLoggers.ldapLogLevel }}
 {{ $ldap = printf "-Didp.loglevel.ldap=%s " .Values.global.oxshibboleth.appLoggers.ldapLogLevel }}
 {{- end}}
diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/templates/_helpers.tpl b/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/templates/_helpers.tpl
index 20d55bf3..4cd1292b 100644
--- a/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/templates/_helpers.tpl
+++ b/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/templates/_helpers.tpl
@@ -73,9 +73,7 @@ Create GLUU_JAVA_OPTIONS ENV for passing custom work and detailed logs
 */}}
 {{- define "oxtrust.customJavaOptions"}}
 {{ $custom := "" }}
-{{- if .Values.global.oxtrust.gluuCustomJavaOptions }}
 {{ $custom = printf "%s" .Values.global.oxtrust.gluuCustomJavaOptions }}
-{{- end}}
 {{ $memory := .Values.resources.limits.memory | replace "Mi" "" | int -}}
 {{- $maxDirectMemory := printf "-XX:MaxDirectMemorySize=%dm" $memory -}}
 {{- $xmx := printf "-Xmx%dm" (sub $memory 300) -}}
diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/scim/templates/_helpers.tpl b/pygluu/kubernetes/templates/helm/gluu/charts/scim/templates/_helpers.tpl
index a078fbee..bd12834f 100644
--- a/pygluu/kubernetes/templates/helm/gluu/charts/scim/templates/_helpers.tpl
+++ b/pygluu/kubernetes/templates/helm/gluu/charts/scim/templates/_helpers.tpl
@@ -72,9 +72,7 @@ Create GLUU_JAVA_OPTIONS ENV for passing custom work and detailed logs
 */}}
 {{- define "scim.customJavaOptions"}}
 {{ $custom := "" }}
-{{- if .Values.global.scim.gluuCustomJavaOptions }}
 {{ $custom = printf "%s" .Values.global.scim.gluuCustomJavaOptions }}
-{{- end}}
 {{ $memory := .Values.resources.limits.memory | replace "Mi" "" | int -}}
 {{- $maxDirectMemory := printf "-XX:MaxDirectMemorySize=%dm" $memory -}}
 {{- $xmx := printf "-Xmx%dm" (sub $memory 300) -}}