diff --git a/docker-compose.yml b/docker-compose.yml
index 4af6bd4ed..c33b44653 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,17 +1,17 @@
 version: '2.3'
 services:
   database:
-    image: quay.io/azavea/postgis:2.2-postgres9.5-slim
+    image: postgis/postgis:13-3.1
     environment:
       - POSTGRES_USER=planit
       - POSTGRES_PASSWORD=planit
       - POSTGRES_DB=planit
     healthcheck:
-      test: ["CMD", "pg_isready", "-U", "planit"]
+      test: "pg_isready -q -h database -U planit"
       interval: 3s
-      timeout: 3s
+      timeout: 15s
       retries: 3
-      start_period: 5s
+      start_period: 8s
   angular:
     image: planit-spa
     build: