diff --git a/charts/gitlab/charts/sidekiq/templates/configmap.yaml b/charts/gitlab/charts/sidekiq/templates/configmap.yaml
index 59f73cedf60bf2160b8a2ecdaddb2ba2c93f77f6..6d37d1400ec0fa09754d43ffecb45fadfeccdb2f 100644
--- a/charts/gitlab/charts/sidekiq/templates/configmap.yaml
+++ b/charts/gitlab/charts/sidekiq/templates/configmap.yaml
@@ -58,17 +58,12 @@ data:
         email_subject_suffix: {{ .Values.global.email.subject_suffix | quote }}
       {{- with .Values.global.appConfig }}
       {{- if eq .incomingEmail.enabled true }}
-      incoming_email:
-        enabled: {{ eq .incomingEmail.enabled true }}
-        address: {{ .incomingEmail.address | quote }}
+{{ include "gitlab.configYaml.incoming_email" . | indent 6 }}
       {{- end }}
       gravatar:
         plain_url: {{ .gravatar.plainUrl }}
         ssl_url: {{ .gravatar.sslUrl }}
-      extra:
-        google_analytics_id: {{ .extra.googleAnalyticsId | quote }}
-        piwik_url: {{ .extra.piwikUrl | quote }}
-        piwik_site_id: {{ .extra.piwikSiteId | quote }}
+{{ include "gitlab.configYaml.extra" . | indent 6 }}
       {{- end }}
       {{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "artifacts" "config" $.Values.global.appConfig.artifacts "context" $) | nindent 6 }}
       {{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "lfs" "config" $.Values.global.appConfig.lfs "context" $) | nindent 6 }}
@@ -92,19 +87,11 @@ data:
       kerberos:
         enabled: false
       shared:
-      gitaly:
-        client_path: /home/git/gitaly/bin
-        token: "<%= File.read('/etc/gitlab/gitaly/gitaly_token') %>"
-      repositories:
-        storages: # You must have at least a `default` storage path.
-{{ include "gitlab.gitaly.storages" . | indent 10 }}
+{{ include "gitlab.configYaml.gitaly" . | indent 6 }}
+{{ include "gitlab.configYaml.repositories" . | indent 6 }}
       backup:
         path: "tmp/backups"   # Relative paths are relative to Rails.root (default: tmp/backups/)
-      gitlab_shell:
-        path: /home/git/gitlab-shell/
-        hooks_path: /home/git/gitlab-shell/hooks/
-        upload_pack: true
-        receive_pack: true
+{{ include "gitlab.configYaml.shell" . | indent 6 }}
       workhorse:
       git:
         bin_path: /usr/bin/git
@@ -122,11 +109,7 @@ data:
         {{- if .Values.extra }}
 {{ toYaml .Values.extra | indent 8 }}
         {{- end }}
-      rack_attack:
-        git_basic_auth:
-          {{- if .Values.rack_attack.git_basic_auth.enabled }}
-{{ toYaml .Values.rack_attack.git_basic_auth | indent 10 }}
-          {{- end }}
+{{ include "gitlab.configYaml.rackAttack" . | indent 6 }}
   configure: |
       set -e
       config_dir="/init-secrets"
diff --git a/charts/gitlab/charts/task-runner/templates/configmap.yaml b/charts/gitlab/charts/task-runner/templates/configmap.yaml
index ace328ad2f860fd553441334254b7766b7a4046d..9d1825f058980dd7ad63ee99bfc79218a23b3447 100644
--- a/charts/gitlab/charts/task-runner/templates/configmap.yaml
+++ b/charts/gitlab/charts/task-runner/templates/configmap.yaml
@@ -31,36 +31,30 @@ data:
 {{ toYaml .Values.trusted_proxies | indent 10 }}
         {{- end }}
         time_zone: {{ .Values.global.time_zone | quote }}
-        email_from: example@example.com
-        email_display_name: GitLab
-        email_reply_to: noreply@example.com
-        email_subject_suffix: ''
-        {{- include "gitlab.appConfig.defaultProjectsFeatures.configuration" $ | nindent 8 }}
-      incoming_email:
-        enabled: false
-      artifacts:
-        enabled: true
+        email_from: {{ template "gitlab.email.from" . }}
+        email_display_name: {{ .Values.global.email.display_name | quote }}
+        email_reply_to: {{ template "gitlab.email.reply_to" . }}
+        email_subject_suffix: {{ .Values.global.email.subject_suffix | quote }}
+        incoming_email:
+          enabled: false
+        {{- with .Values.global.appConfig }}
+{{ include "gitlab.configYaml.extra" . | indent 6 }}
+        {{- end }}
+      {{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "artifacts" "config" $.Values.global.appConfig.artifacts "context" $) | nindent 6 }}
       {{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "lfs" "config" $.Values.global.appConfig.lfs "context" $) | nindent 6 }}
+      {{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "uploads" "config" $.Values.global.appConfig.uploads "context" $) | nindent 6 }}
       {{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "packages" "config" $.Values.global.appConfig.packages "context" $) | nindent 6 }}
       {{- include "gitlab.appConfig.pseudonymizer.configuration" $ | nindent 6 }}
       pages:
         enabled: false
       {{- include "gitlab.appConfig.ldap.configuration" $ | nindent 6 }}
       {{- include "gitlab.appConfig.omniauth.configuration" $ | nindent 6 }}
-      gitaly:
-        client_path: /home/git/gitaly/bin
-        token: "<%= File.read('/etc/gitlab/gitaly/gitaly_token') %>"
-      repositories:
-        storages: # You must have at least a `default` storage path.
-{{ include "gitlab.gitaly.storages" . | indent 10 }}
+{{ include "gitlab.configYaml.gitaly" . | indent 6 }}
+{{ include "gitlab.configYaml.repositories" . | indent 6 }}
       backup:
         path: "tmp/backups"   # Relative paths are relative to Rails.root (default: tmp/backups/)
-      gitlab_shell:
-        path: /home/git/gitlab-shell/
-        hooks_path: /home/git/gitlab-shell/hooks/
-        secret_file: /etc/gitlab/shell/.gitlab_shell_secret
-        upload_pack: true
-        receive_pack: true
+{{ include "gitlab.configYaml.shell" . | indent 6 }}
+{{ include "gitlab.configYaml.shell.secret_file" . | indent 8 }}
       workhorse:
       git:
         bin_path: /usr/bin/git
@@ -73,11 +67,7 @@ data:
         {{- if .Values.extra }}
 {{ toYaml .Values.extra | indent 8 }}
         {{- end }}
-      rack_attack:
-        git_basic_auth:
-          {{- if .Values.rack_attack.git_basic_auth.enabled }}
-{{ toYaml .Values.rack_attack.git_basic_auth | indent 10 }}
-          {{- end }}
+{{ include "gitlab.configYaml.rackAttack" . | indent 6 }}
       ## Registry Integration
       {{- include "gitlab.appConfig.registry.configuration" $ | nindent 6 }}
   configure: |
diff --git a/charts/gitlab/charts/unicorn/templates/configmap.yml b/charts/gitlab/charts/unicorn/templates/configmap.yml
index 72ce65582453577c89b6fd66fe7563a1b5bc5315..17d76dd54f55f1631ffec0065216a6b84aef48c9 100644
--- a/charts/gitlab/charts/unicorn/templates/configmap.yml
+++ b/charts/gitlab/charts/unicorn/templates/configmap.yml
@@ -87,17 +87,12 @@ data:
         email_subject_suffix: {{ .Values.global.email.subject_suffix | quote }}
       {{- with .Values.global.appConfig }}
       {{- if eq .incomingEmail.enabled true }}
-      incoming_email:
-        enabled: {{ eq .incomingEmail.enabled true }}
-        address: {{ .incomingEmail.address | quote }}
+{{ include "gitlab.configYaml.incoming_email" . | indent 6 }}
       {{- end }}
       gravatar:
         plain_url: {{ .gravatar.plainUrl }}
         ssl_url: {{ .gravatar.sslUrl }}
-      extra:
-        google_analytics_id: {{ .extra.googleAnalyticsId | quote }}
-        piwik_url: {{ .extra.piwikUrl | quote }}
-        piwik_site_id: {{ .extra.piwikSiteId | quote }}
+{{ include "gitlab.configYaml.extra" . | indent 6 }}
       {{- end }}
       {{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "artifacts" "config" $.Values.global.appConfig.artifacts "context" $) | nindent 6 }}
       {{- include "gitlab.appConfig.objectStorage.configuration" (dict "name" "lfs" "config" $.Values.global.appConfig.lfs "context" $) | nindent 6 }}
@@ -114,21 +109,13 @@ data:
       kerberos:
         enabled: false
       shared:
-      gitaly:
-        client_path: /home/git/gitaly/bin
-        token: "<%= File.read('/etc/gitlab/gitaly/gitaly_token') %>"
-      repositories:
-        storages: # You must have at least a `default` storage path.
-{{ include "gitlab.gitaly.storages" . | indent 10 }}
+{{ include "gitlab.configYaml.gitaly" . | indent 6 }}
+{{ include "gitlab.configYaml.repositories" . | indent 6 }}
       backup:
         path: "tmp/backups"   # Relative paths are relative to Rails.root (default: tmp/backups/)
-      gitlab_shell:
-        path: /home/git/gitlab-shell/
-        hooks_path: /home/git/gitlab-shell/hooks/
-        secret_file: /etc/gitlab/shell/.gitlab_shell_secret
-        upload_pack: true
-        receive_pack: true
-        ssh_port: {{ include "gitlab.shell.port" . | int }}
+{{ include "gitlab.configYaml.shell" . | indent 6 }}
+{{ include "gitlab.configYaml.shell.ssh_port" . | indent 8 }}
+{{ include "gitlab.configYaml.shell.secret_file" . | indent 8 }}
       workhorse:
         secret_file: /etc/gitlab/gitlab-workhorse/secret
       git:
@@ -142,11 +129,7 @@ data:
         {{- if .Values.extra }}
 {{ toYaml .Values.extra | indent 8 }}
         {{- end }}
-      rack_attack:
-        git_basic_auth:
-          {{- if .Values.rack_attack.git_basic_auth.enabled }}
-{{ toYaml .Values.rack_attack.git_basic_auth | indent 10 }}
-          {{- end }}
+{{ include "gitlab.configYaml.rackAttack" . | indent 6 }}
       ## Registry Integration
       {{- include "gitlab.appConfig.registry.configuration" $ | nindent 6 }}
   configure: |
diff --git a/charts/gitlab/templates/_gitlab.yaml.tpl b/charts/gitlab/templates/_gitlab.yaml.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..6e0182678da607a03f3d31ac6ac9fcb4d92e8a15
--- /dev/null
+++ b/charts/gitlab/templates/_gitlab.yaml.tpl
@@ -0,0 +1,48 @@
+{{- define "gitlab.configYaml.shell" -}}
+gitlab_shell:
+  path: /home/git/gitlab-shell/
+  hooks_path: /home/git/gitlab-shell/hooks/
+  upload_pack: true
+  receive_pack: true
+{{- end -}}
+
+{{- define "gitlab.configYaml.shell.ssh_port" -}}
+ssh_port: {{ include "gitlab.shell.port" . | int }}
+{{- end -}}
+
+{{- define "gitlab.configYaml.shell.secret_file" -}}
+secret_file: /etc/gitlab/shell/.gitlab_shell_secret
+{{- end -}}
+
+{{- define "gitlab.configYaml.rackAttack" -}}
+rack_attack:
+  git_basic_auth:
+    {{- if .Values.rack_attack.git_basic_auth.enabled }}
+  {{ toYaml .Values.rack_attack.git_basic_auth | indent 2 }}
+    {{- end }}
+{{- end -}}
+
+{{- define "gitlab.configYaml.extra" -}}
+extra:
+  google_analytics_id: {{ .extra.googleAnalyticsId | quote }}
+  piwik_url: {{ .extra.piwikUrl | quote }}
+  piwik_site_id: {{ .extra.piwikSiteId | quote }}
+{{- end -}}
+
+{{- define "gitlab.configYaml.gitaly" -}}
+gitaly:
+  client_path: /home/git/gitaly/bin
+  token: "<%= File.read('/etc/gitlab/gitaly/gitaly_token') %>"
+{{- end -}}
+
+{{- define "gitlab.configYaml.repositories" -}}
+repositories:
+  storages: # You must have at least a `default` storage path.
+{{ include "gitlab.gitaly.storages" . | indent 4 }}
+{{- end -}}
+
+{{- define "gitlab.configYaml.incoming_email" -}}
+incoming_email:
+  enabled: {{ eq .incomingEmail.enabled true }}
+  address: {{ .incomingEmail.address | quote }}
+{{- end -}}