diff --git a/docker-compose.yml b/docker-compose.yml
index dca00e0..30f297e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,7 @@ services:
       - 8012:8080
     depends_on:
       - database
+    restart: on-failure
     volumes:
       - ./data/temp:/temp
       - ./data/uploads:/uploads
@@ -19,3 +20,5 @@ services:
       POSTGRES_USER: bsfe
       POSTGRES_PASSWORD: Ch@NgEME!
       POSTGRES_DB: bsfe
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "bsfe"]