diff --git a/mysql/Dockerfile b/mysql/Dockerfile
index 73bd8335..d6aa3eb0 100644
--- a/mysql/Dockerfile
+++ b/mysql/Dockerfile
@@ -1,4 +1,4 @@
-FROM mysql:5.6
+FROM mysql:5.7
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
diff --git a/mysql/my.cnf b/mysql/my.cnf
index e4c1ddbd..2983739a 100644
--- a/mysql/my.cnf
+++ b/mysql/my.cnf
@@ -4,3 +4,6 @@
 # http://dev.mysql.com/doc/mysql/en/server-system-variables.html
 
 [mysql]
+
+[mysqld]
+sql-mode="STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"