diff --git a/src/mainboard/google/guybrush/variants/nipperkin/overridetree.cb b/src/mainboard/google/guybrush/variants/nipperkin/overridetree.cb
index 77e35bc59f..ef577bb6f2 100644
--- a/src/mainboard/google/guybrush/variants/nipperkin/overridetree.cb
+++ b/src/mainboard/google/guybrush/variants/nipperkin/overridetree.cb
@@ -34,6 +34,15 @@ chip soc/amd/cezanne
 				register "name" = ""NVME""
 				device pci 00.0 on end
 			end
+			probe STORAGE STORAGE_EMMC
+		end # EMMC
+		device ref gpp_bridge_3 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
+			probe STORAGE STORAGE_SSD
 		end # NVMe
 		device ref gpp_bridge_a on  # Internal GPP Bridge 0 to Bus A
 			device ref acp on