diff --git a/.env.example b/.env.example
index e25a714..e025497 100644
--- a/.env.example
+++ b/.env.example
@@ -10,7 +10,8 @@ WIREGUARD_ADDRESSES=10.99.99.99/32,ff:ff:ff...:ff/128
 #PostgreSQL Config
 POSTGRES_PASSWORD=drop
 POSTGRES_USER=drop
-POSTGRES_DB=drop
+POSTGRES_DB_DROP=drop
+POSTGRES_DB_GAMEVAULT=gamevault
 
 #Drop Server Config
 LIBRARY_PATH=./library
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 5e26ba7..9d9a51f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -6,8 +6,6 @@ services:
     networks:
       gluetun-drop-network:
         ipv4_address: 172.20.0.20
-    env_file:
-    - .env
     cap_add:
       - NET_ADMIN
       - NET_RAW
@@ -30,10 +28,8 @@ services:
     container_name: postgres-shielded
     network_mode: "service:gluetun"
     restart: unless-stopped
-    env_file:
-    - .env
     healthcheck:
-      test: pg_isready -d ${POSTGRES_DB} -U ${POSTGRES_USER}
+      test: pg_isready -d ${POSTGRES_DB_DROP} -U ${POSTGRES_USER}
       interval: 30s
       timeout: 60s
       retries: 5
@@ -46,7 +42,7 @@ services:
       - HOSTNAME=postgres-shielded
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
       - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_DB=${POSTGRES_DB}
+      - POSTGRES_DB=${POSTGRES_DB_DROP}
   nginx:
     image: nginx:alpine
     container_name: nginx-shielded
@@ -67,8 +63,6 @@ services:
     depends_on:
       postgres:
         condition: service_healthy
-    env_file:
-    - .env
     security_opt:
       - "label=disable"
     volumes:
@@ -79,17 +73,24 @@ services:
       - ${DROP_DATA_PATH}:/data
     environment:
       - HOSTNAME=drop-shielded
-      - DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres-shielded:5432/${POSTGRES_DB}
+      - DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres-shielded:5432/${POSTGRES_DB_DROP}
       - EXTERNAL_URL=http://${DROP_DDNS}:${DROP_AIRVPN_PORT}
   gamevault-backend:
     image: phalcode/gamevault-backend:latest
     container_name: gamevault-backend
     network_mode: "service:gluetun"
     restart: unless-stopped
+    depends_on:
+      postgres:
+        condition: service_healthy
+    env_file:
+    - .env
     environment:
       - DB_HOST=postgres-shielded
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - POSTGRES_USER=${POSTGRES_USER}
+      - DB_PORT=5432
+      - DB_DATABASE=${POSTGRES_DB_GAMEVAULT}
+      - DB_USERNAME=${POSTGRES_USER}
+      - DB_PASSWORD=${POSTGRES_PASSWORD}
     security_opt:
       - "label=disable"
     volumes: