diff --git a/config/generic-bigtreetech-skr-cr6-v1.0.cfg b/config/generic-bigtreetech-skr-cr6-v1.0.cfg
index 12a42de8..d14deb18 100644
--- a/config/generic-bigtreetech-skr-cr6-v1.0.cfg
+++ b/config/generic-bigtreetech-skr-cr6-v1.0.cfg
@@ -4,7 +4,7 @@
 # select "Enable extra low-level configuration options" and configure
 # "GPIO pins to set at micro-controller startup" to "!PA14".
 
-# The "make flash" command does not work on the SKR mini E3. Instead,
+# The "make flash" command does not work on the SKR CR6. Instead,
 # after running "make", copy the generated "out/klipper.bin" file to a
 # file named "firmware.bin" on an SD card and then restart the SKR
 # CR6 V1.0 with that SD card.
@@ -57,7 +57,8 @@ dir_pin: !PC5
 enable_pin: !PB1
 microsteps: 16
 rotation_distance: 8
-endstop_pin: probe:z_virtual_endstop
+endstop_pin: PC2
+position_endstop: 0.0
 position_min: -1.0
 position_max: 250
 
@@ -69,9 +70,7 @@ run_current: 0.550
 hold_current: 0.450
 stealthchop_threshold: 999999
 
-
 [extruder]
-max_extrude_only_distance: 1000.0
 step_pin: PB3
 dir_pin: !PB4
 enable_pin: !PD2
@@ -83,7 +82,6 @@ heater_pin: PC8
 sensor_type: EPCOS 100K B57560G104F
 sensor_pin: PA0
 control: pid
-# tuned for stock hardware with 200 degree Celsius target
 pid_Kp: 14.32
 pid_Ki: 0.81
 pid_Kd: 63.12
@@ -103,7 +101,6 @@ heater_pin: PC9
 sensor_type: EPCOS 100K B57560G104F
 sensor_pin: PC3
 control: pid
-# tuned for stock hardware with 50 degree Celsius target
 pid_Kp: 79.49
 pid_Ki: 1.17
 pid_Kd: 1349.52
@@ -112,11 +109,9 @@ max_temp: 120
 
 [fan]
 pin: PC6
-kick_start_time: 0.5
 
 [mcu]
-serial: /dev/serial/by-id/usb-Klipper_stm32f103xe_30FFD8054254353925741557-if00
-restart_method: command
+serial: /dev/serial/by-id/usb-Klipper_stm32f103xe_000000000000000000000000-if00
 
 [printer]
 kinematics: cartesian
diff --git a/test/klippy/printers.test b/test/klippy/printers.test
index 673cfd1c..1686e9d8 100644
--- a/test/klippy/printers.test
+++ b/test/klippy/printers.test
@@ -135,6 +135,7 @@ CONFIG ../../config/generic-bigtreetech-skr-mini-e3-v1.0.cfg
 CONFIG ../../config/generic-bigtreetech-skr-mini-e3-v1.2.cfg
 CONFIG ../../config/generic-bigtreetech-skr-mini-e3-v2.0.cfg
 CONFIG ../../config/generic-bigtreetech-skr-mini-mz.cfg
+CONFIG ../../config/generic-bigtreetech-skr-cr6-v1.0.cfg
 CONFIG ../../config/generic-bigtreetech-skr-e3-dip.cfg
 
 # Printers using the stm32f103 via serial