diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls
index c2380ab3a..44b806f9a 100644
--- a/salt/playbook/init.sls
+++ b/salt/playbook/init.sls
@@ -6,18 +6,9 @@
 {%- set MYSQLPASS = salt['pillar.get']('secrets:mysql', None) -%}
 {%- set PLAYBOOKPASS = salt['pillar.get']('secrets:playbook', None) -%}
 
-{% if salt['mysql.db_exists']('playbook') %}
-   #Playbook database exists - Do nothing
-{% else  %}
-salt://playbook/files/playbook_db_init.sh:
-  cmd.script:
-    - cwd: /root
-    - template: jinja
-
-'sleep 5':
-  cmd.run
-{% endif %}
-
+include:
+  - mysql
+  
 create_playbookdbuser:
   module.run:
     - mysql.user_create:
diff --git a/setup/so-setup b/setup/so-setup
index 31baf3deb..c84e0dfe5 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -539,9 +539,9 @@ fi
 	fi
 
 	if [[ "$PLAYBOOK" = 1 ]]; then
-		set_progress_str 73 "$(print_salt_state_apply 'mysql')"
-		salt-call state.apply -l info mysql >> $setup_log 2>&1
-		
+		set_progress_str 73 "$(print_salt_state_apply 'playbook.db_init')"
+		salt-call state.apply -l info playbook.db_init >> $setup_log 2>&1
+
 		set_progress_str 73 "$(print_salt_state_apply 'playbook')"
 		salt-call state.apply -l info playbook >> $setup_log 2>&1
 		so-playbook-ruleupdate >> /root/setup_playbook_rule_update.log 2>&1 &