diff --git a/mysql/files/client.cnf b/mysql/files/client.cnf
index 6374042b5890f249d42dfefc0e2c6634cecb1212..292ec1edaa7eaa5acbe400ed84a309ce4a6ad4eb 100644
--- a/mysql/files/client.cnf
+++ b/mysql/files/client.cnf
@@ -26,6 +26,7 @@
 
 [{{ sname }}]
 {%- for mparam, mvalue in sdata.items()|default([])|sort -%}
+{%- if mvalue is none %}{% continue %}{% endif -%}
 {%- set indents = 40 - mparam|count %}
 {% if mvalue == "noarg_present" -%}
 {{ mparam }}
diff --git a/mysql/files/galera.cnf b/mysql/files/galera.cnf
index d4736cf1741065a5a67c4a18d5c78e044e9b6129..f3c154ca188d0115074eec9678a6721bb5c519fc 100644
--- a/mysql/files/galera.cnf
+++ b/mysql/files/galera.cnf
@@ -26,6 +26,7 @@
 
 [{{ sname }}]
 {%- for mparam, mvalue in sdata.items()|default([])|sort -%}
+{%- if mvalue is none %}{% continue %}{% endif -%}
 {%- set indents = 40 - mparam|count %}
 {% if mvalue == "noarg_present" -%}
 {{ mparam }}
diff --git a/mysql/files/my-include.cnf b/mysql/files/my-include.cnf
index eed0551056ba347cb478023b1458b793e8345c2e..35eff10d51eec2891ee3cd0b5b28d82732e02cae 100644
--- a/mysql/files/my-include.cnf
+++ b/mysql/files/my-include.cnf
@@ -30,6 +30,7 @@
 
 [{{ sname }}]
 {%- for mparam, mvalue in sdata.items()|default([])|sort -%}
+{%- if mvalue is none %}{% continue %}{% endif -%}
 {%- set indents = 40 - mparam|count %}
 {% if mvalue == "noarg_present" -%}
 {{ mparam }}
diff --git a/mysql/files/my.cnf b/mysql/files/my.cnf
index b4882bd4abcf3e5e817f39638219a6f474668f7b..08df151dc67d2ce8026ec969cab39cffa72dffd2 100644
--- a/mysql/files/my.cnf
+++ b/mysql/files/my.cnf
@@ -26,12 +26,14 @@
 
 [{{ sname }}]
 {%- for mparam, mvalue in sdata.items()|default([])|sort -%}
+{%- if mvalue is none %}{% continue %}{% endif -%}
 {%- set indents = 40 - mparam|count %}
 {% if mvalue == "noarg_present" -%}
 {{ mparam }}
 {%- else -%}
 {%- if mvalue is iterable and mvalue is not string -%}
 {%- for item in mvalue -%}
+{%- if item is none %}{% continue %}{% endif -%}
 {{ mparam }}{{ '='|indent(indents, true) }} {{ item }}
 {% endfor -%}
 {%- else -%}
diff --git a/mysql/files/mysql-clients.cnf b/mysql/files/mysql-clients.cnf
index 3840f8437b433912e1203fa9422317981b833f5d..345e049acc66f2c988a9b5014ec3488e03031f6b 100644
--- a/mysql/files/mysql-clients.cnf
+++ b/mysql/files/mysql-clients.cnf
@@ -26,6 +26,7 @@
 
 [{{ sname }}]
 {%- for mparam, mvalue in sdata.items()|default([])|sort -%}
+{%- if mvalue is none %}{% continue %}{% endif -%}
 {%- set indents = 40 - mparam|count %}
 {% if mvalue == "noarg_present" -%}
 {{ mparam }}
diff --git a/mysql/files/server.cnf b/mysql/files/server.cnf
index 0ed6ce642293a2119d3ed30ec7e9414c8e4ffca5..b7d915b00ff227046b9a786288b3e721ec8ebd27 100644
--- a/mysql/files/server.cnf
+++ b/mysql/files/server.cnf
@@ -26,6 +26,7 @@
 
 [{{ sname }}]
 {%- for mparam, mvalue in sdata.items()|default([])|sort -%}
+{%- if mvalue is none %}{% continue %}{% endif -%}
 {%- set indents = 40 - mparam|count %}
 {% if mvalue == "noarg_present" -%}
 {{ mparam }}
diff --git a/mysql/server.sls b/mysql/server.sls
index b6ad14c54bee68b8a171ba08596f747da8db2135..a559a8f7b5dc8da561981ae10e93b72e7ff548b6 100644
--- a/mysql/server.sls
+++ b/mysql/server.sls
@@ -84,7 +84,7 @@ mysql_install_datadir:
 {% else %}
     - name: mysql_install_db --user=mysql --basedir=/usr --datadir={{ mysql_datadir }}
 {% endif %}
-    - user: root
+    - runas: root
     - creates: {{ mysql_datadir }}/mysql/user.frm
     - env:
         - TMPDIR: '/tmp'
@@ -110,7 +110,7 @@ mysqld-packages:
 mysql_initialize:
   cmd.run:
     - name: mysqld --initialize-insecure --user=mysql --basedir=/usr --datadir={{ mysql_datadir }}
-    - user: root
+    - runas: root
     - creates: {{ mysql_datadir}}/mysql/
     - require:
       - pkg: {{ mysql.serverpkg }}
@@ -132,7 +132,7 @@ mysql_initialize:
 mysql_initialize:
   cmd.run:
     - name: emerge --config {{ mysql.serverpkg }}
-    - user: root
+    - runas: root
     - creates: {{ mysql_datadir}}/mysql/
     - require:
       - pkg: {{ mysql.serverpkg }}