diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
index 32ec518bf849e..031caa1ce174c 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
@@ -43,22 +43,24 @@
   #define FLASH_ADDRESS_START   0x8004000
 #endif
 
+#define SERVO0_PIN                          PB1 // BL-TOUCH/PWM
+
 //
-// Z Probe
+// Limit Switches
 //
-#if ENABLED(BLTOUCH)
-  #error "You need to set jumper to 5v for Bltouch, then comment out this line to proceed."
-  #define SERVO0_PIN                        PA0
-#elif !defined(Z_MIN_PROBE_PIN)
-  #define Z_MIN_PROBE_PIN                   PA0
-#endif
+#define X_STOP_PIN                          PB4 // X-MIN
+#define Y_STOP_PIN                          PC8 // Y-MIN
+#define Z_STOP_PIN                          PA0 // Z-MIN
 
 //
-// Limit Switches
+// Z Probe
 //
-#define X_STOP_PIN                          PB4
-#define Y_STOP_PIN                          PC8
-#define Z_STOP_PIN                          PB1
+#if ENABLED(BLTOUCH)
+  #error "You need to set jumper to 5V for BLTouch, then comment out this line to proceed."
+#endif
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                   PB1 // BL-TOUCH/PWM repurposed
+#endif
 
 //
 // Filament runout
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h
index a090113fa3776..041c43b55fad0 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h
@@ -95,7 +95,7 @@ extern "C" {
 
 // Timer Definitions
 #define TIMER_TONE              TIM2  // TIMER_TONE must be defined in this file
-#define TIMER_SERVO             TIM5  // TIMER_SERVO must be defined in this file
+#define TIMER_SERVO             TIM3  // TIMER_SERVO must be defined in this file
 #define TIMER_SERIAL            TIM11 // TIMER_SERIAL must be defined in this file
 
 // UART Definitions