diff --git a/config/CreatBot_D1000_V0/base.cfg b/config/CreatBot_D1000_V0/base.cfg
index 144e14073..16b944924 100644
--- a/config/CreatBot_D1000_V0/base.cfg
+++ b/config/CreatBot_D1000_V0/base.cfg
@@ -173,7 +173,7 @@ max_power: 1.0
 pin:PC6
 max_power: 1.0
 kick_start_time: 0.5
-heater: extruder
+heater: extruder, extruder1
 off_below: 0.10
 heater_temp: 100
 
diff --git a/config/CreatBot_D600Pro2_V0/base.cfg b/config/CreatBot_D600Pro2_V0/base.cfg
index fd5845d8a..190b5e731 100644
--- a/config/CreatBot_D600Pro2_V0/base.cfg
+++ b/config/CreatBot_D600Pro2_V0/base.cfg
@@ -163,6 +163,7 @@ runout_gcode: _RUNOUT_HANDLE
 event_delay: 3.0
 pause_delay: 0.5
 switch_pin: ^PC15
+
 [fan]
 pin:PC7
 kick_start_time: 0.5
@@ -173,7 +174,7 @@ max_power: 1.0
 pin:PC6
 max_power: 1.0
 kick_start_time: 0.5
-heater: extruder
+heater: extruder, extruder1
 off_below: 0.10
 heater_temp: 100
 
diff --git a/config/CreatBot_F430NX/base.cfg b/config/CreatBot_F430NX/base.cfg
index e340eb07b..297eba912 100644
--- a/config/CreatBot_F430NX/base.cfg
+++ b/config/CreatBot_F430NX/base.cfg
@@ -471,14 +471,15 @@ gcode:
     {% endif %}
 
 [gcode_macro _PARK_extruder1]
+variable_x_offset: 0
 gcode:
-    {% set svv = printer.save_variables.variables %}
-    {% set x_offset = svv.nozzle_x_offset_val|default(0)|float %}
     ACTIVATE_EXTRUDER EXTRUDER=extruder1
     SET_DUAL_CARRIAGE CARRIAGE=1
     SAVE_GCODE_STATE NAME=park_extruder1
     G90
-    G1 X{475 + (x_offset if x_offset >= 0 else -x_offset)} F6000
+    G1 X{475 - (x_offset if x_offset >= 0 else 0)} F6000
+    G91
+    G1 X{0 if x_offset >= 0 else -x_offset} F6000
     RESTORE_GCODE_STATE NAME=park_extruder1
 
 [gcode_macro T1]
@@ -502,7 +503,8 @@ gcode:
             SET_DUAL_CARRIAGE CARRIAGE=1
             SAVE_GCODE_STATE NAME=park1
             G90
-            G1 X{455 + (x_offset if x_offset >= 0 else -x_offset)} F6000
+            G1 X{455-x_offset} F6000
+            SET_GCODE_VARIABLE MACRO=_PARK_extruder1 VARIABLE=x_offset VALUE="{x_offset}"
             RESTORE_GCODE_STATE NAME=park1
             {% if "z" in printer.toolhead.homed_axes | lower %}
                 SET_GCODE_OFFSET Z={z_offset} MOVE=1