diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls
index ab2a0b614..a5242f561 100644
--- a/salt/playbook/init.sls
+++ b/salt/playbook/init.sls
@@ -17,21 +17,21 @@ salt://playbook/files/playbook_db_init.sh:
   cmd.run
 {% endif %}
 
-playbookdbuser:
-  mysql_user.present:
-    - host: 172.17.0.0/255.255.0.0
-    - password: {{ PLAYBOOKPASS }}
-    - connection_host: {{ MAINIP }}
-    - connection_port: 3306
-    - connection_user: root
-    - connection_pass: {{ MYSQLPASS }}
+create_playbookdbuser:
+  module.run:
+    - mysql.user_create:
+      - user: playbookdbuser
+      - password: {{ PLAYBOOKPASS }}
+      - host: 172.17.0.0/255.255.0.0
+      - connection_host: {{ MAINIP }}
+      - connection_port: 3306
+      - connection_user: root
+      - connection_pass: {{ MYSQLPASS }}
 
-playbookdbdbpriv:
-  mysql_grants.present:
-    - grant: all privileges
-    - database: playbook.*
-    - user: playbookdbuser
-    - host: 172.17.0.0/255.255.0.0
+query_playbookdbuser_grants:
+  mysql_query.run:
+    - database: playbook
+    - query:    "GRANT ALL ON playbook.* TO 'playbookdbuser'@'172.17.0.0/255.255.0.0';"
     - connection_host: {{ MAINIP }}
     - connection_port: 3306
     - connection_user: root