Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r937362196a40d7d55b1b61e33f88c382184fbf2f -r17bfea4963b43699d23ae3730dcaf3bf349d915d
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 937362196a40d7d55b1b61e33f88c382184fbf2f)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 17bfea4963b43699d23ae3730dcaf3bf349d915d)
@@ -7,8 +7,8 @@
 *
 * @file    Valves.c
 *
-* @author  (last)      “rkallala”
-* @date    (last)      28-Jan-2026
+* @author  (last)      “Raghu
+* @date    (last)      04-Feb-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  26-Aug-2024
@@ -524,6 +524,47 @@
 
 /*********************************************************************//**
  * @brief
+ * The setRecoveryValvesConfig function sets all recovery valves per
+ * recovery configuration from institutional record.
+ * @details \b Inputs: none
+ * @details \b Outputs: P33, P34 and P37 recovery valve states
+ * @return none.
+ *************************************************************************/
+void setRecoveryValvesConfig( void )
+{
+    // TODO define hdInstitutionalRecord and get the NVData when it's ready
+//    RECOVERY_STATE_T recoveryState = (RECOVERY_STATE_T)hdInstitutionalRecord.recoveryConfig;
+    RECOVERY_STATE_T recoveryState = MAX_RECOVERY;
+
+    // Set all P33, P34 and P37 valves per recovery configuration
+    switch( recoveryState )
+    {
+        case NO_RECOVERY:
+            setValveState( P33_VALV, VALVE_STATE_CLOSED );
+            setValveState( P34_VALV, VALVE_STATE_CLOSED );
+            setValveState( P37_VALV, VALVE_STATE_CLOSED );
+            break;
+
+        case MEDIUM_RECOVERY:
+            setValveState( P33_VALV, VALVE_STATE_OPEN );
+            setValveState( P34_VALV, VALVE_STATE_CLOSED );
+            setValveState( P37_VALV, VALVE_STATE_OPEN );
+            break;
+
+        case MAX_RECOVERY:
+            setValveState( P33_VALV, VALVE_STATE_OPEN );
+            setValveState( P34_VALV, VALVE_STATE_CLOSED );
+            setValveState( P37_VALV, VALVE_STATE_CLOSED );
+            break;
+
+        default:
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_FP_INVALID_RECOVERY_VALVE_STATE, recoveryState )
+            break;
+    }
+}
+
+/*********************************************************************//**
+ * @brief
  * The publishValvesStates function publishes DD valves states at the set interval.
  * @details \b Inputs: valvesStatesPublicationTimerCounter
  * @details \b Outputs: valvesStatesPublicationTimerCounter
@@ -633,15 +674,35 @@
 {
     DD_BC_VALVE_OVERRIDE_PAYLOAD_T payload;
     DD_VALVES_T valve;
-    BOOL result = FALSE;
+    U32 mask;
+    VALVE_STATE_NAMES_T pos;
+    OVERRIDE_TYPE_T ovType      = OVERRIDE_INVALID;
+    BOOL result                 = FALSE;
 
     memcpy( (U08*)(&payload), message->payload, sizeof( DD_BC_VALVE_OVERRIDE_PAYLOAD_T ) );
-    for ( valve = FIRST_BC_VALVE; valve <= LAST_BC_VALVE; valve++ )
+    ovType = ( TRUE == payload.reset ? OVERRIDE_RESET_OVERRIDE : OVERRIDE_OVERRIDE );
+
+    // Verify tester has logged in with f/w and override type is valid
+    if ( ( TRUE == isTestingActivated() ) && ( ovType != OVERRIDE_INVALID ) && ( ovType < NUM_OF_OVERRIDE_TYPES ) )
     {
-        U32                 mask = 0x1 << (valve - FIRST_BC_VALVE);
-        VALVE_STATE_NAMES_T pos  = ( ( ( payload.valveStatesBits & mask ) != 0 ) ? VALVE_STATE_OPEN : VALVE_STATE_CLOSED );
+        for ( valve = FIRST_BC_VALVE; valve <= LAST_BC_VALVE; valve++ )
+        {
+            mask = ( 0x1 << ( valve - FIRST_BC_VALVE ) );
+            pos  = ( ( ( payload.valveStatesBits & mask ) != 0 ) ? VALVE_STATE_OPEN : VALVE_STATE_CLOSED);
 
-        result = setValveState( valve, pos );
+            if ( OVERRIDE_OVERRIDE == ovType )
+            {
+               result = TRUE;
+               valveStates[ valve ].ovData =  convertValveStateNameToValveState( pos );
+               valveStates[ valve ].override = OVERRIDE_KEY;
+            }
+            else
+            {
+               result = TRUE;
+               valveStates[ valve ].override = OVERRIDE_RESET;
+               valveStates[ valve ].ovData = valveStates[ valve ].ovInitData;
+            }
+        }
     }
 
     return result;