diff --git a/templates/gitlab.rb b/templates/gitlab.rb
index 672fc41dbadfc930296b3c93b5be1ba3cc779958..e5f49a408bb48b43acb660297b12dc4d65344170 100644
--- a/templates/gitlab.rb
+++ b/templates/gitlab.rb
@@ -608,8 +608,6 @@ mattermost['gitlab_enable'] = true
 # mattermost['gitlab_token_endpoint'] = "http://gitlab.example.com/oauth/token"
 # mattermost['gitlab_user_api_endpoint'] = "http://gitlab.example.com/api/v3/user"
 mattermost['env'] = {
-  'MM_DB2SETTINGS_BACKUPCREATED' => 'true',
-  'MM_DB2SETTINGS_TEAMNAME' => 'paragon',
   'MM_SERVICESETTINGS_ENABLEINCOMINGWEBHOOKS' => 'true',
   'MM_SERVICESETTINGS_ENABLEPOSTUSERNAMEOVERRIDE' => 'true',
   'MM_SERVICESETTINGS_ENABLEPOSTICONOVERRIDE' => 'true',
@@ -624,6 +622,7 @@ mattermost['env'] = {
   'MM_EMAILSETTINGS_ENABLESIGNUPWITHEMAIL' => 'true',
   'MM_EMAILSETTINGS_ENABLESIGNINWITHEMAIL' => 'true',
   'MM_EMAILSETTINGS_ENABLESIGNINWITHUSERNAME' => 'true',
+  'MM_EMAILSETTINGS_ENABLESMTPAUTH' => 'true',
   'MM_EMAILSETTINGS_SENDEMAILNOTIFICATIONS' => 'true',
   'MM_EMAILSETTINGS_REQUIREEMAILVERIFICATION' => 'false',
   'MM_EMAILSETTINGS_SMTPUSERNAME' => "{{ gitlab_rails.smtp.user_name }}",