diff --git a/step_3_images_nodes_flavors_unified_cli.sh b/step_3_images_nodes_flavors_unified_cli.sh
index 39a86e0..f6dda6d 100644
--- a/step_3_images_nodes_flavors_unified_cli.sh
+++ b/step_3_images_nodes_flavors_unified_cli.sh
@@ -11,14 +11,22 @@ curl -O http://download.devel.redhat.com/brewroot/packages/rhel-guest-image/7.1/
 export DIB_LOCAL_IMAGE=rhel-guest-image-7.1-20150203.1.x86_64.qcow2
 export RUN_RHOS_RELEASE=1
 
-openstack overcloud image build --all # TODO: does not work now - Should be fixed
-openstack overcloud image upload # updated, previous was create
+# If this fails and you are on RHEL this should work:
+#   openstack overcloud image build --all --run-rhos-release
+# This is merged but may not be packaged.
+openstack overcloud image build --all
+
+# If this fails, the package doesn't have the fix yet. Use:
+#   openstack overcloud image create
+openstack overcloud image upload
 
 openstack baremetal import --json ~/instackenv.json
-openstack baremetal introspection bulk start # TODO: doesn't wait for introspection to finish - fix merged
 
-# Use this until the above is fixed, then they are all finished. - Fix merged
-# watch openstack baremetal introspection bulk status
+# If this command doesn't wait for introspection to finish. Use watch to wait
+# for it to finish before continuing.
+#    watch openstack baremetal introspection bulk status
+openstack baremetal introspection bulk start
+
 
 openstack flavor create --id auto --ram 4096 --disk 40 --vcpus 1 baremetal
 openstack flavor set --property "cpu_arch"="x86_64" --property "capabilities:boot_option"="local" baremetal