Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r8b9228fb0b90497e4c71d0eedd2b8cb9220f5f66 -r687cd19f4cd2476f648b7eb48c54c20fca0facb1
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 8b9228fb0b90497e4c71d0eedd2b8cb9220f5f66)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 687cd19f4cd2476f648b7eb48c54c20fca0facb1)
@@ -45,8 +45,13 @@
 #define HEAT_DISINFECT_DWELL_TIME_MS                    ( 10 * 60 * MS_PER_SECOND )                 ///< Required dwell time after the sensor is above target.
 #define HEAT_DISINFECT_D78_DWELL_TEMP_C                 80.0F                                       ///< DD recirc dwell starts when D78 exceeds this (deg C).
 #define HEAT_DISINFECT_D4_DWELL_TEMP_C                  80.0F                                       ///< WCID dwell counts while D4 exceeds this (deg C).
+#if 1
+#define HEAT_DISINFECT_HEATER_TARGET_C                  40.0F                                       ///< D5 heater target temperature during DD recirc (deg C).
+#define HEAT_DISINFECT_HYDROBLOCK_TARGET_C              40.0F                                       ///< D5 heater target temperature during hydroblock recirc (deg C).
+#else
 #define HEAT_DISINFECT_HEATER_TARGET_C                  90.0F                                       ///< D5 heater target temperature during DD recirc (deg C).
 #define HEAT_DISINFECT_HYDROBLOCK_TARGET_C              88.0F                                       ///< D5 heater target temperature during hydroblock recirc (deg C).
+#endif
 #define HEAT_DISINFECT_HYDROBLOCK_STOP_TEMP_C           88.0F                                       ///< Stop D5 when D4 reaches this temperature (deg C).
 #define HEAT_DISINFECT_D18_HEATER_ENABLE_PSI            3.0F                                        ///< Minimum D18 pressure before D5 is started (PSI).
 #define HEAT_DISINFECT_D66_TARGET_PSI                   3.0F                                        ///< D65 pressure target (PSI).
@@ -390,12 +395,13 @@
     //TODO: Remove after testing
     setValveState( M12_VALV, VALVE_STATE_CLOSED );
     setValveState( P39_VALV, VALVE_STATE_CLOSED );
-    setValveState( D35_VALV, VALVE_STATE_CLOSED );
-    setValveState( D40_VALV, VALVE_STATE_CLOSED );
-    setValveState( D34_VALV, VALVE_STATE_CLOSED );
-    setValveState( D91_VALV, VALVE_STATE_CLOSED );
-    setValveState( D95_VALV, VALVE_STATE_CLOSED );
 
+    setValveState( D35_VALV, VALVE_STATE_OPEN );
+    setValveState( D40_VALV, VALVE_STATE_OPEN );
+    setValveState( D34_VALV, VALVE_STATE_OPEN );
+    setValveState( D91_VALV, VALVE_STATE_OPEN );
+    setValveState( D95_VALV, VALVE_STATE_OPEN );
+
     setValveState( D31_VALV, VALVE_STATE_CLOSED );
     setValveState( D47_VALV, VALVE_STATE_CLOSED );
     setValveState( D88_79_VALV, VALVE_STATE_CLOSED );