diff --git a/Dockerfile b/Dockerfile
index 04e3134..7da0277 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -87,9 +87,9 @@ RUN apt-get install -y sqlite3 libsqlite3-dev
 RUN echo mysql-server mysql-server/root_password password $DB_PASS | debconf-set-selections;\
     echo mysql-server mysql-server/root_password_again password $DB_PASS | debconf-set-selections;\
     apt-get install -y mysql-server && \
-    echo "default_password_lifetime = 0" >> /etc/mysql/my.cnf && \
-    sed -i '/^bind-address/s/bind-address.*=.*/bind-address = 0.0.0.0/' /etc/mysql/my.cnf
-RUN /usr/sbin/mysqld & \
+    echo "default_password_lifetime = 0" >> /etc/mysql/mysql.conf.d/mysqld.cnf && \
+    sed -i '/^bind-address/s/bind-address.*=.*/bind-address = 0.0.0.0/' /etc/mysql/mysql.conf.d/mysqld.cnf
+RUN /etc/init.d/mysql start & \
     sleep 10s && \
     echo "GRANT ALL ON *.* TO root@'0.0.0.0' IDENTIFIED BY 'secret' WITH GRANT OPTION; CREATE USER 'homestead'@'0.0.0.0' IDENTIFIED BY 'secret'; GRANT ALL ON *.* TO 'homestead'@'0.0.0.0' IDENTIFIED BY 'secret' WITH GRANT OPTION; GRANT ALL ON *.* TO 'homestead'@'%' IDENTIFIED BY 'secret' WITH GRANT OPTION; FLUSH PRIVILEGES; CREATE DATABASE homestead;" | mysql
 VOLUME ["/var/lib/mysql"]
diff --git a/supervisord.conf b/supervisord.conf
index 87f8527..b8e9da1 100644
--- a/supervisord.conf
+++ b/supervisord.conf
@@ -23,9 +23,11 @@ stderr_logfile_maxbytes=0
 stdout_events_enabled=true
 stderr_events_enabled=true
 
-[program:mysql]
-command=/usr/bin/pidproxy /var/run/mysqld/mysqld.pid /usr/sbin/mysqld
+[program:mysqld]
+command=/usr/bin/pidproxy /var/run/mysqld/mysqld.pid /usr/bin/mysqld_safe --pid-file=/var/run/mysqld/mysqld.pid
+autostart=true
 autorestart=true
+user=root
 
 [program:redis]
 command=/usr/bin/redis-server