diff --git a/build_files/base/19-initramfs.sh b/build_files/base/19-initramfs.sh
index 498a5aaa..f4a9f57d 100755
--- a/build_files/base/19-initramfs.sh
+++ b/build_files/base/19-initramfs.sh
@@ -2,13 +2,12 @@
 
 echo "::group:: ===$(basename "$0")==="
 
-set -oue pipefail
+set -ouex pipefail
 
 KERNEL_VERSION=$(rpm -q --queryformat="%{evr}.%{arch}" kernel-core)
 
-# Ensure Initramfs is generated
 export DRACUT_NO_XATTR=1
-/usr/bin/dracut --no-hostonly --kver "${KERNEL_VERSION}" --reproducible -v --add "ostree fido2 tpm2-tss pkcs11 pcsc" -f "/lib/modules/${KERNEL_VERSION}/initramfs.img"
-chmod 0600 "/lib/modules/${KERNEL_VERSION}/initramfs.img"
+/usr/bin/dracut --no-hostonly --kver "${KERNEL_VERSION}" --reproducible -v -f "/usr/lib/modules/${KERNEL_VERSION}/initramfs.img"
+chmod 0600 "/usr/lib/modules/${KERNEL_VERSION}/initramfs.img"
 
 echo "::endgroup::"
diff --git a/system_files/shared/usr/lib/dracut/dracut.conf.d/30-aurora-bootc-ostree-backend.conf b/system_files/shared/usr/lib/dracut/dracut.conf.d/30-aurora-bootc-ostree-backend.conf
new file mode 100644
index 00000000..486b2a08
--- /dev/null
+++ b/system_files/shared/usr/lib/dracut/dracut.conf.d/30-aurora-bootc-ostree-backend.conf
@@ -0,0 +1 @@
+add_dracutmodules+=" ostree "
diff --git a/system_files/shared/usr/lib/dracut/dracut.conf.d/90-ublue-luks.conf b/system_files/shared/usr/lib/dracut/dracut.conf.d/90-ublue-luks.conf
new file mode 100644
index 00000000..c1666eab
--- /dev/null
+++ b/system_files/shared/usr/lib/dracut/dracut.conf.d/90-ublue-luks.conf
@@ -0,0 +1 @@
+add_dracutmodules+=" fido2 tpm2-tss pkcs11 pcsc "