diff --git a/chart/templates/gitlab/secret-smtp.yaml b/chart/templates/gitlab/secret-smtp.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..26c10d59c098fc8a2def8a54aacedb3cbd23347a
--- /dev/null
+++ b/chart/templates/gitlab/secret-smtp.yaml
@@ -0,0 +1,10 @@
+{{- if and .Values.addons.gitlab.smtp.password .Values.addons.gitlab.enabled }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: gitlab-smtp-password
+  namespace: gitlab
+type: Opaque
+data:
+  password: {{ .Values.addons.gitlab.smtp.password | b64enc }}
+{{- end }}
diff --git a/chart/templates/gitlab/values.yaml b/chart/templates/gitlab/values.yaml
index c50c78ad8ce5f9bc9ca19bf239c28075becd374e..80a402ca43fc0eb02c92bc75c26ec58fafd2a261 100644
--- a/chart/templates/gitlab/values.yaml
+++ b/chart/templates/gitlab/values.yaml
@@ -320,11 +320,17 @@ global:
     {{- end }}
   {{- end }}
 
-{{- if and (ne .Values.addons.gitlab.redis.password "") (or .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled) }}
+  {{- if and (ne .Values.addons.gitlab.redis.password "") (or .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled) }}
   redis:  
     password:
       secret: "gitlab-redis-secret-bb"
-{{- end }}
+  {{- end }}
+
+  {{- if .Values.addons.gitlab.smtp.password }}
+  smtp:
+    password:
+      secret: "gitlab-smtp-password"
+  {{- end }}
 
 {{- if ne .Values.addons.gitlab.objectStorage.iamProfile "" }}
 use_iam_profile: true
diff --git a/chart/values.yaml b/chart/values.yaml
index 9f4d72b8b487ea88e3a43fc60767da725b4c1aaf..9fd15849a557bd3f5b1530f46d1160bc39afe216 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -870,6 +870,11 @@ addons:
       # -- If using an AWS IAM profile, the accessKey and accessSecret values must be left as empty strings eg: ""
       iamProfile: ""
 
+    smtp:
+      # -- Passwords should be placed in an encrypted file. Example: environment-bb-secret.enc.yaml
+      # If a value is provided BigBang will create a k8s secret named gitlab-smtp-password in the gitlab namespace
+      password: ""
+
     redis:
       # -- Redis plain text password to connect to the redis server.  If empty (""), the gitlab charts will create the gitlab-redis-secret
       # with a random password.