diff --git a/kernel/configs/fragments/common/hotplug.conf b/kernel/configs/fragments/common/hotplug.conf
index 6813c144d..342636aca 100644
--- a/kernel/configs/fragments/common/hotplug.conf
+++ b/kernel/configs/fragments/common/hotplug.conf
@@ -4,7 +4,6 @@ CONFIG_MEMORY_HOTPLUG=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_HOTPLUG_PCI_SHPC=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_PNPACPI=y
diff --git a/kernel/configs/fragments/x86_64/hotplug.conf b/kernel/configs/fragments/x86_64/hotplug.conf
new file mode 100644
index 000000000..7caa5a982
--- /dev/null
+++ b/kernel/configs/fragments/x86_64/hotplug.conf
@@ -0,0 +1,5 @@
+# Since we disable pci shpc hotplug for arm64,
+# See https://github.com/kata-containers/packaging/pull/498
+# for detailed reasons.
+# we move this config into x86_64-specific.
+CONFIG_HOTPLUG_PCI_SHPC=y