diff --git a/Marlin/src/inc/Conditionals-4-adv.h b/Marlin/src/inc/Conditionals-4-adv.h
index 291c140bfc07..7c560cf4dc76 100644
--- a/Marlin/src/inc/Conditionals-4-adv.h
+++ b/Marlin/src/inc/Conditionals-4-adv.h
@@ -1371,7 +1371,7 @@
   #if MB(MKS_MONSTER8_V1, BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_MINI_E3_V3_0_1, BTT_SKR_E3_TURBO, BTT_OCTOPUS_V1_1, BTT_SKR_V3_0, BTT_SKR_V3_0_EZ, AQUILA_V101)
 
     #define LCD_SERIAL_PORT 1
-  #elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_F401RE, CREALITY_V423, CREALITY_CR4NTXXC10, MKS_ROBIN, PANOWIN_CUTLASS, KODAMA_BARDO)
+  #elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_F401RE, CREALITY_V423, CREALITY_CR4NTXXC10, CREALITY_CR4NS, MKS_ROBIN, PANOWIN_CUTLASS, KODAMA_BARDO)
     #define LCD_SERIAL_PORT 2
   #else
     #define LCD_SERIAL_PORT 3
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h b/Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h
index 5ff033e6841d..98d9c88e1b06 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h
@@ -33,11 +33,6 @@
   #error "CR4NS200320C13 only supports one hotend / E-stepper."
 #endif
 
-// Validate stepper driver selections.
-//#if !AXIS_DRIVER_TYPE_X(TMC2208) || !AXIS_DRIVER_TYPE_Y(TMC2208) || !AXIS_DRIVER_TYPE_Z(TMC2208) || !AXIS_DRIVER_TYPE_E0(TMC2208)
-//  #error "This board has onboard TMC2208 drivers for X, Y, Z, and E0."
-//#endif
-
 #ifndef BOARD_INFO_NAME
   #define BOARD_INFO_NAME      "CR4NS200320C13"
 #endif
@@ -46,23 +41,28 @@
 #endif
 #define BOARD_WEBSITE_URL      "www.creality.com"
 
+//
+// EEPROM
+//
+#define IIC_EEPROM_SDA                      PA7
+#define IIC_EEPROM_SCL                      PA8
+
 //
 // Servos
 //
 #ifndef SERVO0_PIN
-  #define SERVO0_PIN                        PC14
+  #define SERVO0_PIN                        PC13
 #endif
-
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN                   PC13  // BLTouch IN
+  #define Z_MIN_PROBE_PIN                   PC14
 #endif
 
 //
 // Limit Switches
 //
-//#ifndef Z_STOP_PIN
-//  #define Z_STOP_PIN                      PA15  // else PA7
-//#endif
+#ifndef Z_STOP_PIN
+  #define Z_STOP_PIN                        PC14
+#endif
 
 //
 // Filament Runout Sensor
@@ -76,15 +76,10 @@
 //
 #define HEATER_BED_PIN                      PB2   // HOT BED
 #define FAN1_PIN                            PC1   // extruder fan
-//#define FAN2_PIN                          PB1   // Controller fan FET
 
 //
-// Auto fans
+// Steppers
 //
-//#ifndef CONTROLLER_FAN_PIN
-//  #define CONTROLLER_FAN_PIN          FAN2_PIN
-//#endif
-
 #if HAS_TMC_UART
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -92,15 +87,23 @@
   // Software serial
   #define X_SERIAL_TX_PIN                   PB12
   #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_DIAG_PIN                        PB10
 
   #define Y_SERIAL_TX_PIN                   PB13
   #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_DIAG_PIN                        PB11
 
   #define Z_SERIAL_TX_PIN                   PB14
   #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
 
 #endif // HAS_TMC_UART
 
+//
+// SD Card
+//
+#define ONBOARD_SPI_DEVICE                     1  // SPI1
+#define ONBOARD_SD_CS_PIN                   PA4   // SDSS
+
 #if ANY(RET6_12864_LCD, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
 
   /**
@@ -118,18 +121,10 @@
   #define EXP3_03_PIN                       PA2
   #define EXP3_04_PIN                       PA3
   #define EXP3_05_PIN                       PB1
-  #define EXP3_06_PIN                       -1
+  #define EXP3_06_PIN                       PB0
   #define EXP3_07_PIN                       PA12
   #define EXP3_08_PIN                       PA11
 
-  #ifndef BEEPER_PIN
-    #define BEEPER_PIN               EXP1_06_PIN  // BEEP
-  #endif
-
-  #define BTN_ENC                    EXP1_05_PIN  // EN
-  #define BTN_EN1                    EXP1_08_PIN  // A
-  #define BTN_EN2                    EXP1_07_PIN  // B
-
 #endif
 
 #include "pins_CREALITY_V4.h"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 9ae858f2d08d..38959a4c6cfe 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -57,8 +57,12 @@
 #endif
 
 #if ENABLED(IIC_BL24CXX_EEPROM)
-  #define IIC_EEPROM_SDA                    PA11
-  #define IIC_EEPROM_SCL                    PA12
+  #ifndef IIC_EEPROM_SDA
+    #define IIC_EEPROM_SDA                  PA11
+  #endif
+  #ifndef IIC_EEPROM_SCL
+    #define IIC_EEPROM_SCL                  PA12
+  #endif
   #define MARLIN_EEPROM_SIZE               0x800  // 2K (24C16)
 #elif ENABLED(SDCARD_EEPROM_EMULATION)
   #define MARLIN_EEPROM_SIZE               0x800  // 2K
@@ -193,14 +197,30 @@
    *   GND | 9 10 | 5V
    *        ------
    */
-  #define EXP3_01_PIN                       PC6
-  #define EXP3_02_PIN                       PB2
-  #define EXP3_03_PIN                       PB10
-  #define EXP3_04_PIN                       PB11
-  #define EXP3_05_PIN                       PB14
-  #define EXP3_06_PIN                       PB13
-  #define EXP3_07_PIN                       PB12
-  #define EXP3_08_PIN                       PB15
+  #ifndef EXP3_01_PIN
+    #define EXP3_01_PIN                     PC6
+  #endif
+  #ifndef EXP3_02_PIN
+    #define EXP3_02_PIN                     PB2
+  #endif
+  #ifndef EXP3_03_PIN
+    #define EXP3_03_PIN                     PB10
+  #endif
+  #ifndef EXP3_04_PIN
+    #define EXP3_04_PIN                     PB11
+  #endif
+  #ifndef EXP3_05_PIN
+    #define EXP3_05_PIN                     PB14
+  #endif
+  #ifndef EXP3_06_PIN
+    #define EXP3_06_PIN                     PB13
+  #endif
+  #ifndef EXP3_07_PIN
+    #define EXP3_07_PIN                     PB12
+  #endif
+  #ifndef EXP3_08_PIN
+    #define EXP3_08_PIN                     PB15
+  #endif
 
 #elif ANY(VET6_12864_LCD, DWIN_VET6_CREALITY_LCD)