diff --git a/config/hooks/live/0090_haveged.chroot b/config/hooks/live/0090_jitterentropy.chroot
similarity index 76%
rename from config/hooks/live/0090_haveged.chroot
rename to config/hooks/live/0090_jitterentropy.chroot
index 349de43..26b8a21 100644
--- a/config/hooks/live/0090_haveged.chroot
+++ b/config/hooks/live/0090_jitterentropy.chroot
@@ -14,17 +14,18 @@ set -Ceuo pipefail
 printf "\e[95m++++ ++++ ++++ ++++ ++++ ++++ ++ 🧪 '%s' starting ... \e[0m\n" "${0}"
 
 export DEBIAN_FRONTEND="noninteractive"
-apt-get install -y --no-install-recommends haveged
+apt-get install -y --no-install-recommends jitterentropy-rngd
 
 cd /root
-cat << 'EOF' >| /etc/default/haveged
-# Configuration file for haveged
 
-# Options to pass to haveged:
-DAEMON_ARGS="-w 2048 -v 1"
+mkdir -p /etc/systemd/system/jitterentropy-rngd.service.d
+
+cat << 'EOF' >> /etc/systemd/system/jitterentropy-rngd.service.d/override.conf
+[Service]
+ExecStart=
+ExecStart=/usr/sbin/jitterentropy-rngd --sp800-90b --osr=7
 EOF
 
-
 printf "\e[92m++++ ++++ ++++ ++++ ++++ ++++ ++ ✅ '%s' applied successfully. \e[0m\n" "${0}"
 
 exit 0
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 5857337..836dac8 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -14,7 +14,8 @@ include_toc: true
 
 ## V8.13.144.2025.10.16
 * **Bugfixes**: [99_local.hardened](../config/includes.chroot/etc/sysctl.d/99_local.hardened)
-* **Updated**:  [check_chrony.sh](../config/includes.chroot/root/.ciss/check_chrony.sh)  
+* **Updated**:  [check_chrony.sh](../config/includes.chroot/root/.ciss/check_chrony.sh)
+* **Changed**:  [0090_jitterentropy.chroot](../config/hooks/live/0090_jitterentropy.chroot)
 
 ## V8.13.142.2025.10.14
 * **Updated**: [9999-cdi-starter](../scripts/9999-cdi-starter)