Index: firmware/App/Modes/FlushPermeate.c
===================================================================
diff -u -r684099bdc3c9ba98a77dbad53bb931a88329d0d5 -rd163e3cc0ecff08015fdeaed6145169dbfacc501
--- firmware/App/Modes/FlushPermeate.c	(.../FlushPermeate.c)	(revision 684099bdc3c9ba98a77dbad53bb931a88329d0d5)
+++ firmware/App/Modes/FlushPermeate.c	(.../FlushPermeate.c)	(revision d163e3cc0ecff08015fdeaed6145169dbfacc501)
@@ -37,8 +37,8 @@
 
 #define PERMEATE_FLUSH_MAX_TIMEOUT                  ( 600 * 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                      ( 300 * MS_PER_SECOND )                      ///< Permeate flush timer (in ms)
-#define PERMEATE_FLUSH_ALARM_TIMEOUT                ( 120 * MS_PER_SECOND )                     ///< Permeate flush timer (in ms)
+#define PERMEATE_FLUSH_TIMEOUT                      ( 120 * MS_PER_SECOND )                      ///< Permeate flush timer (in ms)
+#define PERMEATE_FLUSH_ALARM_TIMEOUT                ( 180 * MS_PER_SECOND )                     ///< Permeate flush timer (in ms)
 #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.
Index: firmware/App/Modes/ModePreGenPermeate.c
===================================================================
diff -u -r6d85a90d2325163e936055a620a8b6aa1a6db65a -rd163e3cc0ecff08015fdeaed6145169dbfacc501
--- firmware/App/Modes/ModePreGenPermeate.c	(.../ModePreGenPermeate.c)	(revision 6d85a90d2325163e936055a620a8b6aa1a6db65a)
+++ firmware/App/Modes/ModePreGenPermeate.c	(.../ModePreGenPermeate.c)	(revision d163e3cc0ecff08015fdeaed6145169dbfacc501)
@@ -42,7 +42,7 @@
 #define PRE_GENP_DATA_PUBLISH_INTERVAL     ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )    ///< Interval (ms/task time) at which the pre gen Permeate mode data published.
 #define VERIFY_WATER_RO_PUMP_TGT_FLOW_ML   700                                          ///< Target flow rate for RO pump in ml/min
 #define VERIFY_WATER_BOOST_PUMP_TGT_PSI    25                                           ///< Target pressure for boost pump in psi.
-#define VERIFY_WATER_TIMEOUT_MS            ( 5 * MS_PER_SECOND )
+#define VERIFY_WATER_TIMEOUT_MS            ( 30 * MS_PER_SECOND )
 
 // ********** private data **********