diff --git a/mysql/defaults/main.yml b/mysql/defaults/main.yml
index 501b2cb2..8544daef 100644
--- a/mysql/defaults/main.yml
+++ b/mysql/defaults/main.yml
@@ -28,6 +28,8 @@ mysql_tmp_table_size: Null
 mysql_max_heap_table_size: Null
 mysql_query_cache_limit: Null
 mysql_query_cache_size: Null
+mysql_max_allowed_packet: Null
+mysql_force_custom_config: 'no'
 
 mysql_cron_optimize: True
 mysql_cron_optimize_frequency: weekly
diff --git a/mysql/tasks/config_jessie.yml b/mysql/tasks/config_jessie.yml
index 9fe11bb7..a5dd4d77 100644
--- a/mysql/tasks/config_jessie.yml
+++ b/mysql/tasks/config_jessie.yml
@@ -21,6 +21,6 @@
     owner: root
     group: root
     mode: "0644"
-    force: no
+    force: "{{ mysql_force_custom_config }}"
   tags:
     - mysql
diff --git a/mysql/tasks/config_stretch.yml b/mysql/tasks/config_stretch.yml
index 0725ee1f..d6d59efd 100644
--- a/mysql/tasks/config_stretch.yml
+++ b/mysql/tasks/config_stretch.yml
@@ -21,7 +21,7 @@
     owner: root
     group: root
     mode: "0644"
-    force: no
+    force: "{{ mysql_force_custom_config }}"
   tags:
     - mysql
 
diff --git a/mysql/templates/evolinux-custom.cnf.j2 b/mysql/templates/evolinux-custom.cnf.j2
index fd50fb36..daa70a48 100644
--- a/mysql/templates/evolinux-custom.cnf.j2
+++ b/mysql/templates/evolinux-custom.cnf.j2
@@ -29,4 +29,11 @@ query_cache_limit = {{ mysql_query_cache_limit }}
 {% if mysql_query_cache_limit %}
 query_cache_size = {{ mysql_query_cache_size }}
 {% endif %}
+{% if mysql_max_allowed_packet %}
+max_allowed_packet = {{ mysql_max_allowed_packet }}
+{% endif %}
+{% if mysql_lower_case_table_names %}
+lower_case_table_names = {{ mysql_lower_case_table_names }}
+{% endif %}
+