diff --git a/config/hardware/axis/Z/TMC/TMC2209_2-Motors.cfg b/config/hardware/axis/Z/TMC/TMC2209_2-Motors.cfg
new file mode 100644
index 000000000..6291e1d1c
--- /dev/null
+++ b/config/hardware/axis/Z/TMC/TMC2209_2-Motors.cfg
@@ -0,0 +1,8 @@
+[include TMC2209_1-Motor.cfg]
+
+[tmc2209 stepper_z1]
+uart_pin: Z1_TMCUART
+interpolate: True
+run_current: 0.8
+sense_resistor: 0.110
+stealthchop_threshold: 0
diff --git a/config/hardware/axis/Z/TMC/TMC2209_3-Motors.cfg b/config/hardware/axis/Z/TMC/TMC2209_3-Motors.cfg
index e369c45ae..94de5fa9e 100644
--- a/config/hardware/axis/Z/TMC/TMC2209_3-Motors.cfg
+++ b/config/hardware/axis/Z/TMC/TMC2209_3-Motors.cfg
@@ -1,11 +1,4 @@
-[include TMC2209_1-Motor.cfg]
-
-[tmc2209 stepper_z1]
-uart_pin: Z1_TMCUART
-interpolate: True
-run_current: 0.8
-sense_resistor: 0.110
-stealthchop_threshold: 0
+[include TMC2209_2-Motors.cfg]
 
 [tmc2209 stepper_z2]
 uart_pin: Z2_TMCUART
diff --git a/config/hardware/axis/Z/TMC/TMC2240_2-Motors.cfg b/config/hardware/axis/Z/TMC/TMC2240_2-Motors.cfg
new file mode 100644
index 000000000..139c0c47d
--- /dev/null
+++ b/config/hardware/axis/Z/TMC/TMC2240_2-Motors.cfg
@@ -0,0 +1,11 @@
+[include TMC2240_1-Motor.cfg]
+
+[tmc2240 stepper_z1]
+cs_pin: Z1_TMCUART
+spi_speed: 500000
+spi_software_sclk_pin: DRIVER_SPI_SCK
+spi_software_mosi_pin: DRIVER_SPI_MOSI
+spi_software_miso_pin: DRIVER_SPI_MISO
+interpolate: True
+run_current: 0.7
+stealthchop_threshold: 0
diff --git a/config/hardware/axis/Z/TMC/TMC2240_3-Motors.cfg b/config/hardware/axis/Z/TMC/TMC2240_3-Motors.cfg
index 5263c0c02..1c4ac35ff 100644
--- a/config/hardware/axis/Z/TMC/TMC2240_3-Motors.cfg
+++ b/config/hardware/axis/Z/TMC/TMC2240_3-Motors.cfg
@@ -1,14 +1,4 @@
-[include TMC2240_1-Motor.cfg]
-
-[tmc2240 stepper_z1]
-cs_pin: Z1_TMCUART
-spi_speed: 500000
-spi_software_sclk_pin: DRIVER_SPI_SCK
-spi_software_mosi_pin: DRIVER_SPI_MOSI
-spi_software_miso_pin: DRIVER_SPI_MISO
-interpolate: True
-run_current: 0.7
-stealthchop_threshold: 0
+[include TMC2240_2-Motors.cfg]
 
 [tmc2240 stepper_z2]
 cs_pin: Z2_TMCUART
diff --git a/config/hardware/axis/Z/TMC/TMC5160_2-Motors.cfg b/config/hardware/axis/Z/TMC/TMC5160_2-Motors.cfg
new file mode 100644
index 000000000..1fb5604f4
--- /dev/null
+++ b/config/hardware/axis/Z/TMC/TMC5160_2-Motors.cfg
@@ -0,0 +1,12 @@
+[include TMC5160_1-Motor.cfg]
+
+[tmc5160 stepper_z1]
+cs_pin: Z1_TMCUART
+spi_speed: 500000
+spi_software_sclk_pin: DRIVER_SPI_SCK
+spi_software_mosi_pin: DRIVER_SPI_MOSI
+spi_software_miso_pin: DRIVER_SPI_MISO
+interpolate: True
+run_current: 0.8
+sense_resistor: 0.075
+stealthchop_threshold: 0
diff --git a/config/hardware/axis/Z/TMC/TMC5160_3-Motors.cfg b/config/hardware/axis/Z/TMC/TMC5160_3-Motors.cfg
index 4a6b57679..fff88a009 100644
--- a/config/hardware/axis/Z/TMC/TMC5160_3-Motors.cfg
+++ b/config/hardware/axis/Z/TMC/TMC5160_3-Motors.cfg
@@ -1,15 +1,4 @@
-[include TMC5160_1-Motor.cfg]
-
-[tmc5160 stepper_z1]
-cs_pin: Z1_TMCUART
-spi_speed: 500000
-spi_software_sclk_pin: DRIVER_SPI_SCK
-spi_software_mosi_pin: DRIVER_SPI_MOSI
-spi_software_miso_pin: DRIVER_SPI_MISO
-interpolate: True
-run_current: 0.8
-sense_resistor: 0.075
-stealthchop_threshold: 0
+[include TMC5160_2-Motors.cfg]
 
 [tmc5160 stepper_z2]
 cs_pin: Z2_TMCUART
diff --git a/config/hardware/axis/Z/default_wiring_2M.cfg b/config/hardware/axis/Z/default_wiring_2M.cfg
new file mode 100644
index 000000000..f051f7daa
--- /dev/null
+++ b/config/hardware/axis/Z/default_wiring_2M.cfg
@@ -0,0 +1,9 @@
+# In this file we include the first motor
+[include default_wiring_1M.cfg]
+
+# And then, add a 2nd motor...
+[stepper_z1]
+step_pin: Z1_STEP
+dir_pin: Z1_DIR
+enable_pin: !Z1_ENABLE
+
diff --git a/config/hardware/axis/Z/default_wiring_3M.cfg b/config/hardware/axis/Z/default_wiring_3M.cfg
index aed66bd09..4c0bd43db 100644
--- a/config/hardware/axis/Z/default_wiring_3M.cfg
+++ b/config/hardware/axis/Z/default_wiring_3M.cfg
@@ -1,12 +1,7 @@
-# In this file we include the first motor
-[include default_wiring_1M.cfg]
-
-# And then, add a 2nd and 3rd motor...
-[stepper_z1]
-step_pin: Z1_STEP
-dir_pin: Z1_DIR
-enable_pin: !Z1_ENABLE
+# In this file we include the first 2 motors
+[include default_wiring_2M.cfg]
 
+# And then, add a 3rd motor...
 [stepper_z2]
 step_pin: Z2_STEP
 dir_pin: Z2_DIR
diff --git a/user_templates/mcu.cfg b/user_templates/mcu.cfg
index cd9439758..965522eb7 100644
--- a/user_templates/mcu.cfg
+++ b/user_templates/mcu.cfg
@@ -31,12 +31,15 @@
 # [include config/hardware/axis/Y/TMC/TMC5160.cfg]
 ### 3. Z Drivers -------------------------------------------------------------------------
 # [include config/hardware/axis/Z/TMC/TMC2209_1-Motor.cfg]
+# [include config/hardware/axis/Z/TMC/TMC2209_2-Motors.cfg]
 # [include config/hardware/axis/Z/TMC/TMC2209_3-Motors.cfg]
 # [include config/hardware/axis/Z/TMC/TMC2209_4-Motors.cfg]
 # [include config/hardware/axis/Z/TMC/TMC2240_1-Motor.cfg]
+# [include config/hardware/axis/Z/TMC/TMC2240_2-Motors.cfg]
 # [include config/hardware/axis/Z/TMC/TMC2240_3-Motors.cfg]
 # [include config/hardware/axis/Z/TMC/TMC2240_4-Motors.cfg]
 # [include config/hardware/axis/Z/TMC/TMC5160_1-Motor.cfg]
+# [include config/hardware/axis/Z/TMC/TMC5160_2-Motors.cfg]
 # [include config/hardware/axis/Z/TMC/TMC5160_3-Motors.cfg]
 # [include config/hardware/axis/Z/TMC/TMC5160_4-Motors.cfg]
 # ----------------------------------------------------------------------------------------