diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index caf624e..3159668 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,8 +23,11 @@ python tests:
   variables:
     PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
     DJANGO_SETTINGS_MODULE: "newsreader.conf.gitlab"
-    POSTGRES_DB: newsreader
-    POSTGRES_USER: newsreader
+    POSTGRES_HOST: "$POSTGRES_HOST"
+    POSTGRES_DB: "$POSTGRES_NAME"
+    POSTGRES_NAME: "$POSTGRES_NAME"
+    POSTGRES_USER: "$POSTGRES_USER"
+    POSTGRES_PASSWORD: "$POSTGRES_PASSWORD"
   cache:
     key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
     paths:
diff --git a/docker-compose.yml b/docker-compose.yml
index 7987022..f4ab666 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,8 +6,9 @@ services:
     image: postgres
     container_name: postgres
     environment:
-      - POSTGRES_USER=newsreader
-      - POSTGRES_DB=newsreader
+      - POSTGRES_DB=$POSTGRES_NAME
+      - POSTGRES_USER=$POSTGRES_USER
+      - POSTGRES_PASSWORD=$POSTGRES_PASSWORD
   rabbitmq:
     image: rabbitmq:3.7
     container_name: rabbitmq
@@ -16,6 +17,10 @@ services:
     container_name: celery
     command: celery -A newsreader worker --beat --scheduler django --workdir=/app/src/
     environment:
+      - POSTGRES_HOST=$POSTGRES_HOST
+      - POSTGRES_NAME=$POSTGRES_NAME
+      - POSTGRES_USER=$POSTGRES_USER
+      - POSTGRES_PASSWORD=$POSTGRES_PASSWORD
       - DJANGO_SETTINGS_MODULE=newsreader.conf.docker
     volumes:
       - .:/app
@@ -26,6 +31,10 @@ services:
     container_name: web
     command: src/entrypoint.sh
     environment:
+      - POSTGRES_HOST=$POSTGRES_HOST
+      - POSTGRES_NAME=$POSTGRES_NAME
+      - POSTGRES_USER=$POSTGRES_USER
+      - POSTGRES_PASSWORD=$POSTGRES_PASSWORD
       - DJANGO_SETTINGS_MODULE=newsreader.conf.docker
     volumes:
       - .:/app
diff --git a/src/newsreader/conf/base.py b/src/newsreader/conf/base.py
index c0a84c1..cf8b535 100644
--- a/src/newsreader/conf/base.py
+++ b/src/newsreader/conf/base.py
@@ -84,8 +84,10 @@ WSGI_APPLICATION = "newsreader.wsgi.application"
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.postgresql_psycopg2",
-        "NAME": "newsreader",
-        "USER": "newsreader",
+        "HOST": os.environ.get("POSTGRES_HOST"),
+        "NAME": os.environ.get("POSTGRES_NAME"),
+        "USER": os.environ.get("POSTGRES_USER"),
+        "PASSWORD": os.environ.get("POSTGRES_PASSWORD"),
     }
 }
 
diff --git a/src/newsreader/conf/docker.py b/src/newsreader/conf/docker.py
index d8e3142..c616942 100644
--- a/src/newsreader/conf/docker.py
+++ b/src/newsreader/conf/docker.py
@@ -1,17 +1,6 @@
 from .dev import *
 
 
-# Database
-# https://docs.djangoproject.com/en/2.2/ref/settings/#databases
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.postgresql_psycopg2",
-        "NAME": "newsreader",
-        "USER": "newsreader",
-        "HOST": "db",
-    }
-}
-
 # Celery
 # https://docs.celeryproject.org/en/latest/userguide/configuration.html
 BROKER_URL = "amqp://guest:guest@rabbitmq:5672//"
diff --git a/src/newsreader/conf/gitlab.py b/src/newsreader/conf/gitlab.py
index a50781e..ddacab9 100644
--- a/src/newsreader/conf/gitlab.py
+++ b/src/newsreader/conf/gitlab.py
@@ -4,12 +4,3 @@ from .base import *  # noqa
 DEBUG = True
 
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
-
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.postgresql_psycopg2",
-        "NAME": "newsreader",
-        "USER": "newsreader",
-        "HOST": "postgres",
-    }
-}