diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common
index e5ed79413..b1dd425f8 100755
--- a/salt/common/tools/sbin/so-common
+++ b/salt/common/tools/sbin/so-common
@@ -33,12 +33,12 @@ header() {
 
 lookup_pillar() {
     key=$1
-    cat /opt/so/saltstack/local/pillar/global.sls | grep $key | awk '{print $2}'
+    salt-call --no-color  pillar.get global:${key} --out=newline_values_only
 }
 
 lookup_pillar_secret() {
     key=$1
-    cat /opt/so/saltstack/local/pillar/secrets.sls | grep $key | awk '{print $2}'
+    salt-call --no-color  pillar.get secrets:${key} --out=newline_values_only
 }
 
 check_container() {
diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index d1fb8c186..e24b7f105 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -258,6 +258,12 @@ rc3_to_2.3.0() {
       echo "playbook:"
       echo "  api_key: de6639318502476f2fa5aa06f43f51fb389a3d7f" 
   } >> /opt/so/saltstack/local/pillar/global.sls
+
+  sed -i 's/playbook:/playbook_db:/' /opt/so/saltstack/local/pillar/secrets.sls
+  {
+    echo "playbook_admin: $(tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 20 | head -n 1)"
+    echo "playbook_automation: $(tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 20 | head -n 1)"
+  } >> /opt/so/saltstack/local/pillar/secrets.sls
 }
 
 space_check() {
diff --git a/salt/playbook/automation_user_create.sls b/salt/playbook/automation_user_create.sls
index 04b8687cb..51eae1796 100644
--- a/salt/playbook/automation_user_create.sls
+++ b/salt/playbook/automation_user_create.sls
@@ -5,11 +5,12 @@
 include:
   - playbook
   
-cmd.run:
-  - name: until nc -z {{ MAINIP }} 3200; do sleep 1; done
-  - timeout: 30
-  - onchanges:
-    - cmd: create_user
+wait_for_playbook:
+  cmd.run:
+    - name: until nc -z {{ MAINIP }} 3200; do sleep 1; done
+    - timeout: 30
+    - onchanges:
+      - cmd: create_user
 
 create_user:
   cmd.script: