diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 713e72cb5..f0fcec39d 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -16,7 +16,7 @@ Fábio C. Barrionuevo da Luz `@luzfcb`_       @luzfcb
 Saurabh Kumar               `@theskumar`_    @_theskumar
 Jannis Gebauer              `@jayfk`_
 Burhan Khalid               `@burhan`_       @burhan
-Shupeyko Nikita             `@webyneter`_    @webyneter
+Nikita Shupeyko             `@webyneter`_    @webyneter
 Bruno Alla                  `@browniebroke`_ @_BrunoAlla
 =========================== ================ ===========
 
diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.django b/{{cookiecutter.project_slug}}/.envs/.production/.django
index c6def565a..39bbaae44 100644
--- a/{{cookiecutter.project_slug}}/.envs/.production/.django
+++ b/{{cookiecutter.project_slug}}/.envs/.production/.django
@@ -30,7 +30,11 @@ DJANGO_ACCOUNT_ALLOW_REGISTRATION=True
 # django-compressor
 # ------------------------------------------------------------------------------
 COMPRESS_ENABLED=
-{% endif %}{% if cookiecutter.use_sentry_for_error_reporting == 'y' %}
+{% endif %}
+# Gunicorn
+# ------------------------------------------------------------------------------
+WEB_CONCURRENCY=4
+{% if cookiecutter.use_sentry_for_error_reporting == 'y' %}
 # Sentry
 # ------------------------------------------------------------------------------
 DJANGO_SENTRY_DSN=
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 383b15776..c43381092 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -11,7 +11,9 @@ RUN apk update \
   # CFFI dependencies
   && apk add libffi-dev openssl-dev py-cffi \
   # Translations dependencies
-  && apk add gettext
+  && apk add gettext \
+  # https://docs.djangoproject.com/en/2.0/ref/django-admin/#dbshell
+  && apk add postgresql-client
 
 # Requirements have to be pulled and installed here, otherwise caching won't work
 COPY ./requirements /requirements
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index a5ffbc402..e605e2202 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -18,4 +18,4 @@ opbeat==3.6.1  # https://github.com/opbeat/opbeat_python
 # Django
 # ------------------------------------------------------------------------------
 django-storages==1.6.5  # https://github.com/jschneier/django-storages
-django-anymail==1.4  # https://github.com/anymail/django-anymail
+django-anymail==2.0  # https://github.com/anymail/django-anymail