diff --git a/config/environments/production.rb b/config/environments/production.rb
index 164ec83..b1b3683 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -6,18 +6,13 @@ Rails.application.configure do
   # Code is not reloaded between requests.
   config.cache_classes = true
 
-  Rails.application.routes.default_url_options[:host] = ENV.fetch("APP_HOST", "0.0.0.0")
-  Rails.application.routes.default_url_options[:port] = ENV.fetch("APP_PORT", 3000)
+  #Rails.application.routes.default_url_options[:host] = ENV.fetch("APP_HOST", "0.0.0.0")
+  #Rails.application.routes.default_url_options[:port] = ENV.fetch("APP_PORT", 3000)
+
 
   # Force Rails to generate URLs with your hostname instead of localhost
   Rails.application.routes.default_url_options = {
-    host: ENV.fetch("APP_HOST", "beere5"),
-    port: ENV.fetch("APP_PORT", 3000)
-  }
-
-  # Force Rails to generate URLs with your hostname instead of localhost
-  Rails.application.routes.default_url_options = {
-    host: ENV.fetch("APP_HOST", "wedding.linepe.de"),
+    host: ENV.fetch("APP_HOST", ENV['CANONICAL_HOST'],
     port: ENV.fetch("APP_PORT", 3000)
   }
 
@@ -81,7 +76,7 @@ Rails.application.configure do
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-  # config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.raise_delivery_errors = true
 
   config.action_mailer.default_url_options = {
     host: ENV['CANONICAL_HOST'],