diff --git a/meta-arm-bsp/conf/machine/foundation-armv8.conf b/meta-arm-bsp/conf/machine/foundation-armv8.conf
index c1b9f4de..0ff10609 100644
--- a/meta-arm-bsp/conf/machine/foundation-armv8.conf
+++ b/meta-arm-bsp/conf/machine/foundation-armv8.conf
@@ -11,4 +11,4 @@ KERNEL_DEVICETREE = "arm/foundation-v8-gicv3-psci.dtb"
 # Use haveged as a source of entropy instead of rng-tools (Needed for ssh).
 # rngd (Part of rng-tools) takes ~7 mins to init resulting in a slow boot time.
 PACKAGE_EXCLUDE_append = " rng-tools"
-IMAGE_INSTALL_append = " haveged"
+MACHINE_EXTRA_RRECOMMENDS += "haveged"
diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf
index bd3c62d1..321b5d58 100644
--- a/meta-arm-bsp/conf/machine/fvp-base.conf
+++ b/meta-arm-bsp/conf/machine/fvp-base.conf
@@ -11,4 +11,4 @@ KERNEL_DEVICETREE = "arm/fvp-base-gicv3-psci-custom.dtb"
 # Use haveged as a source of entropy instead of rng-tools (Needed for ssh).
 # rngd (Part of rng-tools) takes ~7 mins to init resulting in a slow boot time.
 PACKAGE_EXCLUDE_append = " rng-tools"
-IMAGE_INSTALL_append = " haveged"
+MACHINE_EXTRA_RRECOMMENDS += "haveged"