diff --git a/docker-compose.yml b/docker-compose.yml
index 2868e53ef7dc9f6ee87a65a46127f61be7e6e70a..0fc5bac78608feb8b8d5bb03d68c6acc43483edd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,7 +30,9 @@ services:
       - "traefik.http.routers.backend-cqi.entrypoints=websecure"
       - "traefik.http.routers.backend-cqi.tls.certresolver=myresolver"
     env_file:
-      - ./.env # Copy the .env file into the container
+      - ./.env
+    volumes:
+      - ./.env:/app/.env
     depends_on:
       - postgres
   postgres:
@@ -41,6 +43,8 @@ services:
       - POSTGRES_PASSWORD=${DB_PASSWORD}
     ports:
       - "5432:5432"
+    env_file:
+      - ./.env
     volumes:
       - postgres_data:/var/lib/postgresql/data
 volumes:
diff --git a/server/configure_db.sh b/server/configure_db.sh
new file mode 100644
index 0000000000000000000000000000000000000000..a9a5ef3636f5196cd262d400f19aebdda397573c
--- /dev/null
+++ b/server/configure_db.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+sqlx database create
+sqlx migrate run
diff --git a/server/launch_db.sh b/server/launch_db.sh
index aa872f38493d887a4630a3ae41c2e686738fde5d..3057a9eabfb72f54b6a60b81f19139e872c32795 100755
--- a/server/launch_db.sh
+++ b/server/launch_db.sh
@@ -13,7 +13,6 @@ fi
 set -x
 set -eo pipefail
 
-
 docker run \
     -e POSTGRES_USER=${DB_USER} \
     -e POSTGRES_PASSWORD=${DB_PASSWORD} \
@@ -28,5 +27,4 @@ done
 
 >&2 echo "Postgres is up and running on port ${DB_PORT}"
 
-sqlx database create
-sqlx migrate run
+bash configure_db.sh