diff --git a/macros.d/macros.cfg b/macros.d/macros.cfg
index 16b94f4..7e23ca7 100644
--- a/macros.d/macros.cfg
+++ b/macros.d/macros.cfg
@@ -143,12 +143,38 @@ gcode:
     M117 Restarting...
     SAVE_AT_END
 
+[gcode_macro TUNE_ENDSTOP_PHASE]
+gcode:
+    M117 Running Endstop Cal
+    SMARTHOME
+    G1 X0 Y0 Z5 F6000
+    G28
+    ENDSTOP_PHASE_CALIBRATE
+    G1 X60 Y60 Z60 F6000
+    G28
+    ENDSTOP_PHASE_CALIBRATE
+    G1 X25 Y25 Z25 F6000
+    G28
+    ENDSTOP_PHASE_CALIBRATE
+    G1 X119 Y119 Z1 F6000
+    G28
+    ENDSTOP_PHASE_CALIBRATE
+    G1 X100 Y100 Z100 F6000
+    G28
+    ENDSTOP_PHASE_CALIBRATE STEPPER=stepper_z
+ 
 
 [gcode_macro heat_soak]
 gcode:
     {% if printer.toolhead.status == "Ready" %}
         G28
         G1 Z10
+    G1 X0 Y0 Z5 F6000
+    G28
+    ENDSTOP_PHASE_CALIBRATE
+    G1 X0 Y0 Z5 F6000
+    G28
+    ENDSTOP_PHASE_CALIBRATE
         G1 X150 Y150 F6000
         M140 S100
         UPDATE_DELAYED_GCODE ID=heatsoakDelay DURATION=600