diff --git a/src/mainboard/intel/emeraldlake2/devicetree.cb b/src/mainboard/intel/emeraldlake2/devicetree.cb
index 2eeb745..ea17cc8 100644
--- a/src/mainboard/intel/emeraldlake2/devicetree.cb
+++ b/src/mainboard/intel/emeraldlake2/devicetree.cb
@@ -20,8 +20,8 @@
 	end
 
 	device domain 0 on
-		device pci 00.0 on  end	# host bridge
-		device pci 02.0 on  end	# vga controller
+		device ref host_bridge on  end	# host bridge
+		device ref igd on  end	# vga controller
 
 		chip southbridge/intel/bd82x6x	# Intel Series 6 Cougar Point PCH
 			# GPI routing
@@ -41,28 +41,28 @@
 			# SuperIO range is 0x700-0x73f
 			register "gen3_dec" = "0x003c0701"
 
-			device pci 16.0 on  end	# Management Engine Interface 1
-			device pci 16.1 off end	# Management Engine Interface 2
-			device pci 16.2 off end	# Management Engine IDE-R
-			device pci 16.3 off end	# Management Engine KT
-			device pci 19.0 off end	# Intel Gigabit Ethernet
-			device pci 1a.0 on  end	# USB2 EHCI #2
-			device pci 1b.0 on  end	# High Definition Audio
-			device pci 1c.0 on  end	# PCIe Port #1 (WLAN)
-			device pci 1c.1 off end	# PCIe Port #2
-			device pci 1c.2 on  end	# PCIe Port #3 (Debug)
-			device pci 1c.3 on  end	# PCIe Port #4 (LAN)
-			device pci 1c.4 off end	# PCIe Port #5
-			device pci 1c.5 off end	# PCIe Port #6
-			device pci 1c.6 off end	# PCIe Port #7
-			device pci 1c.7 off end	# PCIe Port #8
-			device pci 1d.0 on  end	# USB2 EHCI #1
-			device pci 1e.0 off end	# PCI bridge
-			device pci 1f.0 on  end	# LPC bridge
-			device pci 1f.2 on  end	# SATA Controller 1
-			device pci 1f.3 on  end	# SMBus
-			device pci 1f.5 off end	# SATA Controller 2
-			device pci 1f.6 on  end	# Thermal
+			device ref mei1 on  end	# Management Engine Interface 1
+			device ref mei2 off end	# Management Engine Interface 2
+			device ref me_ide_r off end	# Management Engine IDE-R
+			device ref me_kt off end	# Management Engine KT
+			device ref gbe off end	# Intel Gigabit Ethernet
+			device ref ehci2 on  end	# USB2 EHCI #2
+			device ref hda on  end	# High Definition Audio
+			device ref pcie_rp1 on  end	# PCIe Port #1 (WLAN)
+			device ref pcie_rp2 off end	# PCIe Port #2
+			device ref pcie_rp3 on  end	# PCIe Port #3 (Debug)
+			device ref pcie_rp4 on  end	# PCIe Port #4 (LAN)
+			device ref pcie_rp5 off end	# PCIe Port #5
+			device ref pcie_rp6 off end	# PCIe Port #6
+			device ref pcie_rp7 off end	# PCIe Port #7
+			device ref pcie_rp8 off end	# PCIe Port #8
+			device ref ehci1 on  end	# USB2 EHCI #1
+			device ref pci_bridge off end	# PCI bridge
+			device ref lpc on  end	# LPC bridge
+			device ref sata1 on  end	# SATA Controller 1
+			device ref smbus on  end	# SMBus
+			device ref sata2 off end	# SATA Controller 2
+			device ref thermal on  end	# Thermal
 		end
 	end
 end