diff --git a/elements/deploy-baremetal/README.md b/elements/deploy-baremetal/README.md
new file mode 100644
index 00000000..d163627e
--- /dev/null
+++ b/elements/deploy-baremetal/README.md
@@ -0,0 +1,2 @@
+A ramdisk that will expose the machine primary disk over iSCSI and reboot
+once baremetal-deploy-helper signals it is finished.
diff --git a/elements/deploy/binary-deps.d/deploy b/elements/deploy-baremetal/binary-deps.d/deploy
similarity index 100%
rename from elements/deploy/binary-deps.d/deploy
rename to elements/deploy-baremetal/binary-deps.d/deploy
diff --git a/elements/deploy/init.d/80-deploy b/elements/deploy-baremetal/init.d/80-deploy
similarity index 100%
rename from elements/deploy/init.d/80-deploy
rename to elements/deploy-baremetal/init.d/80-deploy
diff --git a/elements/deploy/install.d/51-install-tgt b/elements/deploy-baremetal/install.d/51-install-tgt
similarity index 100%
rename from elements/deploy/install.d/51-install-tgt
rename to elements/deploy-baremetal/install.d/51-install-tgt
diff --git a/elements/deploy/install.d/52-install-busybox b/elements/deploy-baremetal/install.d/52-install-busybox
similarity index 100%
rename from elements/deploy/install.d/52-install-busybox
rename to elements/deploy-baremetal/install.d/52-install-busybox
diff --git a/elements/deploy-ironic/element-provides b/elements/deploy-ironic/element-provides
new file mode 100644
index 00000000..8541464a
--- /dev/null
+++ b/elements/deploy-ironic/element-provides
@@ -0,0 +1 @@
+deploy
diff --git a/elements/deploy-kexec/element-deps b/elements/deploy-kexec/element-deps
index 8541464a..b30556c6 100644
--- a/elements/deploy-kexec/element-deps
+++ b/elements/deploy-kexec/element-deps
@@ -1 +1 @@
-deploy
+deploy-baremetal
diff --git a/elements/deploy/README.md b/elements/deploy/README.md
index d163627e..2310eaf3 100644
--- a/elements/deploy/README.md
+++ b/elements/deploy/README.md
@@ -1,2 +1 @@
-A ramdisk that will expose the machine primary disk over iSCSI and reboot
-once baremetal-deploy-helper signals it is finished.
+Temporary element to include deploy-baremetal from the name deploy whilst renaming the element.
diff --git a/elements/deploy/element-deps b/elements/deploy/element-deps
new file mode 100644
index 00000000..b30556c6
--- /dev/null
+++ b/elements/deploy/element-deps
@@ -0,0 +1 @@
+deploy-baremetal