diff --git a/src/mainboard/pcengines/apu2/OemCustomize.c b/src/mainboard/pcengines/apu2/OemCustomize.c
index a729860616..700f4c7ca6 100644
--- a/src/mainboard/pcengines/apu2/OemCustomize.c
+++ b/src/mainboard/pcengines/apu2/OemCustomize.c
@@ -97,4 +97,6 @@ OemCustomizeInitEarly (
 	)
 {
 	InitEarly->GnbConfig.PcieComplexList = &PcieComplex;
+	InitEarly->PlatformConfig.CStateMode = CStateModeC6;
+	InitEarly->PlatformConfig.CpbMode = CpbModeAuto;
 }