diff --git a/boards/btt-octopus-11/config.cfg b/boards/btt-octopus-11/config.cfg
index 0e8ea49b..ee586986 100644
--- a/boards/btt-octopus-11/config.cfg
+++ b/boards/btt-octopus-11/config.cfg
@@ -16,8 +16,8 @@ aliases:
   z3_step_pin=PF9,	z3_dir_pin=PF10,	z3_enable_pin=PG2,	z3_uart_pin=PF2, z3_diag_pin=null, # Voron 2.4 support
   e_step_pin=PF11,   e_dir_pin=PG3,   e_enable_pin=PG5,   e_uart_pin=PC6,   e_diag_pin=null,   e_heater_pin=PA2,  e_sensor_pin=PF4,
   # Hybrid CoreXY Single Toolhead
-  y2step_pin=PG4,   y2dir_pin=PC1,   y2enable_pin=PA0,   y2uart_pin=PC7,   y2diag_pin=PG11,
-  y1_step_pin=PF9,   y1_dir_pin=PF10,   y1_enable_pin=PG2,   y1_uart_pin=PF2,   y1_diag_pin=PG12,
+  y1_step_pin=PG4,   y1_dir_pin=PC1,   y1_enable_pin=PA0,   y1_uart_pin=PC7,   y1_diag_pin=PG11,
+  y2_step_pin=PF9,   y2_dir_pin=PF10,   y2_enable_pin=PG2,   y2_uart_pin=PF2,   y2_diag_pin=PG12,
   # Hybrid CoreXY IDEX
   dual_carriage_step_pin=PG4,   dual_carriage_dir_pin=PC1,   dual_carriage_enable_pin=PA0,   dual_carriage_uart_pin=PC7,   dual_carriage_diag_pin=PG11,
   dual_carriage_heater_pin=PA3,  dual_carriage_sensor_pin=PF5,
diff --git a/boards/btt-octopus-pro-429/config.cfg b/boards/btt-octopus-pro-429/config.cfg
index b7402ef7..2a6f2504 100644
--- a/boards/btt-octopus-pro-429/config.cfg
+++ b/boards/btt-octopus-pro-429/config.cfg
@@ -17,8 +17,8 @@ aliases:
   e_step_pin=PF11,   e_dir_pin=PG3,   e_enable_pin=PG5,   e_uart_pin=PC6,   e_diag_pin=null,   e_heater_pin=PA2,  e_sensor_pin=PF4,
   stepper_spi_mosi_pin=PA7,  stepper_spi_miso_pin=PA6,  stepper_spi_sclk_pin=PA5,
   # Hybrid CoreXY Single Toolhead
-  y2step_pin=PG4,   y2dir_pin=PC1,   y2enable_pin=PA0,   y2uart_pin=PC7,   y2diag_pin=PG11,
-  y1_step_pin=PF9,   y1_dir_pin=PF10,   y1_enable_pin=PG2,   y1_uart_pin=PF2,   y1_diag_pin=PG12,
+  y1_step_pin=PG4,   y1_dir_pin=PC1,   y1_enable_pin=PA0,   y1_uart_pin=PC7,   y1_diag_pin=PG11,
+  y2_step_pin=PF9,   y2_dir_pin=PF10,   y2_enable_pin=PG2,   y2_uart_pin=PF2,   y2_diag_pin=PG12,
   # Hybrid CoreXY IDEX
   dual_carriage_step_pin=PG4,   dual_carriage_dir_pin=PC1,   dual_carriage_enable_pin=PA0,   dual_carriage_uart_pin=PC7,   dual_carriage_diag_pin=PG11,
   dual_carriage_heater_pin=PA3,  dual_carriage_sensor_pin=PF5,
diff --git a/boards/btt-octopus-pro-446/config.cfg b/boards/btt-octopus-pro-446/config.cfg
index ff335957..f05869dc 100644
--- a/boards/btt-octopus-pro-446/config.cfg
+++ b/boards/btt-octopus-pro-446/config.cfg
@@ -17,8 +17,8 @@ aliases:
   e_step_pin=PF11,   e_dir_pin=PG3,   e_enable_pin=PG5,   e_uart_pin=PC6,   e_diag_pin=null,   e_heater_pin=PA2,  e_sensor_pin=PF4,
   stepper_spi_mosi_pin=PA7,  stepper_spi_miso_pin=PA6,  stepper_spi_sclk_pin=PA5,
   # Hybrid CoreXY Single Toolhead
-  y2_step_pin=PG4,   y2_dir_pin=PC1,   y2_enable_pin=PA0,   y2_uart_pin=PC7,   y2_diag_pin=PG11,
-  y1_step_pin=PF9,   y1_dir_pin=PF10,   y1_enable_pin=PG2,   y1_uart_pin=PF2,   y1_diag_pin=PG12,
+  y1_step_pin=PG4,   y1_dir_pin=PC1,   y1_enable_pin=PA0,   y1_uart_pin=PC7,   y1_diag_pin=PG11,
+  y2_step_pin=PF9,   y2_dir_pin=PF10,   y2_enable_pin=PG2,   y2_uart_pin=PF2,   y2_diag_pin=PG12,
   # Hybrid CoreXY IDEX
   dual_carriage_step_pin=PG4,   dual_carriage_dir_pin=PC1,   dual_carriage_enable_pin=PA0,   dual_carriage_uart_pin=PC7,   dual_carriage_diag_pin=PG11,
   dual_carriage_heater_pin=PA3,  dual_carriage_sensor_pin=PF5,
diff --git a/boards/btt-octopus-pro-h723-11/config.cfg b/boards/btt-octopus-pro-h723-11/config.cfg
index 98d66309..16d2151c 100644
--- a/boards/btt-octopus-pro-h723-11/config.cfg
+++ b/boards/btt-octopus-pro-h723-11/config.cfg
@@ -17,8 +17,8 @@ aliases:
   e_step_pin=PF11,   e_dir_pin=PG3,   e_enable_pin=PG5,   e_uart_pin=PC6,   e_diag_pin=null,   e_heater_pin=PA0,  e_sensor_pin=PF4,
   stepper_spi_mosi_pin=PA7,  stepper_spi_miso_pin=PA6,  stepper_spi_sclk_pin=PA5,
   # Hybrid CoreXY Single Toolhead
-  y2step_pin=PG4,   y2dir_pin=PC1,   y2enable_pin=PA2,   y2uart_pin=PC7,   y2diag_pin=PG11,
-  y1_step_pin=PF9,   y1_dir_pin=PF10,   y1_enable_pin=PG2,   y1_uart_pin=PF2,   y1_diag_pin=PG12,
+  y1_step_pin=PG4,   y1_dir_pin=PC1,   y1_enable_pin=PA2,   y1_uart_pin=PC7,   y1_diag_pin=PG11,
+  y2_step_pin=PF9,   y2_dir_pin=PF10,   y2_enable_pin=PG2,   y2_uart_pin=PF2,   y2_diag_pin=PG12,
   # Hybrid CoreXY IDEX
   dual_carriage_step_pin=PG4,   dual_carriage_dir_pin=PC1,   dual_carriage_enable_pin=PA0,   dual_carriage_uart_pin=PC7,   dual_carriage_diag_pin=PG11,
   dual_carriage_heater_pin=PA3,  dual_carriage_sensor_pin=PF5,
diff --git a/boards/btt-octopus-pro-h723/config.cfg b/boards/btt-octopus-pro-h723/config.cfg
index 0aae7851..2c3fb193 100644
--- a/boards/btt-octopus-pro-h723/config.cfg
+++ b/boards/btt-octopus-pro-h723/config.cfg
@@ -17,8 +17,8 @@ aliases:
   e_step_pin=PF11,   e_dir_pin=PG3,   e_enable_pin=PG5,   e_uart_pin=PC6,   e_diag_pin=null,   e_heater_pin=PA2,  e_sensor_pin=PF4,
   stepper_spi_mosi_pin=PA7,  stepper_spi_miso_pin=PA6,  stepper_spi_sclk_pin=PA5,
   # Hybrid CoreXY Single Toolhead
-  y2step_pin=PG4,   y2dir_pin=PC1,   y2enable_pin=PA0,   y2uart_pin=PC7,   y2diag_pin=PG11,
-  y1_step_pin=PF9,   y1_dir_pin=PF10,   y1_enable_pin=PG2,   y1_uart_pin=PF2,   y1_diag_pin=PG12,
+  y1_step_pin=PG4,   y1_dir_pin=PC1,   y1_enable_pin=PA0,   y1_uart_pin=PC7,   y1_diag_pin=PG11,
+  y2_step_pin=PF9,   y2_dir_pin=PF10,   y2_enable_pin=PG2,   y2_uart_pin=PF2,   y2_diag_pin=PG12,
   # Hybrid CoreXY IDEX
   dual_carriage_step_pin=PG4,   dual_carriage_dir_pin=PC1,   dual_carriage_enable_pin=PA0,   dual_carriage_uart_pin=PC7,   dual_carriage_diag_pin=PG11,
   dual_carriage_heater_pin=PA3,  dual_carriage_sensor_pin=PF5,