diff --git a/kernel/configs/fragments/arm64/acpi.conf b/kernel/configs/fragments/arm64/acpi.conf
new file mode 100644
index 000000000..2f8980389
--- /dev/null
+++ b/kernel/configs/fragments/arm64/acpi.conf
@@ -0,0 +1,5 @@
+# ACPI on arm64 is dependent on uEFI.
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+# ARM64 can run properly in ACPI hardware reduced mode.
+CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
diff --git a/kernel/configs/fragments/common/acpi.conf b/kernel/configs/fragments/common/acpi.conf
index 860dc4514..e183d2435 100644
--- a/kernel/configs/fragments/common/acpi.conf
+++ b/kernel/configs/fragments/common/acpi.conf
@@ -3,13 +3,7 @@
 # https://github.com/kata-containers/packaging/issues/483
 CONFIG_ARCH_SUPPORTS_ACPI=y
 CONFIG_ACPI=y
-CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
-CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
-CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
-CONFIG_ACPI_LPIT=y
 CONFIG_ACPI_BUTTON=y
-CONFIG_ACPI_CPU_FREQ_PSS=y
-CONFIG_ACPI_PROCESSOR_CSTATE=y
 CONFIG_ACPI_PROCESSOR_IDLE=y
 # Having trouble enabling this - disable for now.
 # Would add support for ACPI CPPC power control via firmware - do we need
@@ -22,7 +16,5 @@ CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_HOTPLUG_MEMORY=y
-CONFIG_ACPI_HOTPLUG_IOAPIC=y
 CONFIG_ACPI_NFIT=y
 CONFIG_HAVE_ACPI_APEI=y
-CONFIG_HAVE_ACPI_APEI_NMI=y
diff --git a/kernel/configs/fragments/x86_64/acpi.conf b/kernel/configs/fragments/x86_64/acpi.conf
index 872a8a171..e44ba0983 100644
--- a/kernel/configs/fragments/x86_64/acpi.conf
+++ b/kernel/configs/fragments/x86_64/acpi.conf
@@ -3,3 +3,12 @@ CONFIG_X86_INTEL_PSTATE=y
 # For old smp systems that do not have proper acpi support.
 # Firecracker needs this to support `vcpu_count`
 CONFIG_X86_MPPARSE=y
+
+CONFIG_ACPI_CPU_FREQ_PSS=y
+CONFIG_ACPI_HOTPLUG_IOAPIC=y
+CONFIG_ACPI_LEGACY_TABLES_LOOKUP
+CONFIG_ACPI_LPIT=y
+CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
+CONFIG_ACPI_PROCESSOR_CSTATE=y
+CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
+CONFIG_HAVE_ACPI_APEI_NMI=y