diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index 86808bfd..207f0ea2 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -115,6 +115,7 @@ Consider the aforementioned ``.envs/.local/.postgres``: ::
 
     # PostgreSQL
     # ------------------------------------------------------------------------------
+    POSTGRES_HOST=postgres
     POSTGRES_DB=<your project slug>
     POSTGRES_USER=XgOWtQtJecsAbaIyslwGvFvPawftNaqO
     POSTGRES_PASSWORD=jSljDz4whHuwO3aJIgVBrqEml5Ycbghorep4uVJ4xjDYQu0LfuTZdctj7y0YcCLu
diff --git a/{{cookiecutter.project_slug}}/.envs/.local/.postgres b/{{cookiecutter.project_slug}}/.envs/.local/.postgres
index 87203da0..5b115017 100644
--- a/{{cookiecutter.project_slug}}/.envs/.local/.postgres
+++ b/{{cookiecutter.project_slug}}/.envs/.local/.postgres
@@ -1,5 +1,6 @@
 # PostgreSQL
 # ------------------------------------------------------------------------------
+POSTGRES_HOST=postgres
 POSTGRES_DB={{ cookiecutter.project_slug }}
 POSTGRES_USER=!!!SET POSTGRES_USER!!!
 POSTGRES_PASSWORD=!!!SET POSTGRES_PASSWORD!!!
diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.postgres b/{{cookiecutter.project_slug}}/.envs/.production/.postgres
index 87203da0..5b115017 100644
--- a/{{cookiecutter.project_slug}}/.envs/.production/.postgres
+++ b/{{cookiecutter.project_slug}}/.envs/.production/.postgres
@@ -1,5 +1,6 @@
 # PostgreSQL
 # ------------------------------------------------------------------------------
+POSTGRES_HOST=postgres
 POSTGRES_DB={{ cookiecutter.project_slug }}
 POSTGRES_USER=!!!SET POSTGRES_USER!!!
 POSTGRES_PASSWORD=!!!SET POSTGRES_PASSWORD!!!
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
index 0e0121c2..a995867f 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
+++ b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
@@ -14,7 +14,7 @@ if [ -z "${POSTGRES_USER}" ]; then
     base_postgres_image_default_user='postgres'
     export POSTGRES_USER="${base_postgres_image_default_user}"
 fi
-export DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}"
+export DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:5432/${POSTGRES_DB}"
 
 postgres_ready() {
 python << END
@@ -27,7 +27,7 @@ try:
         dbname="${POSTGRES_DB}",
         user="${POSTGRES_USER}",
         password="${POSTGRES_PASSWORD}",
-        host="postgres"
+        host="${POSTGRES_HOST}"
     )
 except psycopg2.OperationalError:
     sys.exit(-1)
diff --git a/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/backup b/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/backup
index 10674f9f..31c59b2b 100644
--- a/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/backup
+++ b/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/backup
@@ -25,7 +25,7 @@ if [[ "${POSTGRES_USER}" == "postgres" ]]; then
     exit 1
 fi
 
-export PGHOST="postgres"
+export PGHOST="${POSTGRES_HOST}"
 export PGUSER="${POSTGRES_USER}"
 export PGPASSWORD="${POSTGRES_PASSWORD}"
 export PGDATABASE="${POSTGRES_DB}"
diff --git a/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/restore b/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/restore
index b2e0a18d..3d4f46c8 100644
--- a/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/restore
+++ b/{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/restore
@@ -37,7 +37,7 @@ if [[ "${POSTGRES_USER}" == "postgres" ]]; then
     exit 1
 fi
 
-export PGHOST="postgres"
+export PGHOST="${POSTGRES_HOST}"
 export PGUSER="${POSTGRES_USER}"
 export PGPASSWORD="${POSTGRES_PASSWORD}"
 export PGDATABASE="${POSTGRES_DB}"