diff --git a/src/mainboard/prodrive/atlas/Kconfig b/src/mainboard/prodrive/atlas/Kconfig
index 814c1e057c..3900f4db15 100644
--- a/src/mainboard/prodrive/atlas/Kconfig
+++ b/src/mainboard/prodrive/atlas/Kconfig
@@ -54,6 +54,15 @@ config CBFS_SIZE
 config NO_POST
 	default y
 
+config ENABLE_BUZZER_SUPPORT
+	bool "Enable Buzzer support"
+	default y
+	select USE_LEGACY_8254_TIMER
+	help
+	  8254 timer is required for buzzer support on GPP_B14 (based on Intel doc 621483,
+	  26.1.1 - NMI_STS_CNT). However since 8254 timer clock gating has to be enabled for
+	  S0ix support, enabling buzzer will disable s0ix.
+
 config PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS
 	int
 	default 32
diff --git a/src/mainboard/prodrive/atlas/devicetree.cb b/src/mainboard/prodrive/atlas/devicetree.cb
index 0d91bb63bc..c90c69c4f6 100644
--- a/src/mainboard/prodrive/atlas/devicetree.cb
+++ b/src/mainboard/prodrive/atlas/devicetree.cb
@@ -17,6 +17,9 @@ chip soc/intel/alderlake
 	# SaGv Configuration
 	register "sagv" = "CONFIG(ATLAS_ENABLE_SAGV) ? SaGv_Enabled : SaGv_Disabled"
 
+	# Disable S0ix
+	register "s0ix_enable" = "0"
+
 	# Display configuration (4 DPs)
 	register "ddi_ports_config" = "{
 		[DDI_PORT_A] = DDI_ENABLE_HPD | DDI_ENABLE_DDC,