diff --git a/nodepool/elements/node-devstack/element-deps b/nodepool/elements/node-devstack/element-deps
index 4ad866a5bc..0dc4067ea8 100644
--- a/nodepool/elements/node-devstack/element-deps
+++ b/nodepool/elements/node-devstack/element-deps
@@ -1,3 +1,4 @@
 cache-devstack
 nodepool-base
+prepare-node
 puppet
diff --git a/nodepool/elements/openstack-repos/element-deps b/nodepool/elements/openstack-repos/element-deps
index 8a0bcc94bf..fcf86dcf66 100644
--- a/nodepool/elements/openstack-repos/element-deps
+++ b/nodepool/elements/openstack-repos/element-deps
@@ -1,4 +1,4 @@
 cache-url
-node-devstack
+prepare-node
 puppet
 source-repositories
diff --git a/nodepool/elements/prepare-node/README.rst b/nodepool/elements/prepare-node/README.rst
new file mode 100644
index 0000000000..ba52fcfad5
--- /dev/null
+++ b/nodepool/elements/prepare-node/README.rst
@@ -0,0 +1 @@
+Prepare the node
diff --git a/nodepool/elements/prepare-node/element-deps b/nodepool/elements/prepare-node/element-deps
new file mode 100644
index 0000000000..9a8eea29b9
--- /dev/null
+++ b/nodepool/elements/prepare-node/element-deps
@@ -0,0 +1,2 @@
+nodepool-base
+puppet
diff --git a/nodepool/elements/node-devstack/install.d/20-prepare-node b/nodepool/elements/prepare-node/install.d/20-prepare-node
similarity index 100%
rename from nodepool/elements/node-devstack/install.d/20-prepare-node
rename to nodepool/elements/prepare-node/install.d/20-prepare-node