diff --git a/src/mainboard/google/volteer/variants/halvor/overridetree.cb b/src/mainboard/google/volteer/variants/halvor/overridetree.cb
index c6ac1b7173..2db3b96213 100644
--- a/src/mainboard/google/volteer/variants/halvor/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/halvor/overridetree.cb
@@ -1,23 +1,24 @@
 chip soc/intel/tigerlake
 	register "usb2_ports[0]" = "USB2_PORT_EMPTY"		# Type-A / Type-C Not Used
-	register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC0)"	# Type-A / Type-C Port 0
+	register "usb2_ports[1]" = "USB2_PORT_MID(OC_SKIP)"	# Type-A / Type-C Port 0
 	register "usb2_ports[2]" = "USB2_PORT_EMPTY"		# Type-A / Type-C Not Used
-	register "usb2_ports[3]" = "USB2_PORT_TYPE_C(OC1)"	# Type-A / Type-C Port 1
+	register "usb2_ports[3]" = "USB2_PORT_MID(OC_SKIP)"	# Type-A / Type-C Port 1
 	register "usb2_ports[4]" = "USB2_PORT_MID(OC_SKIP)"	# Front Camera
-	register "usb2_ports[5]" = "USB2_PORT_TYPE_C(OC2)"	# Type-A / Type-C Port 2
+	register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)"	# Type-A / Type-C Port 2
 	register "usb2_ports[6]" = "USB2_PORT_EMPTY"		# Type-A / Type-C Not Used
 	register "usb2_ports[7]" = "USB2_PORT_EMPTY"		# Type-A / Type-C Not Used
 	register "usb2_ports[8]" = "USB2_PORT_EMPTY"		# Type-A / Type-C Not Used
 	register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)"	# Reserve for CNVi BT
 
-	register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC0)"	# Type-A / Type-C Port 0
-	register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC1)"	# Type-A / Type-C Port 1
-	register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC2)"	# Type-A / Type-C Port 2
+	register "usb3_ports[0]" = "USB3_PORT_EMPTY"		# Type-A / Type-C Port 0
+	register "usb3_ports[1]" = "USB3_PORT_EMPTY"		# Type-A / Type-C Port 1
+	register "usb3_ports[2]" = "USB3_PORT_EMPTY"		# Type-A / Type-C Port 2
 	register "usb3_ports[3]" = "USB3_PORT_EMPTY"		# Type-A / Type-C Not Used
 
 	register "SaGv" = "SaGv_Disabled"
 
 	device domain 0 on
+		device pci 07.2 on end # TBT_PCIe2
 		device pci 15.0 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""