diff --git a/.circleci/config.yml b/.circleci/config.yml
index bb7eeb797..6d53c3bb8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -36,10 +36,10 @@ jobs:
     parallelism: 4
     environment:
       RAILS_VERSION: << parameters.rails_version >>
-      POSTGRES_DB: circle_test
-      POSTGRES_HOST: 127.0.0.1
-      POSTGRES_USER: postgres
-      TEST_DB: circle_test
+      DATABASE_NAME: circle_test
+      DATABASE_HOST: 127.0.0.1
+      DATABASE_USER: postgres
+      DATABASE_TEST_NAME: circle_test
       BUNDLE_PATH: vendor/bundle
       COVERALLS_PARALLEL: true
       BUNDLE_JOBS: 4
diff --git a/.env b/.env
index 6e4bc9392..b4097a4bd 100644
--- a/.env
+++ b/.env
@@ -1,7 +1,7 @@
 CHROME_HOSTNAME=chrome
-DB_ADAPTER=postgresql
-POSTGRES_DB=hyku
-POSTGRES_HOST=db
-POSTGRES_PASSWORD=DatabaseFTW
-POSTGRES_USER=postgres
-TEST_DB=hyku_test
\ No newline at end of file
+DATABASE_ADAPTER=postgresql
+DATABASE_NAME=hyku
+DATABASE_HOST=db
+DATABASE_PASSWORD=DatabaseFTW
+DATABASE_USER=postgres
+DATBASE_TEST_NAME=hyku_test
\ No newline at end of file
diff --git a/config/database.yml b/config/database.yml
index b8e61c007..a94598a26 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,12 +1,12 @@
 # Hi - please dont edit this file directly, instead make changes in your .env file
 
 login: &login
-  adapter: <%= ENV['DB_ADAPTER'] || 'postgresql' %>
-  host: <%= ENV['POSTGRES_HOST'] %>
-  username: <%= ENV['POSTGRES_USER'] %>
-  password: <%= ENV['POSTGRES_PASSWORD'] %>
-  database: <%= ENV['POSTGRES_DB'] || 'hyku' %>
-  pool: 5
+  adapter: <%= ENV['DATABASE_ADAPTER'] || 'postgresql' %>
+  host: <%= ENV['DATABASE_HOST'] %>
+  username: <%= ENV['DATABASE_USER'] %>
+  password: <%= ENV['DATABASE_PASSWORD'] %>
+  database: <%= ENV['DATABASE_NAME'] || 'hyku' %>
+  pool: 50
   timeout: 5000
 
 
@@ -15,7 +15,7 @@ development:
 
 test:
   <<: *login
-  database: <%= ENV['TEST_DB'] || 'hyku_test' %>
+  database: <%= ENV['DATABASE_TEST_NAME'] || 'hyku_test' %>
 
 staging:
   <<: *login
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
index 4040ab107..d5dde8afb 100644
--- a/docker-compose.production.yml
+++ b/docker-compose.production.yml
@@ -100,6 +100,10 @@ services:
     image: postgres:11.1
     env_file:
       - .env
+    environment:
+      - POSTGRES_DB=${DATABASE_NAME}
+      - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
+      - POSTGRES_USER=${DATABASE_USER}
     volumes:
       - db:/var/lib/postgresql/data
     networks:
@@ -110,7 +114,6 @@ services:
     env_file:
       - .env
     environment:
-      - DATABASE_URL=postgresql://postgres@db/postgres
       - FEDORA_URL=http://fcrepo:8080/fcrepo/rest
       - IN_DOCKER=true
       - LD_LIBRARY_PATH=/opt/fits/tools/mediainfo/linux
diff --git a/docker-compose.yml b/docker-compose.yml
index e6cee8805..110f5edf2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,6 @@ networks:
 services:
   zoo1:
     image: zookeeper:3.4
-    restart: always
     environment:
       - ZOO_MY_ID=1
       - ZOO_SERVERS=server.1=zoo1:2888:3888
@@ -62,6 +61,10 @@ services:
     image: postgres:11.1
     env_file:
       - .env
+    environment:
+      - POSTGRES_DB=${DATABASE_NAME}
+      - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
+      - POSTGRES_USER=${DATABASE_USER}
     volumes:
       - db:/var/lib/postgresql/data
     networks:
@@ -81,7 +84,6 @@ services:
     env_file:
       - .env
     environment:
-      - DATABASE_URL=postgresql://postgres@db/postgres
       - FEDORA_URL=http://fcrepo:8080/fcrepo/rest
       - IN_DOCKER=true
       - LD_LIBRARY_PATH=/opt/fits/tools/mediainfo/linux
@@ -141,7 +143,6 @@ services:
   initialize_app:
     extends:
       service: app
-    restart: on-failure
     command: bundle exec rails zookeeper:upload
     depends_on:
       - zoo1
@@ -149,7 +150,6 @@ services:
   db_migrate:
     extends:
       service: app
-    restart: on-failure
     command: bundle exec rails db:migrate
     depends_on:
       - db
diff --git a/ops/env.conf b/ops/env.conf
index 464575916..bbbd2dd11 100644
--- a/ops/env.conf
+++ b/ops/env.conf
@@ -1,5 +1,11 @@
-env DATABASE_URL;
+env DATABASE_ADAPTER;
+env DATABASE_HOST;
+env DATABASE_NAME;
+env DATABASE_PASSWORD;
+env DATABASE_USER;
+env DATBASE_TEST_NAME;
 env FEDORA_URL;
+env GOOGLE_FONTS_KEY;
 env LD_LIBRARY_PATH;
 env PASSENGER_APP_ENV;
 env RAILS_ENV;