diff --git a/config/application.rb b/config/application.rb
index 1f273e84..4e5e9b87 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -72,10 +72,6 @@ module Osem
       default_color:         (ENV['DEFAULT_COLOR'] || '#0B3559')
     }
 
-    config.mailbot = {
-      ytlf_ticket_id: (ENV['YTLF_TICKET_ID'] || 50)
-    }
-
     config.before_configuration do
       env_file = File.join(Rails.root, 'config', 'local_env.yml')
       if File.exist?(env_file)
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 5d60ba96..38f30d0d 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -44,8 +44,9 @@ Osem::Application.configure do
   # Set the secret key base if it's not set via other means
   config.secret_key_base ||= 'f4be765bc98e516de82ac01daa8f8aa11c5ca13cb6c911887851ac89457b6c0b056b2361a21b5c08926c9386e0f91eef84fc0b103d522bf00bc0c78ea8ce7c58'
 
-  # Test email address
+  # Test mailbot settings
   config.mailbot = {
+    ytlf_ticket_id: 50
     bcc_address: 'test@test.com'
   }
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 1f02f976..84db2bb9 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -102,8 +102,9 @@ Osem::Application.configure do
   # Set the secret_key_base from the env, if not set by any other means
   config.secret_key_base ||= ENV["SECRET_KEY_BASE"]
 
-  # Set bcc email address
+  # Mailbot settings
   config.mailbot = {
+    ytlf_ticket_id: (ENV['YTLF_TICKET_ID'] || 50)
     bcc_address: ENV['OSEM_MESSAGE_BCC_ADDRESS']
   }
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 96686b40..a282831c 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -52,8 +52,9 @@ Osem::Application.configure do
     ActiveSupport::Deprecation.silenced = true
   end
 
-  # Test email address
+  # Test mailbot settings
   config.mailbot = {
+    ytlf_ticket_id: 50
     bcc_address: 'test@test.com'
   }
 end