diff --git a/Marlin/Conditionals_LulzBot.h b/Marlin/Conditionals_LulzBot.h
index 670d9298d..b80d4d45d 100644
--- a/Marlin/Conditionals_LulzBot.h
+++ b/Marlin/Conditionals_LulzBot.h
@@ -37,7 +37,7 @@
     #error Must specify model and toolhead. Please see "Configuration_LulzBot.h" for directions.
 #endif
 
-#define LULZBOT_FW_VERSION ".21"
+#define LULZBOT_FW_VERSION ".22"
 
 // Select options based on printer model
 
@@ -151,6 +151,14 @@
 #define LULZBOT_USE_YMAX_PLUG
 #define LULZBOT_USE_ZMAX_PLUG
 
+#define LULZBOT_ENDSTOPS_ALWAYS_ON_DEFAULT
+#define LULZBOT_ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
+
+// The RAMBO does not support interrupts on all pins
+// so leave the ENDSTOP_INTERRUPTS_FEATURE disabled
+
+//#define LULZBOT_ENDSTOP_INTERRUPTS_FEATURE
+
 /* Endstop settings are determined by printer model, except for the
  * X_MAX which varies by toolhead. */
 
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 77d94c0b6..8c5d47906 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -496,7 +496,9 @@
 
 // Enable this feature if all enabled endstop pins are interrupt-capable.
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.
-//#define ENDSTOP_INTERRUPTS_FEATURE
+#if defined(LULZBOT_ENDSTOP_INTERRUPTS_FEATURE)
+#define ENDSTOP_INTERRUPTS_FEATURE LULZBOT_ENDSTOP_INTERRUPTS_FEATURE
+#endif
 
 //=============================================================================
 //============================== Movement Settings ============================
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 7bc6a30b3..6f8562bb2 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -242,7 +242,7 @@
 
 // If you want endstops to stay on (by default) even when not homing
 // enable this option. Override at any time with M120, M121.
-//#define ENDSTOPS_ALWAYS_ON_DEFAULT
+#define ENDSTOPS_ALWAYS_ON_DEFAULT LULZBOT_ENDSTOPS_ALWAYS_ON_DEFAULT
 
 // @section extras
 
@@ -532,7 +532,7 @@
   // This option allows you to abort SD printing when any endstop is triggered.
   // This feature must be enabled with "M540 S1" or from the LCD menu.
   // To have any effect, endstops must be enabled during SD printing.
-  //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
+  #define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED LULZBOT_ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
 
 #endif // SDSUPPORT