diff --git a/docs/2-local-development/developing-locally.rst b/docs/2-local-development/developing-locally.rst
index 04350d0d1..8c0ad1480 100644
--- a/docs/2-local-development/developing-locally.rst
+++ b/docs/2-local-development/developing-locally.rst
@@ -54,7 +54,7 @@ First things first.
 
 #. Set the environment variables for your database(s): ::
 
-    $ export POSTGRES_USER=
+    $ export POSTGRES_USER=postgres
     $ export POSTGRES_PASSWORD=
     $ export POSTGRES_DB=<DB name given to createdb>
     # Optional: set broker URL if using Celery
diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index 982a990cf..428798f63 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -57,9 +57,8 @@ jobs:
 
     env:
       {%- if cookiecutter.use_celery == 'y' %}
-      CELERY_BROKER_URL: 'redis://localhost:6379/0'
+      REDIS_URL: 'redis://localhost:6379/0'
       {%- endif %}
-      # postgres://user:password@host:port/database
       POSTGRES_USER: 'postgres'
       POSTGRES_PASSWORD: 'postgres'
       POSTGRES_DB: 'postgres'
diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index 7f4145996..24d9e8b93 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -5,6 +5,7 @@ stages:
 variables:
   POSTGRES_USER: '{{ cookiecutter.project_slug }}'
   POSTGRES_PASSWORD: ''
+  POSTGRES_HOST: postgres
   POSTGRES_DB: 'test_{{ cookiecutter.project_slug }}'
   POSTGRES_HOST_AUTH_METHOD: trust
   {%- if cookiecutter.use_celery == 'y' %}