diff --git a/src/drivers/gfx/nvidia/Kconfig b/src/drivers/gfx/nvidia/Kconfig
index 4535445fed..4c9c7ff08c 100644
--- a/src/drivers/gfx/nvidia/Kconfig
+++ b/src/drivers/gfx/nvidia/Kconfig
@@ -16,29 +16,22 @@ config DRIVERS_GFX_NVIDIA_DYNAMIC_BOOST
 	help
 	  Support for NVIDIA Dynamic Boost
 
-config DRIVERS_GFX_NVIDIA_DYNAMIC_BOOST_BASELINE
-	int "Baseline TGP offset from static TGP in watts"
-	default 0
-	depends on DRIVERS_GFX_NVIDIA_DYNAMIC_BOOST
-	help
-	  This adds additional power to the GPU by default
-
 config DRIVERS_GFX_NVIDIA_DYNAMIC_BOOST_TPP
-	int "Total processor power offset from baseline TGP in watts"
+	int "Total processor power offset from default TGP in watts"
 	default 45
 	depends on DRIVERS_GFX_NVIDIA_DYNAMIC_BOOST
 	help
 	  This identifies the available power for the CPU or GPU boost
 
 config DRIVERS_GFX_NVIDIA_DYNAMIC_BOOST_MIN
-	int "Minimum TGP offset from baseline TGP in watts"
+	int "Minimum TGP offset from default TGP in watts"
 	default 0
 	depends on DRIVERS_GFX_NVIDIA_DYNAMIC_BOOST
 	help
 	  This is used to transfer power from the GPU to the CPU
 
 config DRIVERS_GFX_NVIDIA_DYNAMIC_BOOST_MAX
-	int "Maximum TGP offset from baseline TGP in watts"
+	int "Maximum TGP offset from default TGP in watts"
 	default 0
 	depends on DRIVERS_GFX_NVIDIA_DYNAMIC_BOOST
 	help
diff --git a/src/drivers/gfx/nvidia/acpi/common/nvpcf.asl b/src/drivers/gfx/nvidia/acpi/common/nvpcf.asl
index a266923f13..e93b547994 100644
--- a/src/drivers/gfx/nvidia/acpi/common/nvpcf.asl
+++ b/src/drivers/gfx/nvidia/acpi/common/nvpcf.asl
@@ -73,10 +73,7 @@ Method(NPCF, 2, Serialized) {
 				// Other fields filled in later
 			})
 			CreateByteField(PCFP, 0x04, CCNT) // Controller count
-			CreateWordField(PCFP, 0x05, ATGP) // AC TGP offset
-			CreateWordField(PCFP, 0x07, DTGP) // DC TGP offset (unused)
 			CreateWordField(PCFP, 0x19, ATPP) // AC TPP offset
-			CreateWordField(PCFP, 0x1B, DTPP) // DC TPP offset (unused)
 			CreateWordField(PCFP, 0x1D, AMXP) // AC maximum TGP offset
 			CreateWordField(PCFP, 0x21, AMNP) // AC minimum TGP offset
 
@@ -85,13 +82,11 @@ Method(NPCF, 2, Serialized) {
 					Printf("      Get Controller Params")
 					// Number of controllers
 					CCNT = 1
-					// AC configurable TGP baseline offset in 1/8 watt units
-					ATGP = (CONFIG_DRIVERS_GFX_NVIDIA_DYNAMIC_BOOST_BASELINE << 3)
-					// AC total processor power offset from baseline in 1/8 watt units
+					// AC total processor power offset from default TGP in 1/8 watt units
 					ATPP = (CONFIG_DRIVERS_GFX_NVIDIA_DYNAMIC_BOOST_TPP << 3)
-					// AC maximum TGP offset from baseline in 1/8 watt units
+					// AC maximum TGP offset from default TGP in 1/8 watt units
 					AMXP = (CONFIG_DRIVERS_GFX_NVIDIA_DYNAMIC_BOOST_MAX << 3)
-					// AC minimum TGP offset from baseline in 1/8 watt units
+					// AC minimum TGP offset from default TGP in 1/8 watt units
 					AMNP = (CONFIG_DRIVERS_GFX_NVIDIA_DYNAMIC_BOOST_MIN << 3)
 					Printf("PCFP: %o", SFST(PCFP))
 					Return(PCFP)
diff --git a/src/mainboard/system76/rpl/Kconfig b/src/mainboard/system76/rpl/Kconfig
index 99ad700515..07adcdb214 100644
--- a/src/mainboard/system76/rpl/Kconfig
+++ b/src/mainboard/system76/rpl/Kconfig
@@ -117,16 +117,13 @@ config DIMM_SPD_SIZE
 config DRIVERS_GFX_NVIDIA_BRIDGE
 	default 0x02 if BOARD_SYSTEM76_BONW15
 
-config DRIVERS_GFX_NVIDIA_DYNAMIC_BOOST_BASELINE
-	default 10 if BOARD_SYSTEM76_GAZE18
-
 config DRIVERS_GFX_NVIDIA_DYNAMIC_BOOST_TPP
-	default 55 if BOARD_SYSTEM76_ADDW3 || BOARD_SYSTEM76_SERW13
+	default 45 if BOARD_SYSTEM76_ORYP11
+	default 55 if BOARD_SYSTEM76_ADDW3 || BOARD_SYSTEM76_GAZE18 || BOARD_SYSTEM76_SERW13
 	default 80 if BOARD_SYSTEM76_BONW15
 
 config DRIVERS_GFX_NVIDIA_DYNAMIC_BOOST_MAX
-	default 15 if BOARD_SYSTEM76_GAZE18
-	default 25 if BOARD_SYSTEM76_ADDW3 || BOARD_SYSTEM76_BONW15 || BOARD_SYSTEM76_ORYP11 || BOARD_SYSTEM76_SERW13
+	default 25 if BOARD_SYSTEM76_ADDW3 || BOARD_SYSTEM76_BONW15 || BOARD_SYSTEM76_GAZE18 || BOARD_SYSTEM76_ORYP11 || BOARD_SYSTEM76_SERW13
 
 config FMDFILE
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/variants/\$(CONFIG_VARIANT_DIR)/board.fmd"