diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node_bare.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node_bare.sh
index 7209a309b0..6e2513fe39 100755
--- a/modules/openstack_project/files/nodepool/scripts/prepare_node_bare.sh
+++ b/modules/openstack_project/files/nodepool/scripts/prepare_node_bare.sh
@@ -18,4 +18,4 @@
 
 HOSTNAME=$1
 
-./prepare_node.sh $HOSTNAME false
+./prepare_node.sh "$HOSTNAME" false
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack.sh
index 9fef2b36cc..9ea9d6a5bf 100755
--- a/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack.sh
+++ b/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack.sh
@@ -18,5 +18,5 @@
 
 HOSTNAME=$1
 
-./prepare_node.sh $HOSTNAME true
+./prepare_node.sh "$HOSTNAME" true
 sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack.sh $HOSTNAME
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_new_kernel.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_new_kernel.sh
index 09a1b225a3..3c0efb8a48 100644
--- a/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_new_kernel.sh
+++ b/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_new_kernel.sh
@@ -18,5 +18,5 @@
 
 HOSTNAME=$1
 
-./prepare_node.sh $HOSTNAME
+./prepare_node.sh "$HOSTNAME" true
 sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack_new_kernel.sh $HOSTNAME
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node_tripleo.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node_tripleo.sh
index f109a5efc2..45b0ee99c9 100755
--- a/modules/openstack_project/files/nodepool/scripts/prepare_node_tripleo.sh
+++ b/modules/openstack_project/files/nodepool/scripts/prepare_node_tripleo.sh
@@ -20,5 +20,5 @@ HOSTNAME=$1
 
 # Workaround bug 1270646 during node bootstrapping.
 sudo ip link set mtu 1458 dev eth0
-./prepare_node.sh $HOSTNAME true
+./prepare_node.sh "$HOSTNAME" true
 sudo -u jenkins -i /opt/nodepool-scripts/prepare_tripleo.sh $HOSTNAME