Index: firmware/App/Modes/FPModes/FlushPermeate.c
===================================================================
diff -u -r7f54a204787abc0840b3593101c8be64de3b8e65 -r45c1fb3332d132a9c438e50224013b52967e762c
--- firmware/App/Modes/FPModes/FlushPermeate.c	(.../FlushPermeate.c)	(revision 7f54a204787abc0840b3593101c8be64de3b8e65)
+++ firmware/App/Modes/FPModes/FlushPermeate.c	(.../FlushPermeate.c)	(revision 45c1fb3332d132a9c438e50224013b52967e762c)
@@ -35,10 +35,10 @@
 
 // ********** private definitions **********
 
-#define PERMEATE_FLUSH_MAX_TIMEOUT                  ( 600 * MS_PER_SECOND )                     ///< Max override timeout for 10 minutes
+#define PERMEATE_FLUSH_MAX_TIMEOUT                  ( 10 * SEC_PER_MIN * MS_PER_SECOND )        ///< Max override timeout for 10 minutes
 #define PERMEATE_FLUSH_DATA_PUBLISH_INTERVAL        ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )   ///< Interval (ms/task time) at which the gen water mode data published.
-#define PERMEATE_FLUSH_TIMEOUT                      ( 120 * MS_PER_SECOND )                     ///< Permeate flush timer (in ms)
-#define PERMEATE_FLUSH_ALARM_TIMEOUT                ( 180 * MS_PER_SECOND )                     ///< Permeate flush alarm timer (in ms)
+#define PERMEATE_FLUSH_TIMEOUT                      ( 2 * SEC_PER_MIN * MS_PER_SECOND )         ///< Permeate flush timer (in ms) timeout for 2 minutes
+#define PERMEATE_FLUSH_ALARM_TIMEOUT                ( 5 * SEC_PER_MIN * MS_PER_SECOND )         ///< Permeate flush alarm timer (in ms) timeout for 3 minutes (5-2) since both timer starts at same time.
 #define PERMEATE_FLUSH_RO_PUMP_TGT_ML               700                                         ///< Pressure target in ml/min for the RO pump during permeate flush.
 #define PERMEATE_FLUSH_BOOST_PUMP_TGT_PSI           25                                          ///< Pressure target in PSI for the boost pump during permeate flush.
 #define PERMEATE_FLUSH_CONDUCTIVITY_THRESHOLD       200.0F                                      ///< Conductivity alarm threshold for permeate flush.
@@ -185,7 +185,7 @@
             state = PERM_FLUSH_PAUSED;
         }
 
-        // If conductivity is not in range, continue to monitor until timeout
+        // If conductivity is not in range, continue to monitor until timeout, TODO if conductivity fluctuates for another 3 minutes
         else
         {
             if ( TRUE == didTimeout( permeateFlushAlarmTimer, getPermeateFlushAlarmTimeout() ) )