diff --git a/selfdrive/car/CARS_template.md b/selfdrive/car/CARS_template.md
index 846fce09f6..05df3fb02d 100644
--- a/selfdrive/car/CARS_template.md
+++ b/selfdrive/car/CARS_template.md
@@ -14,12 +14,14 @@ Cars are organized into three tiers:
 How We Rate The Cars
 ---
 
-{% for name, stars in star_descriptions.items() %}
+{% for descriptions in star_descriptions.values() %}
+{% for name, stars in descriptions.items() %}
 ### {{name}}
 {% for star, description in stars %}
 - {{star_icon.format(star.value)}} - {{description}}
 {% endfor %}
 
+{% endfor %}
 {% endfor %}
 **All supported cars can move between the tiers as support changes.**
 
diff --git a/selfdrive/car/docs_definitions.py b/selfdrive/car/docs_definitions.py
index 81501c96ee..f197ca50d6 100644
--- a/selfdrive/car/docs_definitions.py
+++ b/selfdrive/car/docs_definitions.py
@@ -153,26 +153,32 @@ class Harness(Enum):
 
 
 STAR_DESCRIPTIONS = {
-  "openpilot Adaptive Cruise Control (ACC)": [
-    (Star.FULL, "openpilot is able to control the gas and brakes."),
-    (Star.HALF, "openpilot is able to control the gas and brakes with some restrictions."),
-    (Star.EMPTY, "The gas and brakes are controlled by the car's stock Adaptive Cruise Control (ACC) system."),
-  ],
-  "Stop and Go": [
-    (Star.FULL, "Adaptive Cruise Control (ACC) operates down to 0 mph."),
-    (Star.EMPTY, "Adaptive Cruise Control (ACC) available only above certain speeds. See your car's manual for the minimum speed."),
-  ],
-  "Steer to 0": [
-    (Star.FULL, "openpilot can control the steering wheel down to 0 mph."),
-    (Star.EMPTY, "No steering control below certain speeds."),
-  ],
-  "Steering Torque": [
-    (Star.FULL, "Car has enough steering torque to take tighter turns."),
-    (Star.HALF, "Car has enough steering torque for comfortable highway driving."),
-    (Star.EMPTY, "Limited ability to make turns."),
-  ],
-  "Actively Maintained": [
-    (Star.FULL, "Mainline software support, harness hardware sold by comma, lots of users, primary development target."),
-    (Star.EMPTY, "Low user count, community maintained, harness hardware not sold by comma."),
-  ],
+  "longitudinal": {
+    "openpilot Adaptive Cruise Control (ACC)": [
+      (Star.FULL, "openpilot is able to control the gas and brakes."),
+      (Star.HALF, "openpilot is able to control the gas and brakes with some restrictions."),
+      (Star.EMPTY, "The gas and brakes are controlled by the car's stock Adaptive Cruise Control (ACC) system."),
+    ],
+    "Stop and Go": [
+      (Star.FULL, "Adaptive Cruise Control (ACC) operates down to 0 mph."),
+      (Star.EMPTY, "Adaptive Cruise Control (ACC) available only above certain speeds. See your car's manual for the minimum speed."),
+    ],
+  },
+  "steering": {
+    "Steer to 0": [
+      (Star.FULL, "openpilot can control the steering wheel down to 0 mph."),
+      (Star.EMPTY, "No steering control below certain speeds."),
+    ],
+    "Steering Torque": [
+      (Star.FULL, "Car has enough steering torque to take tighter turns."),
+      (Star.HALF, "Car has enough steering torque for comfortable highway driving."),
+      (Star.EMPTY, "Limited ability to make turns."),
+    ],
+  },
+  "support": {
+    "Actively Maintained": [
+      (Star.FULL, "Mainline software support, harness hardware sold by comma, lots of users, primary development target."),
+      (Star.EMPTY, "Low user count, community maintained, harness hardware not sold by comma."),
+    ],
+  },
 }