diff --git a/config/environments/development.rb.SAMPLE b/config/environments/development.rb.SAMPLE
index e497d441..25f8662c 100644
--- a/config/environments/development.rb.SAMPLE
+++ b/config/environments/development.rb.SAMPLE
@@ -43,7 +43,7 @@ Foodsoft::Application.configure do
   # Mailcatcher config, start mailcatcher from console with 'mailcatcher'
   # Mailcatcher can be installed by gem install mailcatcher
   config.action_mailer.delivery_method = :smtp
-  config.action_mailer.smtp_settings = { address: ENV.fetch('MAILCATCHER_PORT_1025_TCP_ADDR', 'localhost'), port: ENV.fetch('MAILCATCHER_PORT_1025_TCP_PORT', 1025) }
+  config.action_mailer.smtp_settings = { address: ENV.fetch("MAILCATCHER_PORT_25_TCP_ADDR", "localhost"), port: ENV.fetch("MAILCATCHER_PORT_25_TCP_PORT", 1025) }
 
   # Run resque tasks as part of the main app (not recommended for production)
   Resque.inline = true unless ENV['REDIS_URL']
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index c2ec4cdd..10094c24 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -22,9 +22,9 @@ services:
       - TEST_DATABASE_URL=mysql2://root:secret@mariadb/test?encoding=utf8
 
   mailcatcher:
-    image: aboutsource/mailcatcher
+    image: tophfr/mailcatcher
     ports:
-      - "1080:1080"
+      - "1080:80"
 
   mariadb:
     image: mariadb:10.1