diff --git a/docs/CARS.md b/docs/CARS.md
index 2f7e586c5f..ea881f2333 100644
--- a/docs/CARS.md
+++ b/docs/CARS.md
@@ -123,7 +123,7 @@ How We Rate The Cars
|Volkswagen|Golf 2015-20|Driver Assistance|
|
||||
|Volkswagen|Golf Alltrack 2017-18|Driver Assistance||||||
|Volkswagen|Golf GTE 2016|Driver Assistance||||||
-|Volkswagen|Golf GTI 2018-20|Driver Assistance||||||
+|Volkswagen|Golf GTI 2018-21|Driver Assistance||||||
|Volkswagen|Golf R 2016-19|Driver Assistance||||||
|Volkswagen|Golf SportWagen 2015|Driver Assistance||||||
|Volkswagen|Golf SportsVan 2016|Driver Assistance||||||
diff --git a/selfdrive/car/volkswagen/values.py b/selfdrive/car/volkswagen/values.py
index 0f98886e1e..76b1a14c9a 100755
--- a/selfdrive/car/volkswagen/values.py
+++ b/selfdrive/car/volkswagen/values.py
@@ -120,7 +120,7 @@ CAR_INFO: Dict[str, Union[VWCarInfo, List[VWCarInfo]]] = {
VWCarInfo("Volkswagen Golf 2015-20"),
VWCarInfo("Volkswagen Golf Alltrack 2017-18"),
VWCarInfo("Volkswagen Golf GTE 2016"),
- VWCarInfo("Volkswagen Golf GTI 2018-20"),
+ VWCarInfo("Volkswagen Golf GTI 2018-21"),
VWCarInfo("Volkswagen Golf R 2016-19"),
VWCarInfo("Volkswagen Golf SportsVan 2016"),
VWCarInfo("Volkswagen Golf SportWagen 2015"),
@@ -260,6 +260,7 @@ FW_VERSIONS = {
b'\xf1\x875G0906259N \xf1\x890003',
b'\xf1\x875G0906259Q \xf1\x890002',
b'\xf1\x875G0906259Q \xf1\x892313',
+ b'\xf1\x875G0906259T \xf1\x890003',
b'\xf1\x878V0906259H \xf1\x890002',
b'\xf1\x878V0906259J \xf1\x890003',
b'\xf1\x878V0906259K \xf1\x890001',
@@ -299,6 +300,7 @@ FW_VERSIONS = {
b'\xf1\x870GC300020G \xf1\x892401',
b'\xf1\x870GC300020G \xf1\x892403',
b'\xf1\x870GC300020G \xf1\x892404',
+ b'\xf1\x870GC300020N \xf1\x892804',
b'\xf1\x870GC300043T \xf1\x899999',
],
(Ecu.srs, 0x715, None): [
@@ -375,6 +377,7 @@ FW_VERSIONS = {
b'\xf1\x875Q0907572J \xf1\x890654',
b'\xf1\x875Q0907572P \xf1\x890682',
b'\xf1\x875Q0907572R \xf1\x890771',
+ b'\xf1\x875Q0907572S \xf1\x890780',
],
},
CAR.JETTA_MK7: {