diff --git a/elements/devstack/README.md b/elements/devstack/README.md
index b4a790f53..8249e703d 100644
--- a/elements/devstack/README.md
+++ b/elements/devstack/README.md
@@ -1,5 +1,5 @@
 Creates an image prepped to make a devstack baremetal cloud. See
-demo/scripts/demo within the built image.
+incubator/scripts/demo within the built image.
 
 Forces a 16GB image to allow room for Swift, Cinder and instance
 disk images.
diff --git a/elements/devstack/install.d/52-image-toolchain b/elements/devstack/install.d/52-image-toolchain
index 6adc68845..058a2dfeb 100755
--- a/elements/devstack/install.d/52-image-toolchain
+++ b/elements/devstack/install.d/52-image-toolchain
@@ -10,4 +10,4 @@ apt-get -y install git
 if [ -n "$http_proxy" ]; then
     sudo -Hiu stack git config --global http.proxy $http_proxy
 fi
-sudo -Hiu stack git clone https://github.com/tripleo/demo.git
+sudo -Hiu stack git clone https://github.com/tripleo/incubator.git
diff --git a/elements/devstack/install.d/53-devstack b/elements/devstack/install.d/53-devstack
new file mode 100755
index 000000000..0829e4a1c
--- /dev/null
+++ b/elements/devstack/install.d/53-devstack
@@ -0,0 +1,11 @@
+#!/bin/bash
+# Initialize devstack in the bootstrap image
+
+set -e
+set -o xtrace
+
+apt-get -y install git
+if [ -n "$http_proxy" ]; then
+    sudo -Hiu stack git config --global http.proxy $http_proxy
+fi
+sudo -Hiu stack git clone -b baremetal-dev https://github.com/tripleo/devstack.git