diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 72cd52fc66..438b66c8e1 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -2235,12 +2235,7 @@ bool calibrate_z_auto()
 	plan_buffer_line_destinationXYZE(feedrate / 60);
 	st_synchronize();
 	enable_endstops(endstops_enabled);
-	if (PRINTER_TYPE == PRINTER_MK3) {
-		current_position[Z_AXIS] = Z_MAX_POS + 2.0;
-	}
-	else {
-		current_position[Z_AXIS] = Z_MAX_POS + 9.0;
-	}
+	current_position[Z_AXIS] = Z_MAX_POS + Z_MAX_POS_XYZ_CALIBRATION_CORRECTION;
 	plan_set_position_curposXYZE();
 	return true;
 }
diff --git a/Firmware/variants/MK3-E3DREVO.h b/Firmware/variants/MK3-E3DREVO.h
index 5694548a07..48c9eaae0e 100644
--- a/Firmware/variants/MK3-E3DREVO.h
+++ b/Firmware/variants/MK3-E3DREVO.h
@@ -64,6 +64,9 @@
 #define Z_MAX_POS 210
 #define Z_MIN_POS 0.15
 
+// Z height correction value
+#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 2
+
 // Canceled home position
 #define X_CANCEL_POS 50
 #define Y_CANCEL_POS 190
diff --git a/Firmware/variants/MK3-E3DREVO_HF_60W.h b/Firmware/variants/MK3-E3DREVO_HF_60W.h
index 080c3acf21..36dbc3163a 100644
--- a/Firmware/variants/MK3-E3DREVO_HF_60W.h
+++ b/Firmware/variants/MK3-E3DREVO_HF_60W.h
@@ -64,6 +64,9 @@
 #define Z_MAX_POS 210
 #define Z_MIN_POS 0.15
 
+// Z height correction value
+#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 2
+
 // Canceled home position
 #define X_CANCEL_POS 50
 #define Y_CANCEL_POS 190
diff --git a/Firmware/variants/MK3.h b/Firmware/variants/MK3.h
index a06bc5baae..b0109d37d7 100644
--- a/Firmware/variants/MK3.h
+++ b/Firmware/variants/MK3.h
@@ -64,6 +64,9 @@
 #define Z_MAX_POS 210
 #define Z_MIN_POS 0.15
 
+// Z height correction value
+#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 2
+
 // Canceled home position
 #define X_CANCEL_POS 50
 #define Y_CANCEL_POS 190
diff --git a/Firmware/variants/MK3S-E3DREVO.h b/Firmware/variants/MK3S-E3DREVO.h
index de7ee36404..dc8808c54d 100644
--- a/Firmware/variants/MK3S-E3DREVO.h
+++ b/Firmware/variants/MK3S-E3DREVO.h
@@ -66,6 +66,9 @@
 #define Z_MAX_POS 210
 #define Z_MIN_POS 0.15
 
+// Z height correction value
+#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 9
+
 // Canceled home position
 #define X_CANCEL_POS 50
 #define Y_CANCEL_POS 190
diff --git a/Firmware/variants/MK3S-E3DREVO_HF_60W.h b/Firmware/variants/MK3S-E3DREVO_HF_60W.h
index da1f8f25f3..74e4e43f5c 100644
--- a/Firmware/variants/MK3S-E3DREVO_HF_60W.h
+++ b/Firmware/variants/MK3S-E3DREVO_HF_60W.h
@@ -66,6 +66,9 @@
 #define Z_MAX_POS 210
 #define Z_MIN_POS 0.15
 
+// Z height correction value
+#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 9
+
 // Canceled home position
 #define X_CANCEL_POS 50
 #define Y_CANCEL_POS 190
diff --git a/Firmware/variants/MK3S.h b/Firmware/variants/MK3S.h
index 75c7831d16..3623aad105 100644
--- a/Firmware/variants/MK3S.h
+++ b/Firmware/variants/MK3S.h
@@ -66,6 +66,9 @@
 #define Z_MAX_POS 210
 #define Z_MIN_POS 0.15
 
+// Z height correction value
+#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 9
+
 // Canceled home position
 #define X_CANCEL_POS 50
 #define Y_CANCEL_POS 190