diff --git a/elements/devstack/element-deps b/elements/devstack/element-deps
index 929d3c3b3..e02ec47de 100644
--- a/elements/devstack/element-deps
+++ b/elements/devstack/element-deps
@@ -1 +1,2 @@
 stackuser
+source-repositories
diff --git a/elements/devstack/install.d/52-image-toolchain b/elements/devstack/install.d/52-image-toolchain
index 296b5bbbd..1a6c612f2 100755
--- a/elements/devstack/install.d/52-image-toolchain
+++ b/elements/devstack/install.d/52-image-toolchain
@@ -10,4 +10,5 @@ install-packages 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/incubator-bootstrap.git incubator
+
+chown -R stack ~stack/incubator
diff --git a/elements/devstack/install.d/53-devstack b/elements/devstack/install.d/53-devstack
index 8599d7c23..0060ebad4 100755
--- a/elements/devstack/install.d/53-devstack
+++ b/elements/devstack/install.d/53-devstack
@@ -8,4 +8,5 @@ install-packages 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/openstack-dev/devstack.git
+
+chown -R stack ~stack/devstack
diff --git a/elements/devstack/source-repository-devstack b/elements/devstack/source-repository-devstack
new file mode 100644
index 000000000..aa5f5eab8
--- /dev/null
+++ b/elements/devstack/source-repository-devstack
@@ -0,0 +1 @@
+devstack git /home/stack/devstack https://github.com/openstack-dev/devstack.git
diff --git a/elements/devstack/source-repository-incubator b/elements/devstack/source-repository-incubator
new file mode 100644
index 000000000..5c8842939
--- /dev/null
+++ b/elements/devstack/source-repository-incubator
@@ -0,0 +1 @@
+incubator git /home/stack/incubator https://github.com/tripleo/incubator-bootstrap.git