diff --git a/macros/base/end_print.cfg b/macros/base/end_print.cfg
index 43f3aadc..3be55ef8 100644
--- a/macros/base/end_print.cfg
+++ b/macros/base/end_print.cfg
@@ -2,7 +2,7 @@
 ## Available actions: "retract_filament", "turn_off_heaters", "turn_off_fans", "turn_off_motors"
 ##
 [gcode_macro _USER_VARIABLES]
-variable_endprint_actions: "retract_filament", "turn_off_heaters", "turn_off_fans", "turn_off_motors"
+variable_endprint_actions: "retract_filament", "turn_off_heaters", "turn_off_fans", "turn_off_motors", "reset_limits"
 gcode: # do not remove this line
 
 [gcode_macro END_PRINT]
@@ -46,6 +46,8 @@ gcode:
             _MODULE_TURN_OFF_FANS
         {% elif action == "turn_off_motors" %}
             _MODULE_TURN_OFF_MOTORS
+        {% elif action == "reset_limits" %}
+            _MODULE_RESET_LIMITS
         {% else %}
             {% if "_END_PRINT_ACTION_%s" % (action|upper) in printer.gcode.commands %}
                 _MODULE_{action|upper} {rawparams}
diff --git a/user_templates/variables.cfg b/user_templates/variables.cfg
index 8abb6d79..f0328f94 100644
--- a/user_templates/variables.cfg
+++ b/user_templates/variables.cfg
@@ -70,6 +70,15 @@ variable_disable_motors_in_end_print: False
 ## Automatically turn-off heaters in the END_PRINT macro
 variable_turn_off_heaters_in_end_print: True
 
+## Automatically reset velocity limits to configured values in the END_PRINT macro
+variable_reset_velocity_limits_in_end_print: True
+
+## Automatically reset extrude factor to 100% in the END_PRINT macro
+variable_reset_extrude_factor_in_end_print: True
+
+## Automatically reset speed factor to 100% in the END_PRINT macro
+variable_reset_speed_factor_in_end_print: True
+
 
 #########################################################
 # Dockable probe variables (if available in the machine)