diff --git a/templates/secret.yaml b/templates/secret.yaml
index c6b86c8..bb568c6 100644
--- a/templates/secret.yaml
+++ b/templates/secret.yaml
@@ -35,14 +35,5 @@ data:
   swiftPassword: {{ .Values.secrets.swift.password | b64enc | quote }}
     {{- end }}
   {{- end }}
-  
-  {{- if .Values.proxy.username }}
-  proxyUsername: {{ .Values.proxy.username | b64enc | quote }}
-  {{- else }}
-  proxyUsername: ""
-  {{- end }}
-  {{- if .Values.proxy.password }}
-  proxyPassword: {{ .Values.proxy.password | b64enc | quote }}
-  {{- else }}
-  proxyPassword: ""
-  {{- end }}
+  proxyUsername: {{ .Values.proxy.username | default "" | b64enc | quote }}
+  proxyPassword: {{ .Values.proxy.password | default "" | b64enc | quote }}