diff --git a/src/mainboard/amd/birman/devicetree_phoenix.cb b/src/mainboard/amd/birman/devicetree_phoenix.cb
index a4f18a3bc8..787a6f3253 100644
--- a/src/mainboard/amd/birman/devicetree_phoenix.cb
+++ b/src/mainboard/amd/birman/devicetree_phoenix.cb
@@ -158,9 +158,9 @@ chip soc/amd/phoenix
 
 	device domain 0 on
 		device ref iommu on end
-		device ref gpp_bridge_0 on end # GBE
-		device ref gpp_bridge_1 on end # WIFI
-		device ref gpp_bridge_2 on end # NVMe SSD
+		device ref gpp_bridge_2_1 on end # GBE
+		device ref gpp_bridge_2_2 on end # WIFI
+		device ref gpp_bridge_2_3 on end # NVMe SSD
 		device ref gpp_bridge_a on  # Internal GPP Bridge 0 to Bus A
 			device ref gfx on end # Internal GPU (GFX)
 			device ref gfx_hda on end # Display HD Audio Controller (GFXAZ)
diff --git a/src/mainboard/amd/mayan/devicetree_phoenix.cb b/src/mainboard/amd/mayan/devicetree_phoenix.cb
index ec88892f23..8f33dd16ed 100644
--- a/src/mainboard/amd/mayan/devicetree_phoenix.cb
+++ b/src/mainboard/amd/mayan/devicetree_phoenix.cb
@@ -158,9 +158,9 @@ chip soc/amd/phoenix
 
 	device domain 0 on
 		device ref iommu on end
-		device ref gpp_bridge_0 on end # GBE
-		device ref gpp_bridge_1 on end # WIFI
-		device ref gpp_bridge_2 on end # NVMe SSD
+		device ref gpp_bridge_2_1 on end # GBE
+		device ref gpp_bridge_2_2 on end # WIFI
+		device ref gpp_bridge_2_3 on end # NVMe SSD
 		device ref gpp_bridge_a on  # Internal GPP Bridge 0 to Bus A
 			device ref gfx on end # Internal GPU (GFX)
 			device ref gfx_hda on end # Display HD Audio Controller (GFXAZ)
diff --git a/src/soc/amd/phoenix/chipset.cb b/src/soc/amd/phoenix/chipset.cb
index 47b393d030..f1c32faf1b 100644
--- a/src/soc/amd/phoenix/chipset.cb
+++ b/src/soc/amd/phoenix/chipset.cb
@@ -17,12 +17,13 @@ chip soc/amd/phoenix
 		device pci 01.4 alias gpp_bridge_1_4 off ops amd_external_pcie_gpp_ops end
 
 		device pci 02.0 on end # Dummy Host Bridge, do not disable
-		device pci 02.1 alias gpp_bridge_0 off ops amd_external_pcie_gpp_ops end
-		device pci 02.2 alias gpp_bridge_1 off ops amd_external_pcie_gpp_ops end
-		device pci 02.3 alias gpp_bridge_2 off ops amd_external_pcie_gpp_ops end
-		device pci 02.4 alias gpp_bridge_3 off ops amd_external_pcie_gpp_ops end
-		device pci 02.5 alias gpp_bridge_4 off ops amd_external_pcie_gpp_ops end
-		device pci 02.6 alias gpp_bridge_5 off ops amd_external_pcie_gpp_ops end
+		# The PCIe GPP aliases in this SoC match the device and function numbers
+		device pci 02.1 alias gpp_bridge_2_1 off ops amd_external_pcie_gpp_ops end
+		device pci 02.2 alias gpp_bridge_2_2 off ops amd_external_pcie_gpp_ops end
+		device pci 02.3 alias gpp_bridge_2_3 off ops amd_external_pcie_gpp_ops end
+		device pci 02.4 alias gpp_bridge_2_4 off ops amd_external_pcie_gpp_ops end
+		device pci 02.5 alias gpp_bridge_2_5 off ops amd_external_pcie_gpp_ops end
+		device pci 02.6 alias gpp_bridge_2_6 off ops amd_external_pcie_gpp_ops end
 
 		device pci 08.0 on end # Dummy Host Bridge, do not disable
 		device pci 08.1 alias gpp_bridge_a off  # Internal GPP Bridge 0 to Bus A