diff --git a/confluent_server/confluent/selfservice.py b/confluent_server/confluent/selfservice.py
index 9cf61e4f..30c8308c 100644
--- a/confluent_server/confluent/selfservice.py
+++ b/confluent_server/confluent/selfservice.py
@@ -6,7 +6,7 @@ import yaml
 
 
 def yamldump(input):
-    return yaml.dump(input, default_flow_style=False)
+    return yaml.safe_dump(input, default_flow_style=False)
 
 
 def handle_request(env, operation, start_response):
diff --git a/misc/confluent-cmdline.sh.rh8 b/misc/confluent-cmdline.sh.rh8
index 410e7d65..517382ef 100644
--- a/misc/confluent-cmdline.sh.rh8
+++ b/misc/confluent-cmdline.sh.rh8
@@ -1,4 +1,5 @@
 #!/bin/bash
 echo -n "" >> /tmp/net.ifaces
-cat /tls/*.pem >> /etc/pki/tls/certs/ca-bundle.certs
-
+cat /tls/*.pem >> /etc/pki/tls/certs/ca-bundle.crt
+. /lib/anaconda-lib.sh
+wait_for_kickstart
diff --git a/misc/confluent-initqueue.sh.rh8 b/misc/confluent-initqueue.sh.rh8
index 561faf33..43b62eb2 100644
--- a/misc/confluent-initqueue.sh.rh8
+++ b/misc/confluent-initqueue.sh.rh8
@@ -1,4 +1,6 @@
 #!/bin/sh
+[ -e /tmp/confluent.initq ] && return 0
+echo -n "" > /tmp/confluent.initq
 cd /sys/class/net
 for currif in *; do
     ip link set $currif up
@@ -14,17 +16,16 @@ read mgr << EOF
 $(grep ^MANAGER /tmp/confluent.info|grep fe80|awk '{print $2}')
 EOF
 mgridx=${mgr#*%}
-mgr="[$mgr]"
 ifname=$(ip link |grep ^$ifidx:|awk '{print $2}')
 ifname=${ifname%:}
 echo $ifname > /tmp/net.ifaces
-nodename=$grep ^NODENAME /tmp/confluent.info|awk '{print $2}')
+nodename=$(grep ^NODENAME /tmp/confluent.info|awk '{print $2}')
 #TODO: blkid --label <whatever> to find mounted api
 
 if [ -z "$apikey" ]; then
     apikey=$(/opt/confluent/bin/clortho $nodename $mgr)
 fi
-
+mgr="[$mgr]"
 curl -f -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $apikey" https://$mgr/confluent-api/self/deploycfg > /tmp/confluent.deploycfg
 
 mgr=$(grep ^ipv4_server: /tmp/confluent.deploycfg)
@@ -35,7 +36,10 @@ proto=$(grep ^protocol: /tmp/confluent.deploycfg)
 proto=${proto#protocol: }
 echo inst.repo=$proto://$mgr/confluent-public/os/$profilename/distribution >> /etc/cmdline.d/01-confluent.conf
 echo inst.ks=$proto://$mgr/confluent-public/os/$profilename/kickstart >> /etc/cmdline.d/01-confluent.conf
-
+kickstart=$proto://$mgr/confluent-public/os/$profilename/kickstart
+root=anaconda-net:$proto://$mgr/confluent-public/os/$profilename/distribution
+export kickstart
+export root
 autoconfigmethod=$(grep ipv4_method /tmp/confluent.deploycfg)
 autoconfigmethod=${autoconfigmethod#ipv4_method}
 if [ "$autoconfigmethod" = "dhcp" ]; then
@@ -53,4 +57,3 @@ else
     echo ip=$v4addr::$vpgw:$v4nm:$nodename:$ifname:none >> /etc/cmdline.d/01-confluent.conf
 fi
 
-
diff --git a/misc/confluent-prepivot.sh.rh8 b/misc/confluent-prepivot.sh.rh8
index 4c607d88..5cdefe25 100644
--- a/misc/confluent-prepivot.sh.rh8
+++ b/misc/confluent-prepivot.sh.rh8
@@ -1,2 +1,2 @@
 #!/bin/bash
-cat /etc/pki/tls/certs/ca-bundle.crt > /sysroot/etc/pki/tls/certs/
+cat /etc/pki/tls/certs/ca-bundle.crt > /sysroot/etc/pki/tls/certs/ca-bundle.crt