diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 78514b8ba..8bb28e41c 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -14,7 +14,13 @@ export DIB_DISTRIBUTION_MIRROR=$CENTOS_MIRROR
 export DIB_EPEL_MIRROR=$EPEL_MIRROR
 export STABLE_RELEASE=${STABLE_RELEASE:-""}
 
+
+cat <<EOF >$HOME/undercloud-hieradata-override.yaml
+ironic::drivers::deploy::http_port: 3816
+EOF
+
 echo '[DEFAULT]' > ~/undercloud.conf
+echo "hieradata_override = $HOME/undercloud-hieradata-override.yaml" >> ~/undercloud.conf
 
 if [ $UNDERCLOUD_SSL == 1 ] ; then
     echo 'generate_service_certificate = True' >> ~/undercloud.conf
diff --git a/toci_instack_ovb.sh b/toci_instack_ovb.sh
index 659b201d9..a73b101ae 100755
--- a/toci_instack_ovb.sh
+++ b/toci_instack_ovb.sh
@@ -22,8 +22,12 @@ MY_IP=$(ip addr show dev $IP_DEVICE | awk '/inet / {gsub("/.*", "") ; print $2}'
 hostname | sudo dd of=/etc/hostname
 echo "127.0.0.1 $(hostname) $(hostname).openstacklocal" | sudo tee -a /etc/hosts
 
-# Kill the zuul console stream, its tcp port clashes with the port we're using to serve out /httpboot
-sudo netstat -lpn | grep tcp | grep :8088 | awk '{print $7}' | cut -d / -f 1 | head -n 1 | sudo xargs -t kill -9 || true
+if [ -n "$STABLE_RELEASE" ]; then
+    # Kill the zuul console stream, its tcp port clashes with the port we're using to serve out /httpboot
+    # This is not needed on master since we're able to configure a different
+    # port for httpd ipxe using hieradata_override
+    sudo netstat -lpn | grep tcp | grep :8088 | awk '{print $7}' | cut -d / -f 1 | head -n 1 | sudo xargs -t kill
+fi
 
 # TODO: xfsprogs should be a dep of DIB?
 sudo yum install -y xfsprogs qemu-img