diff --git a/docker-compose.yaml b/docker-compose.yaml
index 4acf7233f..c2c352393 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -63,7 +63,7 @@ services:
   db:
     image: postgres
     container_name: postgres
-    restart: always
+    restart: on-failure
     ports:
       - 5432:5432
     environment:
diff --git a/local/openfga/entrypoint.sh b/local/openfga/entrypoint.sh
index 8201ed77b..b27400c80 100755
--- a/local/openfga/entrypoint.sh
+++ b/local/openfga/entrypoint.sh
@@ -20,5 +20,5 @@ wget -q -O - --header 'Content-Type: application/json' --header 'Authorization:
 psql -Atx "$OPENFGA_DATASTORE_URI" -c "INSERT INTO store (id,name,created_at,updated_at) VALUES ('01GP1254CHWJC1MNGVB0WDG1T0','jimm',NOW(),NOW()) ON CONFLICT DO NOTHING;"
 psql -Atx "$OPENFGA_DATASTORE_URI" -c "UPDATE authorization_model SET authorization_model_id = '01GP1EC038KHGB6JJ2XXXXCXKB' WHERE store = '01GP1254CHWJC1MNGVB0WDG1T0';"
 
-# Keep container alive
-tail -f /dev/null & trap 'kill %1' TERM ; wait
+# Handle exit signals
+trap 'kill %1' TERM ; wait
diff --git a/local/vault/entrypoint.sh b/local/vault/entrypoint.sh
index 5de2a6bfe..a6534793e 100755
--- a/local/vault/entrypoint.sh
+++ b/local/vault/entrypoint.sh
@@ -44,5 +44,5 @@ vault secrets enable -version=2 -path /jimm-kv kv
 # This container is now healthy
 touch /tmp/healthy
 
-# Keep container alive
-tail -f /dev/null & trap 'kill %1' TERM ; wait
+# Handle exit signals
+trap 'kill %1' TERM ; wait