diff --git a/elements/ironic-agent-multipath/README.rst b/elements/ironic-agent-multipath/README.rst
index 8c658777e..dbe81b6bd 100644
--- a/elements/ironic-agent-multipath/README.rst
+++ b/elements/ironic-agent-multipath/README.rst
@@ -1,10 +1,7 @@
 ======================
 ironic-agent-multipath
 ======================
-Updates the ironic agent, installing multipath package,
-and rebuilding dracut to add the specified drivers.
+Updates the ironic agent, installing multipath and
+iscsi package, and enabling needed modules by default,
+to execute a modprobe for the needed drivers before it is started.
 
-The drivers to add can be specified with the
-`IRONIC_AGENT_MULTIPATH_DRIVERS`. It accepts a list of
-drivers to add separated by spaces. The default values are
-'be2iscsi iscsi_target_mod dm_multipath'.
diff --git a/elements/ironic-agent-multipath/element-deps b/elements/ironic-agent-multipath/element-deps
index 8c3ffe52a..95c6f0330 100644
--- a/elements/ironic-agent-multipath/element-deps
+++ b/elements/ironic-agent-multipath/element-deps
@@ -1,2 +1,3 @@
+install-static
 package-installs
 select-boot-kernel-initrd
diff --git a/elements/ironic-agent-multipath/environment.d/10-ironic-agent-multipath.bash b/elements/ironic-agent-multipath/environment.d/10-ironic-agent-multipath.bash
deleted file mode 100755
index 8e3520155..000000000
--- a/elements/ironic-agent-multipath/environment.d/10-ironic-agent-multipath.bash
+++ /dev/null
@@ -1,4 +0,0 @@
-if [ -z "${IRONIC_AGENT_MULTIPATH_DRIVERS:-}" ]; then
-    export IRONIC_AGENT_MULTIPATH_DRIVERS=${IRONIC_AGENT_MULTIPATH_DRIVERS:-"be2iscsi iscsi_target_mod dm_multipath"}
-fi
-
diff --git a/elements/ironic-agent-multipath/finalise.d/98-regenerate-initramfs b/elements/ironic-agent-multipath/finalise.d/98-regenerate-initramfs
deleted file mode 100755
index d9602ddcd..000000000
--- a/elements/ironic-agent-multipath/finalise.d/98-regenerate-initramfs
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
-    set -x
-fi
-set -eu
-set -o pipefail
-
-RET=$(select-boot-kernel-initrd)
-KERNEL_VERSION=`echo ${RET%:*} | sed 's/vmlinuz-//g'`
-RAMDISK=/boot/${RET#*:}
-
-if [ -z $IRONIC_AGENT_MULTIPATH_DRIVERS ]; then
-  dracut -v --force $RAMDISK $KERNEL_VERSION
-else
-  dracut -v --force --add-drivers "$IRONIC_AGENT_MULTIPATH_DRIVERS" $RAMDISK $KERNEL_VERSION
-fi
diff --git a/elements/ironic-agent-multipath/static/etc/modules-load.d/iscsi.conf b/elements/ironic-agent-multipath/static/etc/modules-load.d/iscsi.conf
new file mode 100644
index 000000000..30a689f9b
--- /dev/null
+++ b/elements/ironic-agent-multipath/static/etc/modules-load.d/iscsi.conf
@@ -0,0 +1,9 @@
+qla4xxx
+cxgb3i
+cxgb4i
+bnx2i
+be2iscsi
+iscsi_boot_sysfs
+iscsi_ibft
+iscsi_tcp
+target_core_mod