diff --git a/gate-teamware/templates/deployment-backend.yaml b/gate-teamware/templates/deployment-backend.yaml
index b97ffe3..32336bc 100644
--- a/gate-teamware/templates/deployment-backend.yaml
+++ b/gate-teamware/templates/deployment-backend.yaml
@@ -132,23 +132,25 @@ spec:
                 key: refresh-token
           {{- end }}{{/* if backend gmail */}}
           {{- end }}{{/* with .Values.email */}}
-          {{- with .extraEnv }}
-            {{- toYaml . | nindent 10 }}
-          {{- end }}
-          {{- if and $.Values.email.smtp.security $.Values.email.smtp.clientCertSecret }}
+          {{- with $.Values.privacyPolicy }}
           # Privacy Policy Settings
           - name: PP_HOST_NAME
-            value: {{ $.Values.privacyPolicy.host.name | quote }}
+            value: {{ .host.name | quote }}
           - name: PP_HOST_ADDRESS
-            value: {{ $.Values.privacyPolicy.host.address | quote }}
+            value: {{ .host.address | quote }}
           - name: PP_HOST_CONTACT
-            value: {{ $.Values.privacyPolicy.host.contact | quote }}
+            value: {{ .host.contact | quote }}
           - name: PP_ADMIN_NAME
-            value: {{ $.Values.privacyPolicy.admin.name | quote }}
+            value: {{ .admin.name | quote }}
           - name: PP_ADMIN_ADDRESS
-            value: {{ $.Values.privacyPolicy.admin.address | quote }}
+            value: {{ .admin.address | quote }}
           - name: PP_ADMIN_CONTACT
-            value: {{ $.Values.privacyPolicy.admin.contact | quote }}
+            value: {{ .admin.contact | quote }}
+          {{- end }}
+          {{- with .extraEnv }}
+            {{- toYaml . | nindent 10 }}
+          {{- end }}
+          {{- if and $.Values.email.smtp.security $.Values.email.smtp.clientCertSecret }}
           volumeMounts:
           - name: email-client-cert
             mountPath: /email-client-cert