diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f9c9a5291..39235b609 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,6 +12,9 @@ tests:
     paths:
       - vendor/
   variables:
+    DB_HOST: postgres
+    PGUSER: consul
+    PGPASSWORD: password
     POSTGRES_USER: consul
     POSTGRES_PASSWORD: password
     RAILS_ENV: test
@@ -20,7 +23,6 @@ tests:
   script:
     - apt-get update && apt-get install -y nodejs npm chromium
     - for i in config/*.example; do cp "$i" "${i/.example}"; done
-    - for i in config/*.gitlab; do cp "$i" "${i/.gitlab}"; done
     - bundle --without development
     - npm clean-install
     - bundle exec rake db:setup
diff --git a/config/database-docker.yml.example b/config/database-docker.yml.example
deleted file mode 100644
index 2fb012a61..000000000
--- a/config/database-docker.yml.example
+++ /dev/null
@@ -1,29 +0,0 @@
-default: &default
-  adapter: postgresql
-  encoding: unicode
-  #host: localhost
-  host: database #<--the name of the db in the docker-compose
-  pool: 5
-  port: 5432
-  schema_search_path: "public,shared_extensions"
-  username: postgres
-  password: <%= ENV["POSTGRES_PASSWORD"] %>
-
-development: &development
-  <<: *default
-  database: consul_development
-
-# The staging, preproduction and production dbs are only needed
-# for running rake assets:precompile locally before deploying
-staging:
-  <<: *development
-
-preproduction:
-  <<: *development
-
-production:
-  <<: *development
-
-test:
-  <<: *default
-  database: consul_test
diff --git a/config/database.yml.example b/config/database.yml.example
index 2e5e8d82d..5a44e492a 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -1,11 +1,11 @@
 default: &default
   adapter: postgresql
   encoding: unicode
-  host: localhost
+  host: <%= ENV["DB_HOST"].presence || "localhost" %>
   pool: 5
   schema_search_path: "public,shared_extensions"
-  username:
-  password:
+  username: <%= ENV["PGUSER"].presence %>
+  password: <%= ENV["PGPASSWORD"].presence || ENV["POSTGRES_PASSWORD"].presence %>
 
 development: &development
   <<: *default
diff --git a/config/database.yml.gitlab b/config/database.yml.gitlab
deleted file mode 100644
index da09aabec..000000000
--- a/config/database.yml.gitlab
+++ /dev/null
@@ -1,12 +0,0 @@
-default: &default
-  adapter: postgresql
-  encoding: unicode
-  host: postgres
-  pool: 5
-  schema_search_path: "public,shared_extensions"
-  username: consul
-  password: password
-
-test:
-  <<: *default
-  database: consul_test
diff --git a/docker-compose.yml b/docker-compose.yml
index 1ffa2db3f..9fa49af98 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,7 @@ services:
     # see https://hub.docker.com/_/postgres/
     image: postgres:13.16
     environment:
+      - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=$POSTGRES_PASSWORD
     # persist the database between containers by storing it in a volume
     volumes:
@@ -34,6 +35,9 @@ services:
       - bundle:/usr/local/bundle
       - node_modules:/var/www/consul/node_modules
     environment:
+      - DB_HOST=database # Same name as the database service
+      - PGUSER=postgres
+      - PGPASSWORD=${PGPASSWORD-$POSTGRES_PASSWORD}
       - POSTGRES_PASSWORD=$POSTGRES_PASSWORD
 volumes:
   db_data: {}
diff --git a/docs/en/installation/docker.md b/docs/en/installation/docker.md
index c2c23187f..88f42a101 100644
--- a/docs/en/installation/docker.md
+++ b/docs/en/installation/docker.md
@@ -44,7 +44,7 @@ Then create the secrets and database config files based on the example files:
 
 ```bash
 cp config/secrets.yml.example config/secrets.yml
-cp config/database-docker.yml.example config/database.yml
+cp config/database.yml.example config/database.yml
 ```
 
 Then build the image with:
diff --git a/docs/es/installation/docker.md b/docs/es/installation/docker.md
index 4f7994e38..8db5d62c3 100644
--- a/docs/es/installation/docker.md
+++ b/docs/es/installation/docker.md
@@ -44,7 +44,7 @@ A continuación, crea los ficheros de `config/secrets.yml` y `config/database.ym
 
 ```bash
 cp config/secrets.yml.example config/secrets.yml
-cp config/database-docker.yml.example config/database.yml
+cp config/database.yml.example config/database.yml
 ```
 
 Ahora genera la imagen con: