diff --git a/tools/packaging/kernel/configs/fragments/common/acpi.conf b/tools/packaging/kernel/configs/fragments/common/acpi.conf
index 1ee7cd3295..02020df0cc 100644
--- a/tools/packaging/kernel/configs/fragments/common/acpi.conf
+++ b/tools/packaging/kernel/configs/fragments/common/acpi.conf
@@ -20,3 +20,5 @@ CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_HOTPLUG_MEMORY=y
 CONFIG_ACPI_NFIT=y
 CONFIG_HAVE_ACPI_APEI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_PNPACPI=y
diff --git a/tools/packaging/kernel/configs/fragments/common/hotplug.conf b/tools/packaging/kernel/configs/fragments/common/hotplug.conf
index 342636aca7..af84a24d72 100644
--- a/tools/packaging/kernel/configs/fragments/common/hotplug.conf
+++ b/tools/packaging/kernel/configs/fragments/common/hotplug.conf
@@ -5,8 +5,6 @@ CONFIG_HOTPLUG_CPU=y
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_PNPACPI=y
 
 # Define hotplugs to be online immediately. Speeds things up, and makes things
 # work smoother on some arch's.