diff --git a/message_definitions/orion.xml b/message_definitions/orion.xml
index 4865dc35c1659c1920e0394333ea3335364ee4d9..2ad512293a0a0b946aa5c6a22ee2aac2260dcb4d 100644
--- a/message_definitions/orion.xml
+++ b/message_definitions/orion.xml
@@ -982,21 +982,9 @@
             <field name="n2_filling_pressure" type="float" units="Bar">N2 refueling line pressure</field>
             <field name="n2_vessel_1_pressure" type="float" units="Bar">N2 vessel 1 tank pressure</field>
             <field name="n2_vessel_2_pressure" type="float" units="Bar">N2 vessel 2 tank pressure</field>
-            <field name="ox_filling_valve_state" type="uint8_t">OX filling valve state (1: open, 0: close)</field>
-            <field name="ox_release_valve_state" type="uint8_t">OX release line pressure valve state (1: open, 0: close)</field>
-            <field name="ox_detach_state" type="uint8_t">OX quick connector detach state (1: open, 0: close)</field>
-            <field name="ox_venting_valve_state" type="uint8_t">OX venting valve state (1: open, 0: close)</field>
-            <field name="n2_filling_valve_state" type="uint8_t">N2 filling valve state (1: open, 0: close)</field>
-            <field name="n2_release_valve_state" type="uint8_t">N2 release line pressure valve state (1: open, 0: close)</field>
-            <field name="n2_detach_state" type="uint8_t">N2 quick connector detach state (1: open, 0: close)</field>
-            <field name="n2_quenching_valve_state" type="uint8_t">N2 quenching valve state (1: open, 0: close)</field>
-            <field name="n2_3way_valve_state" type="uint8_t">N2 3-way valve state (1: open, 0: close)</field>
-            <field name="main_valve_state" type="uint8_t">Rocket main OX valve state (1: open, 0: close)</field>
-            <field name="nitrogen_valve_state" type="uint8_t">Rocket main N2 valve state (1: open, 0: close)</field>
-            <field name="chamber_valve_state" type="uint8_t">Chamber pressurization valve state (1: enabled, 0: disabled)</field>
+            <field name="valve_state" type="uint16_t">State of the valves as bitfield, see ValvesList bitmask enum</field>
             <field name="gmm_state" type="uint8_t">State of the GroundModeManager</field>
-            <field name="tars3_state" type="uint8_t">State of TARS 3</field>
-            <field name="tars3m_state" type="uint8_t">State of TARS 3 Maintenance</field>
+            <field name="tars_state" type="uint8_t" enum="TARSList">TARS state</field>
             <field name="arming_state" type="uint8_t">Arming state (1: armed, 0: otherwise)</field>
             <field name="cpu_load" type="float">CPU load in percentage</field>
             <field name="free_heap" type="uint32_t">Amount of available heap memory</field>