diff --git a/config/examples/AnyCubic/Chiron/Configuration_adv.h b/config/examples/AnyCubic/Chiron/Configuration_adv.h
index c461b77920..e7f3c3b300 100644
--- a/config/examples/AnyCubic/Chiron/Configuration_adv.h
+++ b/config/examples/AnyCubic/Chiron/Configuration_adv.h
@@ -876,7 +876,7 @@
 
   #define Z_MULTI_ENDSTOPS            // Other Z axes have their own endstops
   #if ENABLED(Z_MULTI_ENDSTOPS)
-    #define Z2_STOP_PIN X_MAX_PIN     // Z2 endstop pin override
+    //#define Z2_STOP_PIN X_MAX_PIN   // Z2 endstop pin override
     #define Z2_ENDSTOP_ADJUSTMENT 0   // Z2 offset relative to Z endstop
   #endif
   #ifdef Z3_DRIVER_TYPE
diff --git a/config/examples/AnyCubic/i3 Mega/Trigorilla AVR/Configuration.h b/config/examples/AnyCubic/i3 Mega/Trigorilla AVR/Configuration.h
index d49b40f112..5c82a45afc 100644
--- a/config/examples/AnyCubic/i3 Mega/Trigorilla AVR/Configuration.h	
+++ b/config/examples/AnyCubic/i3 Mega/Trigorilla AVR/Configuration.h	
@@ -71,6 +71,30 @@
 
 // @section machine
 
+/**
+ * Select your version of the Trigorilla (RAMPS1.4) board here.
+ *
+ * 0 = Default Trigorilla
+ * 1 = Newer Trigorilla v1.1 (first seen late 2018)
+ *
+ * The only major difference is a slight change on the servo pin mapping.
+ * This setting only is relevant if you want to use BLtouch or similar
+ * mods to be used via servo pins.
+ * The new version is to be identified by a "TRIGORILLA1.1" lettering
+ * on the upper left of the PCB silkscreen.
+ */
+#define TRIGORILLA_VERSION 0
+
+// i3 Mega remaps some Trigorilla 1.4 pins
+#define TRIGORILLA_MAPPING_I3MEGA
+
+// Choose the name from boards.h that matches your setup
+#if TRIGORILLA_VERSION == 1
+  #define MOTHERBOARD BOARD_TRIGORILLA_14_11
+#else
+  #define MOTHERBOARD BOARD_TRIGORILLA_14
+#endif
+
 /**
  * Select the serial port on the board to use for communication with the host.
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
@@ -124,30 +148,6 @@
 // Enable the Bluetooth serial interface on AT90USB devices
 //#define BLUETOOTH
 
-/**
- * Select your version of the Trigorilla (RAMPS1.4) board here.
- *
- * 0 = Default Trigorilla
- * 1 = Newer Trigorilla v1.1 (first seen late 2018)
- *
- * The only major difference is a slight change on the servo pin mapping.
- * This setting only is relevant if you want to use BLtouch or similar
- * mods to be used via servo pins.
- * The new version is to be identified by a "TRIGORILLA1.1" lettering
- * on the upper left of the PCB silkscreen.
- */
-#define TRIGORILLA_VERSION 0
-
-// Choose the name from boards.h that matches your setup
-#if TRIGORILLA_VERSION == 1
-  #define MOTHERBOARD BOARD_TRIGORILLA_14_11
-#else
-  #define MOTHERBOARD BOARD_TRIGORILLA_14
-#endif
-
-// i3 Mega remaps some Trigorilla 1.4 pins
-#define TRIGORILLA_MAPPING_I3MEGA
-
 /**
  * Some Anycubic machines have Z1 and Z2 swapped to save on wiring.
  */
diff --git a/config/examples/AnyCubic/i3 Mega/Trigorilla AVR/Configuration_adv.h b/config/examples/AnyCubic/i3 Mega/Trigorilla AVR/Configuration_adv.h
index f1ab5c5a2b..0d8ec6c5bb 100644
--- a/config/examples/AnyCubic/i3 Mega/Trigorilla AVR/Configuration_adv.h	
+++ b/config/examples/AnyCubic/i3 Mega/Trigorilla AVR/Configuration_adv.h	
@@ -876,7 +876,7 @@
 
   #define Z_MULTI_ENDSTOPS            // Other Z axes have their own endstops
   #if ENABLED(Z_MULTI_ENDSTOPS)
-    #define Z2_STOP_PIN X_MAX_PIN     // Z2 endstop pin override
+    //#define Z2_STOP_PIN X_MAX_PIN   // Z2 endstop pin override
     #define Z2_ENDSTOP_ADJUSTMENT 0   // Z2 offset relative to Z endstop
   #endif
   #ifdef Z3_DRIVER_TYPE