diff --git a/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb b/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
index 8502c36d36..3b98246d19 100644
--- a/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
@@ -239,4 +239,22 @@ chip soc/amd/mendocino
 
 		device generic 3 on end
 	end
+
+	# DPTC: Refer the spec "FT6 Infrastructure Roadmap"#57316
+	# Set system_configuration to 4 for 15W
+	register "system_configuration" = "4"
+	# Normal
+	register "slow_ppt_limit_mW"                     = "25000"
+	register "fast_ppt_limit_mW"                     = "30000"
+	register "slow_ppt_time_constant_s"              = "5"
+	register "stapm_time_constant_s"                 = "275"
+	register "sustained_power_limit_mW"              = "15000"
+	register "thermctl_limit_degreeC"                = "100"
+	register "vrm_current_limit_mA"                  = "28000"
+	register "vrm_maximum_current_limit_mA"          = "50000"
+	register "vrm_soc_current_limit_mA"              = "10000"
+	# Throttle (e.g., Low/No Battery)
+	register "vrm_current_limit_throttle_mA"         = "20000"
+	register "vrm_maximum_current_limit_throttle_mA" = "20000"
+	register "vrm_soc_current_limit_throttle_mA"     = "10000"
 end	# chip soc/amd/mendocino
diff --git a/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb b/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb
index 65b441321e..3f7ad721c1 100644
--- a/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb
+++ b/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb
@@ -244,21 +244,4 @@ chip soc/amd/mendocino
 			end
 		end
 	end # UART1
-
-	# Normal
-	# These registers are defined in AMD DevHub document #57316.
-	register "slow_ppt_limit_mW"                     = "25000"
-	register "fast_ppt_limit_mW"                     = "30000"
-	register "slow_ppt_time_constant_s"              = "5"
-	register "stapm_time_constant_s"                 = "275"
-	register "sustained_power_limit_mW"              = "15000"
-	register "thermctl_limit_degreeC"                = "100"
-	register "vrm_current_limit_mA"                  = "28000"
-	register "vrm_maximum_current_limit_mA"          = "50000"
-	register "vrm_soc_current_limit_mA"              = "10000"
-	# Throttle (e.g., Low/No Battery)
-	register "vrm_current_limit_throttle_mA"         = "20000"
-	register "vrm_maximum_current_limit_throttle_mA" = "20000"
-	register "vrm_soc_current_limit_throttle_mA"     = "10000"
-
 end	# chip soc/amd/mendocino