diff --git a/sapbtp-operator-charts/templates/secret.yml b/sapbtp-operator-charts/templates/secret.yml
index 647d026a..700da880 100644
--- a/sapbtp-operator-charts/templates/secret.yml
+++ b/sapbtp-operator-charts/templates/secret.yml
@@ -8,12 +8,16 @@ type: Opaque
 data:
   {{- if .Values.manager.secret.b64encoded }}
   clientid: {{ .Values.manager.secret.clientid | quote }}
+  {{- if .Values.manager.secret.clientsecret }}
   clientsecret: {{ .Values.manager.secret.clientsecret | quote }}
+  {{- end }}
   url: {{ .Values.manager.secret.url | quote }}
   tokenurl: {{ .Values.manager.secret.tokenurl | quote }}
   {{- else}}
   clientid: {{ .Values.manager.secret.clientid | b64enc | quote }}
+  {{- if .Values.manager.secret.clientsecret }}
   clientsecret: {{ .Values.manager.secret.clientsecret | b64enc | quote }}
+  {{- end }}
   url: {{ .Values.manager.secret.url | b64enc | quote }}
   tokenurl: {{ .Values.manager.secret.tokenurl | b64enc | quote }}
   {{- end }}