diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 9359a95b9e..52314e0273 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -671,7 +671,7 @@
  *
  * :[2,3,4,5,6,7]
  */
-//#define ENDSTOP_NOISE_THRESHOLD 2
+#define ENDSTOP_NOISE_THRESHOLD 2
 
 //=============================================================================
 //============================== Movement Settings ============================
@@ -1305,7 +1305,7 @@
 #endif
 
 // Homing speeds (mm/m)
-#define HOMING_FEEDRATE_XY 6000
+#define HOMING_FEEDRATE_XY 4500
 #define HOMING_FEEDRATE_Z  360
 
 // Validate that endstops are triggered on homing moves
diff --git a/Marlin/src/pins/pins_RAMPS.h b/Marlin/src/pins/pins_RAMPS.h
index 1f06992cfa..2422b81850 100644
--- a/Marlin/src/pins/pins_RAMPS.h
+++ b/Marlin/src/pins/pins_RAMPS.h
@@ -83,8 +83,8 @@
 #ifndef X_MAX_PIN
   #define X_MAX_PIN         2
 #endif
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
+#define Y_MIN_PIN          15
+#define Y_MAX_PIN          14
 #define Z_MIN_PIN          18
 #define Z_MAX_PIN          19