diff --git a/config/software/mattermost.rb b/config/software/mattermost.rb
index 90e08ede629a71d4419ecbf4749b1dd288f94dd6_Y29uZmlnL3NvZnR3YXJlL21hdHRlcm1vc3QucmI=..b1bc140d74011735bd49e1186e1001f3e1b07fa4_Y29uZmlnL3NvZnR3YXJlL21hdHRlcm1vc3QucmI= 100644
--- a/config/software/mattermost.rb
+++ b/config/software/mattermost.rb
@@ -17,6 +17,6 @@
 #
 
 name 'mattermost'
-default_version '4.5.0'
+default_version '4.6.0'
 
 source url: "https://releases.mattermost.com/#{version}/mattermost-team-#{version}-linux-amd64.tar.gz",
@@ -21,6 +21,6 @@
 
 source url: "https://releases.mattermost.com/#{version}/mattermost-team-#{version}-linux-amd64.tar.gz",
-       md5: 'bb64accb50283799b1b748e6832af712'
+       md5: '24c787aff8d9222409c3584b9638aaac'
 
 relative_path 'mattermost'
 
diff --git a/files/gitlab-config-template/gitlab.rb.template b/files/gitlab-config-template/gitlab.rb.template
index 90e08ede629a71d4419ecbf4749b1dd288f94dd6_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU=..b1bc140d74011735bd49e1186e1001f3e1b07fa4_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU= 100644
--- a/files/gitlab-config-template/gitlab.rb.template
+++ b/files/gitlab-config-template/gitlab.rb.template
@@ -1190,6 +1190,9 @@
 # mattermost['email_skip_server_certificate_verification'] = false
 # mattermost['email_smtp_auth'] = false
 # mattermost['email_notification_content_type'] = "full"
+# mattermost['email_login_button_color'] = ""
+# mattermost['email_login_button_border_color'] = ""
+# mattermost['email_login_button_text_color'] = ""
 
 # mattermost['file_max_file_size'] = 52428800
 # mattermost['file_driver_name'] = "local"
diff --git a/files/gitlab-cookbooks/mattermost/templates/default/config.json.erb b/files/gitlab-cookbooks/mattermost/templates/default/config.json.erb
index 90e08ede629a71d4419ecbf4749b1dd288f94dd6_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9tYXR0ZXJtb3N0L3RlbXBsYXRlcy9kZWZhdWx0L2NvbmZpZy5qc29uLmVyYg==..b1bc140d74011735bd49e1186e1001f3e1b07fa4_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9tYXR0ZXJtb3N0L3RlbXBsYXRlcy9kZWZhdWx0L2NvbmZpZy5qc29uLmVyYg== 100644
--- a/files/gitlab-cookbooks/mattermost/templates/default/config.json.erb
+++ b/files/gitlab-cookbooks/mattermost/templates/default/config.json.erb
@@ -123,7 +123,10 @@
         "EmailBatchingInterval": <%= @email_batching_interval %>,
         "SkipServerCertificateVerification": <%= @email_skip_server_certificate_verification %>,
         "EnableSMTPAuth": <%= @email_smtp_auth %>,
-        "EmailNotificationContentType": "<%= @email_notification_content_type %>"
+        "EmailNotificationContentType": "<%= @email_notification_content_type %>",
+        "LoginButtonColor": "<%= @email_login_button_color %>",
+        "LoginButtonBorderColor": "<%= @email_login_button_border_color %>",
+        "LoginButtonTextColor": "<%= @email_login_button_text_color %>"
     },
     "RateLimitSettings": {
         "Enable": <%= @ratelimit_enable_rate_limiter %>,