diff --git a/scripts/te-broker/create-env b/scripts/te-broker/create-env
index de9f87308..ac4d55e0a 100755
--- a/scripts/te-broker/create-env
+++ b/scripts/te-broker/create-env
@@ -83,9 +83,10 @@ fi
 
 if [ $EXTRA_NODECOUNT -gt 0 ]; then
     /bin/cp --remove-destination environments/base-extra-node.yaml $EXTRA_ENVFILE
-    sed -i -e "s/baremetal_flavor:.*/baremetal_flavor: m1.small/" $EXTRA_ENVFILE
+    sed -i -e "s/baremetal_flavor:.*/baremetal_flavor: ci.m1.small/" $EXTRA_ENVFILE
     sed -i -e "s/key_name:.*/key_name: ${KEY_NAME}/" $EXTRA_ENVFILE
     sed -i -e "s/node_count:.*/node_count: ${EXTRA_NODECOUNT}/" $EXTRA_ENVFILE
+    sed -i -e "s/baremetal_image:.*/baremetal_image: CentOS-7-x86_64-GenericCloud-1708/" $EXTRA_ENVFILE
     # We changed the path of the environment, so we need to fix the relative
     # path in the resource registry too.
     sed -i -e "s|../templates/baremetal-ports-extra-node-port-security.yaml|templates/baremetal-ports-extra-node-port-security.yaml|" $EXTRA_ENVFILE