diff --git a/mysql/tasks/config.yml b/mysql/tasks/config_jessie.yml
similarity index 100%
rename from mysql/tasks/config.yml
rename to mysql/tasks/config_jessie.yml
diff --git a/mysql/tasks/config_stretch.yml b/mysql/tasks/config_stretch.yml
new file mode 100644
index 00000000..a937c03d
--- /dev/null
+++ b/mysql/tasks/config_stretch.yml
@@ -0,0 +1,22 @@
+---
+- name: Copy MySQL defaults config file
+  copy:
+    src: evolinux-defaults.cnf
+    dest: /etc/mysql/mariadb.conf.d/z-evolinux-defaults.cnf
+    owner: root
+    group: root
+    mode: "0644"
+    force: yes
+  tags:
+    - mysql
+
+- name: Copy MySQL custom config file
+  template:
+    src: evolinux-custom.cnf.j2
+    dest: /etc/mysql/mariadb.conf.d/zzz-evolinux-custom.cnf
+    owner: root
+    group: root
+    mode: "0640"
+    force: no
+  tags:
+    - mysql
diff --git a/mysql/tasks/main.yml b/mysql/tasks/main.yml
index d6892fef..dd9c2e99 100644
--- a/mysql/tasks/main.yml
+++ b/mysql/tasks/main.yml
@@ -12,7 +12,11 @@
 - include: users_jessie.yml
   when: ansible_distribution_release == "jessie"
 
-- include: config.yml
+- include: config_stretch.yml
+  when: ansible_distribution_major_version | version_compare('9', '>=')
+
+- include: config_jessie.yml
+  when: ansible_distribution_release == "jessie"
 
 - include: datadir.yml