diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index 504085d61..d1ca1cc56 100644
--- a/{{cookiecutter.project_slug}}/config/settings/local.py
+++ b/{{cookiecutter.project_slug}}/config/settings/local.py
@@ -3,7 +3,11 @@
 Local settings
 
 - Run in Debug mode
+{% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'y' %}
+- Use mailhog for emails
+{% else %}
 - Use console backend for emails
+{% endif %}
 - Add Django Debug Toolbar
 - Add django-extensions as app
 """
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index e4a919128..198a3e371 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -2,10 +2,9 @@
 """
 Production Configurations
 
-- Use djangosecure
 - Use Amazon's S3 for storing static files and uploaded media
 - Use mailgun to send emails
-- Use Redis on Heroku
+- Use Redis for cache
 {% if cookiecutter.use_sentry_for_error_reporting == 'y' %}
 - Use sentry for error logging
 {% endif %}