diff --git a/templates/definition/vehicle/audi.yaml b/templates/definition/vehicle/audi.yaml
index bf6445f0b..2c2147580 100644
--- a/templates/definition/vehicle/audi.yaml
+++ b/templates/definition/vehicle/audi.yaml
@@ -8,6 +8,7 @@ params:
     example: WAUZZZ...
   - preset: vehicle-features
 render: |
-  type: audi
+  type: drivesomethinggreater
+  brand: Audi
   {{ include "vehicle-base" . }}
   {{ include "vehicle-features" . }}
diff --git a/templates/definition/vehicle/vw.yaml b/templates/definition/vehicle/vw.yaml
index 8c583c023..5912295ab 100644
--- a/templates/definition/vehicle/vw.yaml
+++ b/templates/definition/vehicle/vw.yaml
@@ -13,10 +13,10 @@ params:
   - name: vin
     example: WVWZZZ...
   - name: timeout
-    default: 10s
+    deprecated: true
   - preset: vehicle-features
 render: |
-  type: vw
+  type: drivesomethinggreater
+  brand: Volkswagen
   {{ include "vehicle-base" . }}
   {{ include "vehicle-features" . }}
-  timeout: {{ .timeout }}