diff --git a/ccp/label-nodes.sh b/ccp/label-nodes.sh
index d8ba6cfbb..a3bb0d13c 100755
--- a/ccp/label-nodes.sh
+++ b/ccp/label-nodes.sh
@@ -5,12 +5,9 @@ set -e
 # FIXME: hardcoded roles
 declare -A nodes
 nodes=( \
-["node2"]="openstack-controller=true"
-["node3"]="openstack-controller=true"
-["node4"]="openstack-controller=true"
-["node5"]="openstack-compute=true"
-["node6"]="openstack-compute=true"
-["node7"]="openstack-compute=true"
+["node1"]="openstack-controller=true"
+["node2"]="openstack-compute=true"
+["node3"]="openstack-compute=true"
 )
 
 label_nodes() {
diff --git a/deploy-ccp.sh b/deploy-ccp.sh
index d9afbb2d5..16b15d584 100755
--- a/deploy-ccp.sh
+++ b/deploy-ccp.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 INVENTORY="nodes_to_inv.py"
 
 echo "Createing repository and CCP images, it may take a while..."