diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index e06b2e21..215dd650 100755
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -55,6 +55,15 @@
  */
 // #define KNUTWURST_DEBUG
 
+/*
+ * Adjust the Trigorilla pin mapping.
+ */
+#if ENABLED(KNUTWURST_CHIRON)
+  #define TRIGORILLA_MAPPING_CHIRON
+#else
+  #define TRIGORILLA_MAPPING_I3MEGA
+  #define SWAP_Z_MOTORS
+#endif
 
 /*
  * This enables the integrated Laser engaving feature
diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
index b101a7b6..33c60f7b 100755
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
@@ -69,7 +69,7 @@
   #define Y_STOP_PIN                          19
 
   #define CONTROLLER_FAN_PIN            FAN1_PIN // PATCH: knutwurst
-#elif ANY(TRIGORILLA_MAPPING_CHIRON, TRIGORILLA_MAPPING_I3MEGA, KNUTWURST_MEGA, KNUTWURST_MEGA_S, KNUTWURST_MEGA_P, KNUTWURST_MEGA_X, KNUTWURST_4MAXP2, KNUTWURST_CHIRON)   // PATCH: Knutwurst
+#elif EITHER(TRIGORILLA_MAPPING_CHIRON, TRIGORILLA_MAPPING_I3MEGA)
   // Chiron uses AUX header for Y and Z endstops
   #define Y_STOP_PIN                          42  // AUX
   #define Z_STOP_PIN                          43  // AUX
@@ -86,7 +86,7 @@
     #define OUTAGECON_PIN                     58
   #endif
 
-  #if EITHER(TRIGORILLA_MAPPING_CHIRON, KNUTWURST_CHIRON)   // PATCH: Knutwurst
+  #if ENABLED(TRIGORILLA_MAPPING_CHIRON)
     #ifndef FIL_RUNOUT_PIN
       #define FIL_RUNOUT_PIN                  33
     #endif