diff --git a/helm/open-build-service/charts/backend/templates/configmap.yaml b/helm/open-build-service/charts/backend/templates/configmap.yaml
index 5eb34bb34976137d47f9940072f596e8ddbf526f..c80fc6aa30a2c209c4fd1fef6c869cb088257532 100644
--- a/helm/open-build-service/charts/backend/templates/configmap.yaml
+++ b/helm/open-build-service/charts/backend/templates/configmap.yaml
@@ -2,6 +2,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "backend.fullname" . }}-config
+  labels:
+    {{- include "backend.labels" . | nindent 4 }}
 data:
   BSConfig.local.pm: {{
       printf "%s\n%s\n1;\n" "$ipaccess->{\".*\"} = \"rw,worker\";" (
diff --git a/helm/open-build-service/charts/frontend/templates/deployment.yaml b/helm/open-build-service/charts/frontend/templates/deployment.yaml
index 77a8e1a0d84035181fdcaaf27146b197aafdc9e5..9825eb48daba2e14d8b17c777ab027d23278b802 100644
--- a/helm/open-build-service/charts/frontend/templates/deployment.yaml
+++ b/helm/open-build-service/charts/frontend/templates/deployment.yaml
@@ -38,6 +38,8 @@ spec:
             {{- if .Values.global.frontend }}
             - name: OBS_FRONTEND_WORKERS
               value: {{ default 4 .Values.global.frontend.workers | quote }}
+            - name: OBS_LOG_LEVEL
+              value: {{ default "info" .Values.global.frontend.loglevel | quote }}
             {{- end }}
             - name: OBS_MEMCACHE_HOST
               value: {{ include "frontend.memcached.fullname" . | quote }}
@@ -86,6 +88,12 @@ spec:
               mountPath: /tmp
             - name: frontend-logs
               mountPath: /obs/src/api/log
+            - name: frontend-secrets
+              mountPath: /run/secrets/msmtprc
+              subPath: msmtprc
+            - name: frontend-secrets
+              mountPath: /run/secrets/ssoauth
+              subPath: ssoauth
         - name: {{ .Chart.Name }}-weblog
           image: busybox
           args:
@@ -130,6 +138,10 @@ spec:
           emptyDir: {}
         - name: frontend-logs
           emptyDir: {}
+        - name: frontend-secrets
+          secret:
+            secretName: {{ .Values.global.frontend.existingSecret | default (include "frontend.fullname" .) }}
+            optional: true
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/helm/open-build-service/charts/frontend/templates/secret.yaml b/helm/open-build-service/charts/frontend/templates/secret.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6144855c0c01dbd35d009eee3077ef3e14a60122
--- /dev/null
+++ b/helm/open-build-service/charts/frontend/templates/secret.yaml
@@ -0,0 +1,12 @@
+{{- if (not .Values.global.frontend.existingSecret) -}}
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: {{ include "frontend.fullname" . }}
+  labels:
+    {{- include "frontend.labels" . | nindent 4 }}
+data:
+  msmtprc: {{ default "" .Values.global.frontend.msmtprc | b64enc | quote }}
+  ssoauth: {{ default "" .Values.global.frontend.ssoauth | toYaml | b64enc | quote }}
+{{- end }}
diff --git a/helm/open-build-service/charts/frontend/values.yaml b/helm/open-build-service/charts/frontend/values.yaml
index 90f9c2be522ed1fed93371373c0f0ca929b4f184..8cb8dc4ecab09bcbef64d34f4f6867f5286dac9e 100644
--- a/helm/open-build-service/charts/frontend/values.yaml
+++ b/helm/open-build-service/charts/frontend/values.yaml
@@ -17,6 +17,7 @@ fullnameOverride: ""
 global:
   frontend: {}
     # workers: 8
+    # loglevel: debug
   backend: {}
     # host: backend
 
diff --git a/helm/open-build-service/values.yaml b/helm/open-build-service/values.yaml
index e8c1f8e7f082d4ee1e7a3c8514e4bd9f9ce2a182..58aba1a8d8ba45a4d74d80d0344bc26bef609282 100644
--- a/helm/open-build-service/values.yaml
+++ b/helm/open-build-service/values.yaml
@@ -20,10 +20,24 @@ frontend:
         # size: 8Gi
         # existingClaim: ""
 
+# SSO secrets and msmtp config can be passed as a secret
+# using existingSecret setting
 global:
   frontend:
     workers: 4
     # host: frontend
+    # msmtprc: |
+    #   ...
+    # ssoauth:
+    #   fdo-gitlab:
+    #     strategy: gitlab
+    #     description: Freedesktop.org GitLab
+    #     scope: read_user openid profile email
+    #     client_id: hexhexhexhex
+    #     client_secret: hexhexhexhex
+    #     client_options:
+    #       site: https://gitlab.freedesktop.org/api/v4
+    # existingSecret: ""
   backend: {}
     # host: backend
     # extraConfig: |