diff --git a/docker-compose.yml b/docker-compose.yml
index 9e68b633..0303a811 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -101,7 +101,10 @@ services:
 ### MySQL Container #########################################
 
     mysql:
-        build: ./mysql
+        build:
+            context: ./mysql
+            args:
+                - MAX_ALLOWED_PACKET=20M
         volumes_from:
             - volumes_data
         ports:
diff --git a/mysql/Dockerfile b/mysql/Dockerfile
index ae60244f..c5451ef9 100644
--- a/mysql/Dockerfile
+++ b/mysql/Dockerfile
@@ -2,6 +2,12 @@ FROM mysql:latest
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
+ARG MAX_ALLOWED_PACKET=1M
+ENV MAX_ALLOWED_PACKET ${MAX_ALLOWED_PACKET}
+
+# Set MAX_ALLOWED_PACKET to /etc/mysql/my.cnf
+RUN sed -i "s/^\[mysqld\]$/\[mysqld\]\nmax_allowed_packet = ${MAX_ALLOWED_PACKET}/g" /etc/mysql/my.cnf
+
 CMD ["mysqld"]
 
 EXPOSE 3306