diff --git a/conf/application.docker.conf b/conf/application.docker.conf
index 408088703..b773210cf 100644
--- a/conf/application.docker.conf
+++ b/conf/application.docker.conf
@@ -39,6 +39,7 @@ csv.path="./Upload/CSV"
 
 #Register eBean classes
 ebean.default=["femr.data.models.*"]
+play.evolutions.db.default.autoApply=true
 
 #Register Guice modules
 play.modules.enabled += "femr.util.dependencyinjection.modules.BusinessLayerModule"
diff --git a/docker-compose.yml b/docker-compose.yml
index fb15e39d1..be16c8367 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,14 +18,20 @@ services:
       - "--log-bin-trust-function-creators=1"
     volumes:
       - db-data:/var/lib/mysql
+    healthcheck:
+      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
+      timeout: 20s
+      retries: 10
 
   femr:
     build: .
     links: 
       - db:mysql
     depends_on: 
-      - db
+      db:
+        condition: service_healthy
     tty: true
+    restart: on-failure:10
     ports:
       - '9000:9000'