diff --git a/selfdrive/car/fw_versions.py b/selfdrive/car/fw_versions.py
index 7e0ce8a915..95b970f125 100755
--- a/selfdrive/car/fw_versions.py
+++ b/selfdrive/car/fw_versions.py
@@ -90,7 +90,7 @@ def match_fw_to_car(fw_versions):
         continue
 
       # TODO: COROLLA_TSS2 engine can show on two different addresses
-      if ecu_type == Ecu.engine and candidate == TOYOTA.COROLLA_TSS2 and found_version is None:
+      if ecu_type == Ecu.engine and candidate in [TOYOTA.COROLLA_TSS2, TOYOTA.CHR] and found_version is None:
         continue
 
       # ignore non essential ecus
diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py
index b1ab35c0df..b63905dc3e 100644
--- a/selfdrive/car/toyota/values.py
+++ b/selfdrive/car/toyota/values.py
@@ -335,12 +335,32 @@ FW_VERSIONS = {
     ],
   },
   CAR.CHR: {
-    (Ecu.dsu, 0x791, None): [b'8821FF404100    '],
-    (Ecu.esp, 0x7b0, None): [b'F1526F4122\x00\x00\x00\x00\x00\x00'],
-    (Ecu.eps, 0x7a1, None): [b'8965B10040\x00\x00\x00\x00\x00\x00'],
-    (Ecu.engine, 0x7e0, None): [b'\x033F424000\x00\x00\x00\x00\x00\x00\x00\x00A0202000\x00\x00\x00\x00\x00\x00\x00\x00895231203202\x00\x00\x00\x00'],
-    (Ecu.fwdRadar, 0x750, 0xf): [b'8821FF404100    '],
-    (Ecu.fwdCamera, 0x750, 0x6d): [b'8646FF404000    '],
+    (Ecu.engine, 0x700, None): [
+      b'\x0189663F413100\x00\x00\x00\x00',
+    ],
+    (Ecu.dsu, 0x791, None): [
+      b'8821FF401600    ',
+      b'8821FF404100    ',
+    ],
+    (Ecu.esp, 0x7b0, None): [
+      b'F1526F4073\x00\x00\x00\x00\x00\x00',
+      b'F1526F4122\x00\x00\x00\x00\x00\x00',
+    ],
+    (Ecu.eps, 0x7a1, None): [
+      b'8965B10011\x00\x00\x00\x00\x00\x00',
+      b'8965B10040\x00\x00\x00\x00\x00\x00',
+    ],
+    (Ecu.engine, 0x7e0, None): [
+      b'\x033F424000\x00\x00\x00\x00\x00\x00\x00\x00A0202000\x00\x00\x00\x00\x00\x00\x00\x00895231203202\x00\x00\x00\x00',
+    ],
+    (Ecu.fwdRadar, 0x750, 0xf): [
+      b'8821FF401600    ',
+      b'8821FF404100    ',
+    ],
+    (Ecu.fwdCamera, 0x750, 0x6d): [
+      b'8646FF401800    ',
+      b'8646FF404000    ',
+    ],
   },
   CAR.CHRH: {
     (Ecu.engine, 0x700, None): [b'\x0289663F431000\x00\x00\x00\x008966A4703000\x00\x00\x00\x00'],