diff --git a/kubernetes/sdnc/charts/dmaap-listener/values.yaml b/kubernetes/sdnc/charts/dmaap-listener/values.yaml
index d90da63..bec4d1c 100644
--- a/kubernetes/sdnc/charts/dmaap-listener/values.yaml
+++ b/kubernetes/sdnc/charts/dmaap-listener/values.yaml
@@ -46,7 +46,7 @@
     passwordPolicy: required
   - uid: odl-creds
     type: basicAuth
-    externalSecret: '{{ .Values.config.odlCredsExternalSecret }}'
+    externalSecret: '{{ tpl (default "" .Values.config.odlCredsExternalSecret) . }}'
     login: '{{ .Values.config.odlUser }}'
     password: '{{ .Values.config.odlPassword }}'
     passwordPolicy: required
diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml
index b0b3c81..4ee7c6f 100644
--- a/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml
+++ b/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml
@@ -46,7 +46,7 @@
     passwordPolicy: required
   - uid: rest-creds
     type: basicAuth
-    externalSecret: '{{ .Values.config.restCredsExternalSecret }}'
+    externalSecret: '{{ tpl (default "" .Values.config.restCredsExternalSecret) . }}'
     login: '{{ .Values.config.restUser }}'
     password: '{{ .Values.config.restPassword }}'
     passwordPolicy: required
diff --git a/kubernetes/sdnc/charts/sdnc-portal/values.yaml b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
index fa38cf7..94ea5d7 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/values.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
@@ -52,19 +52,19 @@
     passwordPolicy: required
   - uid: odl-creds
     type: basicAuth
-    externalSecret: '{{ .Values.config.odlCredsExternalSecret }}'
+    externalSecret: '{{ tpl (default "" .Values.config.odlCredsExternalSecret) . }}'
     login: '{{ .Values.config.odlUser }}'
     password: '{{ .Values.config.odlPassword }}'
     passwordPolicy: required
   - uid: fabric-db-creds
     type: basicAuth
-    externalSecret: '{{ .Values.config.odlCredsExternalSecret }}'
+    externalSecret: '{{ tpl (default "" .Values.config.odlCredsExternalSecret) . }}'
     login: '{{ .Values.config.dbFabricUser }}'
     password: '{{ .Values.config.dbFabricPassword }}'
     passwordPolicy: required
   - uid: keystore-password
     type: password
-    externalSecret: '{{ .Values.config.KeyStorePwdExternalSecret }}'
+    externalSecret: '{{ tpl (default "" .Values.config.KeyStorePwdExternalSecret) . }}'
     password: '{{ .Values.config.keystorePwd }}'
     passwordPolicy: required
 
diff --git a/kubernetes/sdnc/charts/ueb-listener/values.yaml b/kubernetes/sdnc/charts/ueb-listener/values.yaml
index 03fbf52..9b7dcb0 100644
--- a/kubernetes/sdnc/charts/ueb-listener/values.yaml
+++ b/kubernetes/sdnc/charts/ueb-listener/values.yaml
@@ -46,13 +46,13 @@
     passwordPolicy: required
   - uid: odl-creds
     type: basicAuth
-    externalSecret: '{{ .Values.config.odlCredsExternalSecret }}'
+    externalSecret: '{{ tpl (default "" .Values.config.odlCredsExternalSecret) . }}'
     login: '{{ .Values.config.odlUser }}'
     password: '{{ .Values.config.odlPassword }}'
     passwordPolicy: required
   - uid: ueb-creds
     type: basicAuth
-    externalSecret: '{{ .Values.config.odlCredsExternalSecret }}'
+    externalSecret: '{{ tpl (default "" .Values.config.odlCredsExternalSecret) . }}'
     login: '{{ .Values.config.uebUser }}'
     password: '{{ .Values.config.uebPassword }}'
     passwordPolicy: required