diff --git a/elements/ironic-discoverd-ramdisk/binary-deps.d/discovery-ironic b/elements/ironic-discoverd-ramdisk/binary-deps.d/ironic-discoverd-ramdisk
similarity index 100%
rename from elements/ironic-discoverd-ramdisk/binary-deps.d/discovery-ironic
rename to elements/ironic-discoverd-ramdisk/binary-deps.d/ironic-discoverd-ramdisk
diff --git a/elements/ironic-discoverd-ramdisk/element-deps b/elements/ironic-discoverd-ramdisk/element-deps
new file mode 100644
index 000000000..7076aba94
--- /dev/null
+++ b/elements/ironic-discoverd-ramdisk/element-deps
@@ -0,0 +1 @@
+package-installs
diff --git a/elements/ironic-discoverd-ramdisk/init.d/80-discovery-ironic b/elements/ironic-discoverd-ramdisk/init.d/80-ironic-discoverd-ramdisk
similarity index 83%
rename from elements/ironic-discoverd-ramdisk/init.d/80-discovery-ironic
rename to elements/ironic-discoverd-ramdisk/init.d/80-ironic-discoverd-ramdisk
index 5e70d3355..4da77ff8d 100644
--- a/elements/ironic-discoverd-ramdisk/init.d/80-discovery-ironic
+++ b/elements/ironic-discoverd-ramdisk/init.d/80-ironic-discoverd-ramdisk
@@ -1,4 +1,15 @@
-readonly DISCOVERD_URL=$(get_kernel_parameter discoverd_callback_url)
+DISCOVERD_URL=$(get_kernel_parameter discoverd_callback_url)
+if [ -z "$DISCOVERD_URL" ]; then
+    # Some old ramdisks are around
+    DISCOVERD_URL=$(get_kernel_parameter ironic_callback_url)
+    if [ -z "$DISCOVERD_URL" ]; then
+        echo "No discoverd_callback_url supplied"
+        troubleshoot
+    else
+        echo "WARNING: deprecated option ironic_callback_url"
+        echo "WARNING: use discoverd_callback_url instead"
+    fi
+fi
 
 function request_curl(){
     HTTP_METHOD=$1
diff --git a/elements/ironic-discoverd-ramdisk/install.d/51-discovery-ironic-install-util-linux b/elements/ironic-discoverd-ramdisk/install.d/51-discovery-ironic-install-util-linux
deleted file mode 100755
index 236ecd7f0..000000000
--- a/elements/ironic-discoverd-ramdisk/install.d/51-discovery-ironic-install-util-linux
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -eu
-set -o pipefail
-
-install-packages util-linux
diff --git a/elements/ironic-discoverd-ramdisk/install.d/53-discovery-ironic-install-curl b/elements/ironic-discoverd-ramdisk/install.d/53-discovery-ironic-install-curl
deleted file mode 100755
index 0871746ed..000000000
--- a/elements/ironic-discoverd-ramdisk/install.d/53-discovery-ironic-install-curl
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -eu
-set -o pipefail
-
-install-packages curl
diff --git a/elements/ironic-discoverd-ramdisk/install.d/54-discovery-ironic-install-dmidecode b/elements/ironic-discoverd-ramdisk/install.d/54-discovery-ironic-install-dmidecode
deleted file mode 100755
index d9a309e45..000000000
--- a/elements/ironic-discoverd-ramdisk/install.d/54-discovery-ironic-install-dmidecode
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -eu
-set -o pipefail
-
-install-packages dmidecode
diff --git a/elements/ironic-discoverd-ramdisk/install.d/55-discovery-ironic-install-ipmitool b/elements/ironic-discoverd-ramdisk/install.d/55-discovery-ironic-install-ipmitool
deleted file mode 100755
index 90abd0124..000000000
--- a/elements/ironic-discoverd-ramdisk/install.d/55-discovery-ironic-install-ipmitool
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -eu
-set -o pipefail
-
-install-packages ipmitool
diff --git a/elements/ironic-discoverd-ramdisk/package-installs.yaml b/elements/ironic-discoverd-ramdisk/package-installs.yaml
new file mode 100644
index 000000000..ab001b3d2
--- /dev/null
+++ b/elements/ironic-discoverd-ramdisk/package-installs.yaml
@@ -0,0 +1,4 @@
+curl:
+dmidecoded:
+ipmitool:
+util-linux: