diff --git a/base_app/settings.py b/base_app/settings.py
index c5f9b55..b40ffc3 100644
--- a/base_app/settings.py
+++ b/base_app/settings.py
@@ -29,6 +29,8 @@
 # Databases
 DATABASES = {
     'default': env.db_opts('DATABASE_URL', default="sqlite://:memory:", options={
+        'USER': env.str('DATABASE_USER', default='postgres'),
+        'PASSWORD': env.str('DATABASE_PASSWORD', default='postgres'),  # needed in case password has non-URL safe chars
         'CONN_MAX_AGE': env.int('DATABASE_CONNECTION_AGE', default=600),
     }),
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index a49e045..a2f0e93 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,8 +14,9 @@ x-common: &app-common
     DATABASE_USER: postgres
     DATABASE_PASSWORD: postgres
     CACHE_URL: redis://cache:6379/0
-    CELERY_BROKER_URL: redis://cache:6379/1
-    CELERY_RESULT_BACKEND: redis://cache:6379/2
+    SESSION_CACHE_URL: redis://cache:6379/1
+    CELERY_BROKER_URL: redis://cache:6379/2
+    CELERY_RESULT_BACKEND: redis://cache:6379/3
   user: ${UID:-app_user}
   volumes:
     - ${COMPOSE_APP_PATH:-.}:/usr/src/app:delegated