diff --git a/src/mainboard/system76/galp5/Kconfig b/src/mainboard/system76/galp5/Kconfig
index c07012156f..76eea74305 100644
--- a/src/mainboard/system76/galp5/Kconfig
+++ b/src/mainboard/system76/galp5/Kconfig
@@ -4,6 +4,7 @@ config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
 	select DRIVERS_I2C_HID
+	select DRIVERS_INTEL_PMC
 	select DRIVERS_SYSTEM76_DGPU
 	select EC_SYSTEM76_EC
 	select EC_SYSTEM76_EC_BAT_THRESHOLDS
diff --git a/src/mainboard/system76/galp5/acpi/gpe.asl b/src/mainboard/system76/galp5/acpi/gpe.asl
deleted file mode 100644
index bc19e05169..0000000000
--- a/src/mainboard/system76/galp5/acpi/gpe.asl
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-// GPP_K6 SCI
-Method (_L06, 0, Serialized) {
-	Debug = Concatenate("GPE _L06: ", ToHexString(\_SB.PCI0.LPCB.EC0.WFNO))
-	If (\_SB.PCI0.LPCB.EC0.ECOK) {
-		If (\_SB.PCI0.LPCB.EC0.WFNO == One) {
-			Notify(\_SB.LID0, 0x80)
-		}
-	}
-}
diff --git a/src/mainboard/system76/galp5/acpi/mainboard.asl b/src/mainboard/system76/galp5/acpi/mainboard.asl
index eb1a57f1c7..f2eb91de91 100644
--- a/src/mainboard/system76/galp5/acpi/mainboard.asl
+++ b/src/mainboard/system76/galp5/acpi/mainboard.asl
@@ -3,8 +3,8 @@
 #include "../gpio.h"
 #include <drivers/system76/dgpu/acpi/dgpu.asl>
 
-#define EC_GPE_SCI 0x03 /* GPP_K3 */
-#define EC_GPE_SWI 0x06 /* GPP_K6 */
+#define EC_GPE_SCI 0x6E // TODO
+#define EC_GPE_SWI 0x6B // TODO
 #include <ec/system76/ec/acpi/ec.asl>
 
 Scope (\_SB) {
@@ -13,7 +13,3 @@ Scope (\_SB) {
 		#include "backlight.asl"
 	}
 }
-
-Scope (\_GPE) {
-	#include "gpe.asl"
-}
diff --git a/src/mainboard/system76/galp5/dsdt.asl b/src/mainboard/system76/galp5/dsdt.asl
index 2b847a71b3..28ae3fc05d 100644
--- a/src/mainboard/system76/galp5/dsdt.asl
+++ b/src/mainboard/system76/galp5/dsdt.asl
@@ -1,5 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+// Hack for including GMA ACPI code
+#define SYSTEM76_ACPI_NO_GFX0
+
 #include <acpi/acpi.h>
 DefinitionBlock(
 	"dsdt.aml",
@@ -10,22 +13,25 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/tigerlake/acpi/platform.asl>
+
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 
-	Device (\_SB.PCI0) {
-		#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
-		#include <soc/intel/tigerlake/acpi/southbridge.asl>
-		//TODO
-		#include <soc/intel/tigerlake/acpi/tcss.asl>
+	Scope (\_SB) {
+		Device (PCI0) {
+			#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
+			#include <soc/intel/tigerlake/acpi/southbridge.asl>
+			//TODO
+			#include <soc/intel/tigerlake/acpi/tcss.asl>
+		}
 	}
 
-	#include <southbridge/intel/common/acpi/sleepstates.asl>
-
 	Scope (\_SB.PCI0.LPCB) {
 		#include <drivers/pc80/pc/ps2_controller.asl>
 	}
 
 	#include "acpi/mainboard.asl"
+
+	#include <southbridge/intel/common/acpi/sleepstates.asl>
 }
diff --git a/src/soc/intel/common/block/acpi/acpi/gfx.asl b/src/soc/intel/common/block/acpi/acpi/gfx.asl
index 109543fd6f..586408bf97 100644
--- a/src/soc/intel/common/block/acpi/acpi/gfx.asl
+++ b/src/soc/intel/common/block/acpi/acpi/gfx.asl
@@ -1,6 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+// Hack for including GMA ACPI code
+#ifndef SYSTEM76_ACPI_NO_GFX0
 Device (GFX0)
 {
 	Name (_ADR, 0x00020000)
 }
+#endif // SYSTEM76_ACPI_NO_GFX0