diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 4cf2076af..0903d48d6 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -3428,14 +3428,14 @@ CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
 # CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_BA431=m
-CONFIG_HW_RANDOM_GEODE=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_HW_RANDOM_TIMERIOMEM=y
+CONFIG_HW_RANDOM_INTEL=y
+CONFIG_HW_RANDOM_AMD=y
+CONFIG_HW_RANDOM_BA431=y
+CONFIG_HW_RANDOM_GEODE=y
+CONFIG_HW_RANDOM_VIA=y
+CONFIG_HW_RANDOM_VIRTIO=y
+CONFIG_HW_RANDOM_XIPHERA=y
 # CONFIG_DTLK is not set
 # CONFIG_APPLICOM is not set
 CONFIG_SONYPI=m
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index b11115315..deda2add8 100644
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -3399,13 +3399,13 @@ CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
 # CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_BA431=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_HW_RANDOM_TIMERIOMEM=y
+CONFIG_HW_RANDOM_INTEL=y
+CONFIG_HW_RANDOM_AMD=y
+CONFIG_HW_RANDOM_BA431=y
+CONFIG_HW_RANDOM_VIA=y
+CONFIG_HW_RANDOM_VIRTIO=y
+CONFIG_HW_RANDOM_XIPHERA=y
 # CONFIG_APPLICOM is not set
 
 #
diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux
index 289d4de0d..d477ac779 100644
--- a/config/rootfiles/common/i586/linux
+++ b/config/rootfiles/common/i586/linux
@@ -20692,15 +20692,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/bus/mhi/core/mhi.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/char
 #lib/modules/KVER-ipfire/kernel/drivers/char/hangcheck-timer.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/amd-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/ba431-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/geode-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/intel-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/timeriomem-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/via-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/virtio-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/xiphera-trng.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/char/ipmi
 #lib/modules/KVER-ipfire/kernel/drivers/char/ipmi/ipmi_devintf.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/char/ipmi/ipmi_msghandler.ko.xz
diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
index b924f71af..d2e9677a5 100644
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -20579,14 +20579,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/bus/mhi/core/mhi.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/char
 #lib/modules/KVER-ipfire/kernel/drivers/char/hangcheck-timer.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/amd-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/ba431-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/intel-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/timeriomem-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/via-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/virtio-rng.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/xiphera-trng.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/char/ipmi
 #lib/modules/KVER-ipfire/kernel/drivers/char/ipmi/ipmi_devintf.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/char/ipmi/ipmi_msghandler.ko.xz