diff --git a/Makefile b/Makefile
index 25ec0dc..e83c3d6 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ composer:
 	$(EXEC) composer install
 
 start: stop-php
-	PHP_VERSION=$(PHP_VERSION) $(DOCKER_COMPOSE) up --build -d
+	PHP_VERSION=$(PHP_VERSION) $(DOCKER_COMPOSE) up --build -d --wait
 
 stop:
 	$(DOCKER_COMPOSE) stop
diff --git a/docker-compose.yml b/docker-compose.yml
index 256923e..df49814 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -45,9 +45,27 @@ services:
       - ./:/data
 
   mysql:
-    image: skpr/mtk-mysql-empty:latest
+    image: mysql:latest
     network_mode: service:nginx
+    environment:
+      MYSQL_ALLOW_EMPTY_PASSWORD: 1
+      MYSQL_USER: local
+      MYSQL_PASSWORD: local
+      MYSQL_DATABASE: local
+    volumes:
+      - mysql-data:/var/lib/mysql
+    healthcheck:
+      test: [ "CMD", "mysql", "-e", "USE local;" ]
+      interval: 1s
+      retries: 30
 
   selenium:
     image: ${SELENIUM_IMAGE:-selenium/standalone-chrome}
     network_mode: service:nginx
+
+volumes:
+  mysql-data:
+    driver: local
+    driver_opts:
+      type: tmpfs
+      device: tmpfs