diff --git a/tools/packaging/kernel/configs/fragments/arm64/base.conf b/tools/packaging/kernel/configs/fragments/arm64/base.conf
index 5426377a9a..b882ff3b3f 100644
--- a/tools/packaging/kernel/configs/fragments/arm64/base.conf
+++ b/tools/packaging/kernel/configs/fragments/arm64/base.conf
@@ -41,3 +41,5 @@ CONFIG_ARM64_PMEM=y
 CONFIG_ARM64_RAS_EXTN=y
 CONFIG_ARM64_UAO=y
 # end of ARMv8.2 architectural feature
+
+CONFIG_NO_HZ_FULL=y
diff --git a/tools/packaging/kernel/configs/fragments/common/base.conf b/tools/packaging/kernel/configs/fragments/common/base.conf
index e19c30a5f9..83fd607dee 100644
--- a/tools/packaging/kernel/configs/fragments/common/base.conf
+++ b/tools/packaging/kernel/configs/fragments/common/base.conf
@@ -23,7 +23,6 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_NO_HZ=y
-CONFIG_NO_HZ_FULL=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_TIMERS=y
 CONFIG_PROC_SYSCTL=y
diff --git a/tools/packaging/kernel/configs/fragments/x86_64/base.conf b/tools/packaging/kernel/configs/fragments/x86_64/base.conf
index 9b9cb94a30..19e15a7873 100644
--- a/tools/packaging/kernel/configs/fragments/x86_64/base.conf
+++ b/tools/packaging/kernel/configs/fragments/x86_64/base.conf
@@ -18,3 +18,5 @@ CONFIG_RETPOLINE=y
 # Boot directly into the uncompressed kernel
 # Reduce memory footprint
 CONFIG_PVH=y
+
+CONFIG_NO_HZ_FULL=y