diff --git a/Meta/run.py b/Meta/run.py
index 975c742ce0..d638cf176c 100755
--- a/Meta/run.py
+++ b/Meta/run.py
@@ -718,14 +718,14 @@ def setup_machine_devices(config: Configuration):
             config.add_devices(
                 [
                     "vmware-svga",
-                    "ich9-usb-ehci1,bus=pcie.0,multifunction=on,addr=0x5.0x0",
-                    "ich9-usb-ehci2,bus=pcie.0,addr=0x5.0x2",
-                    "ich9-usb-uhci1,bus=pcie.0,multifunction=on,addr=0x7.0x0",
-                    "ich9-usb-uhci2,bus=pcie.0,addr=0x7.0x1",
-                    "ich9-usb-uhci3,bus=pcie.0,addr=0x7.0x2",
-                    "ich9-usb-uhci4,bus=pcie.0,addr=0x7.0x3",
-                    "ich9-usb-uhci5,bus=pcie.0,addr=0x7.0x4",
-                    "ich9-usb-uhci6,bus=pcie.0,addr=0x7.0x5",
+                    "ich9-usb-ehci1,bus=pcie.0,multifunction=on,addr=0x05.3,multifunction=on,id=ehci1",
+                    "ich9-usb-uhci1,bus=pcie.0,multifunction=on,addr=0x05.0,masterbus=ehci1.0,firstport=0",
+                    "ich9-usb-uhci2,bus=pcie.0,multifunction=on,addr=0x05.1,masterbus=ehci1.0,firstport=2",
+                    "ich9-usb-uhci3,bus=pcie.0,multifunction=on,addr=0x05.2,masterbus=ehci1.0,firstport=4",
+                    "ich9-usb-ehci2,bus=pcie.0,multifunction=on,addr=0x07.3,multifunction=on,id=ehci2",
+                    "ich9-usb-uhci4,bus=pcie.0,multifunction=on,addr=0x07.0,masterbus=ehci2.0,firstport=0",
+                    "ich9-usb-uhci5,bus=pcie.0,multifunction=on,addr=0x07.1,masterbus=ehci2.0,firstport=2",
+                    "ich9-usb-uhci6,bus=pcie.0,multifunction=on,addr=0x07.2,masterbus=ehci2.0,firstport=4",
                     "pcie-root-port,port=0x10,chassis=1,id=pcie.1,bus=pcie.0,multifunction=on,addr=0x6",
                     "pcie-root-port,port=0x11,chassis=2,id=pcie.2,bus=pcie.0,addr=0x6.0x1",
                     "pcie-root-port,port=0x12,chassis=3,id=pcie.3,bus=pcie.0,addr=0x6.0x2",