diff --git a/Dockerfile b/Dockerfile
index eee304b..f288929 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,6 @@ RUN dotnet restore "src/DiIiS-NA/Blizzless.csproj"
 
 # Copy the rest of the project files and build the application
 COPY ["src/", "src/"]
-COPY ["db/", "db/"]
 WORKDIR "/app/src/DiIiS-NA"
 RUN dotnet publish "Blizzless.csproj" -c Release --runtime linux-x64 --self-contained true -o /app/publish
 
diff --git a/docker-compose.yml b/docker-compose.yml
index bf40e99..e9a4dac 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,8 @@ services:
       dockerfile: Dockerfile
     container_name: diiis-na-server
     depends_on:
-      - db
+      - db:
+        condition: service_healthy
 
   db:
     image: postgres:17
@@ -17,6 +18,11 @@ services:
     volumes:
       - db-data:/var/lib/postgresql/data
       - ./db/initdb:/docker-entrypoint-initdb.d
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
 volumes:
   db-data: