diff --git a/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb b/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
index a83c67a581..71db179920 100644
--- a/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
@@ -82,13 +82,15 @@ chip soc/amd/sabrina
 						chip drivers/usb/acpi
 							register "desc" = ""USB3 Type-C Port C0 (MLB)""
 							register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-							register "group" = "ACPI_PLD_GROUP(1, 1)"
+							register "use_custom_pld" = "true"
+							register "custom_pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(1, 1))"
 							device ref usb3_port0 on end
 						end
 						chip drivers/usb/acpi
 							register "desc" = ""USB2 Type-C Port C0 (MLB)""
 							register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-							register "group" = "ACPI_PLD_GROUP(1, 1)"
+                                                        register "use_custom_pld" = "true"
+                                                        register "custom_pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(1, 1))"
 							device ref usb2_port0 on end
 						end
 						chip drivers/usb/acpi
@@ -105,13 +107,15 @@ chip soc/amd/sabrina
 						chip drivers/usb/acpi
 							register "desc" = ""USB3 Type-C Port C1 (DB)""
 							register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-							register "group" = "ACPI_PLD_GROUP(2, 1)"
+                                                        register "use_custom_pld" = "true"
+                                                        register "custom_pld" = "ACPI_PLD_TYPE_C(RIGHT, RIGHT, ACPI_PLD_GROUP(2, 1))"
 							device ref usb3_port2 on end
 						end
 						chip drivers/usb/acpi
 							register "desc" = ""USB2 Type-C Port C1 (DB)""
 							register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-							register "group" = "ACPI_PLD_GROUP(2, 1)"
+                                                        register "use_custom_pld" = "true"
+                                                        register "custom_pld" = "ACPI_PLD_TYPE_C(RIGHT, RIGHT, ACPI_PLD_GROUP(2, 1))"
 							device ref usb2_port2 on end
 						end
 						chip drivers/usb/acpi
diff --git a/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb b/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb
index 8f1e683189..3b7bc6776b 100644
--- a/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb
+++ b/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb
@@ -42,7 +42,8 @@ chip soc/amd/sabrina
 										chip drivers/usb/acpi
 											register "desc" = ""USB3 Type-A Port A0 (DB)""
 											register "type" = "UPC_TYPE_USB3_A"
-											register "group" = "ACPI_PLD_GROUP(2, 2)"
+											register "use_custom_pld" = "true"
+											register "custom_pld" = "ACPI_PLD_TYPE_A(LEFT, RIGHT, ACPI_PLD_GROUP(2, 2))"
 											device usb 3.0 on end
 										end
 										chip drivers/usb/acpi
@@ -70,7 +71,8 @@ chip soc/amd/sabrina
 										chip drivers/usb/acpi
 											register "desc" = ""USB2 Type-A Port A0 (DB)""
 											register "type" = "UPC_TYPE_USB3_A"
-											register "group" = "ACPI_PLD_GROUP(2, 2)"
+											register "use_custom_pld" = "true"
+											register "custom_pld" = "ACPI_PLD_TYPE_A(LEFT, RIGHT, ACPI_PLD_GROUP(2, 2))"
 											device usb 2.0 on end
 										end
 										chip drivers/usb/acpi