diff --git a/src/mainboard/google/hatch/variants/puff/overridetree.cb b/src/mainboard/google/hatch/variants/puff/overridetree.cb
index d362b22770..a24d7fc80a 100644
--- a/src/mainboard/google/hatch/variants/puff/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/puff/overridetree.cb
@@ -15,6 +15,11 @@ chip soc/intel/cannonlake
 		[PchSerialIoIndexUART2] = PchSerialIoDisabled,
 	}"
 
+  # USB configuration
+	register "usb2_ports[4]" = "USB2_PORT_SHORT(OC_SKIP)"
+	register "usb2_ports[6]" = "USB2_PORT_EMPTY"
+	register "usb3_ports[5]" = "USB3_PORT_DEFAULT(OC_SKIP)"
+
 	# Enable eMMC HS400
 	register "ScsEmmcHs400Enabled" = "1"
 
@@ -114,6 +119,35 @@ chip soc/intel/cannonlake
 	register "sdcard_cd_gpio" = "vSD3_CD_B"
 
 	device domain 0 on
+		device pci 14.0 on
+			chip drivers/usb/acpi
+				device usb 0.0 on
+					chip drivers/usb/acpi
+						register "desc" = ""Type-A Port 4""
+						register "type" = "UPC_TYPE_A"
+						device usb 2.4 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Type-A Port 0""
+						register "type" = "UPC_TYPE_A"
+						device usb 2.5 on end
+					end
+					chip drivers/usb/acpi
+						device usb 2.6 off end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Type-A Port 0""
+						register "type" = "UPC_TYPE_USB3_A"
+						device usb 3.4 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Type-A Port 4""
+						register "type" = "UPC_TYPE_USB3_A"
+						device usb 3.5 on end
+					end
+				end
+			end
+		end # USB xHCI
 		device pci 15.0 off
 			# RFU - Reserved for Future Use.
 		end # I2C #0