diff --git a/src/mainboard/google/guybrush/variants/nipperkin/overridetree.cb b/src/mainboard/google/guybrush/variants/nipperkin/overridetree.cb
index ecaf0cd2df..a53a6e5795 100644
--- a/src/mainboard/google/guybrush/variants/nipperkin/overridetree.cb
+++ b/src/mainboard/google/guybrush/variants/nipperkin/overridetree.cb
@@ -32,6 +32,13 @@ end
 
 chip soc/amd/cezanne
 	device domain 0 on
+		device ref gpp_bridge_2 on
+			# Required so the NVMe gets placed into D3 when entering S0i3.
+			chip drivers/pcie/rtd3/device
+				register "name" = ""NVME""
+				device pci 00.0 on end
+			end
+		end # NVMe
 		device ref gpp_bridge_a on  # Internal GPP Bridge 0 to Bus A
 			device ref acp on
 				chip drivers/amd/i2s_machine_dev