diff --git a/docker-compose.yml b/docker-compose.yml
index 470a446d..56cec4d3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: "3.3"
 services:
   db:
     image: postgres
@@ -8,8 +7,12 @@ services:
       - POSTGRES_DB=catanatron_db
     ports:
       - 5432:5432
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -d postgresql://catanatron:victorypoint@db:5432/catanatron_db"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
   server:
-    image: bcollazo/catanatron-server:latest
     build:
       context: .
       dockerfile: Dockerfile.web
@@ -19,12 +22,13 @@ services:
     ports:
       - 5000:5000
     stdin_open: true
+    restart: always
     volumes:
       - .:/app
     depends_on:
-      - "db"
+      db:
+        condition: service_healthy
   react-ui:
-    image: bcollazo/catanatron-react-ui:latest
     build: ./ui
     ports:
       - 3000:3000