diff --git a/.jvmopts b/.jvmopts
index f67362b4..1ca09794 100644
--- a/.jvmopts
+++ b/.jvmopts
@@ -1,3 +1,4 @@
 -Xms2048M
 -Xmx2048M
 -Xss6M
+-Dconfig.override_with_env_vars=true
diff --git a/docker-compose.yml b/docker-compose.yml
index e94117e4..98e2f64d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,8 @@ services:
       - 51000-51001:51000-51001/udp
       - 51002:51002/tcp
     command: sbt server/run
+    environment:
+      CONFIG_FORCE_database_host: db
   adminer:
     image: adminer
     ports: