diff --git a/templates/definition/vehicle/citroen.yaml b/templates/definition/vehicle/citroen.yaml
index a62d64f0f..e04ed96ce 100644
--- a/templates/definition/vehicle/citroen.yaml
+++ b/templates/definition/vehicle/citroen.yaml
@@ -36,13 +36,9 @@ params:
   - preset: vehicle-identify
 render: |
   type: citroen
-  title: {{ .title }}
-  icon: {{ .icon }}
+  {{ include "vehicle-common" . }}
   user: {{ .user }}
   tokens:
     access: {{ .accessToken }}
     refresh: {{ .refreshToken }}
-  capacity: {{ .capacity }}
-  phases: {{ .phases }}
-  vin: {{ .vin }}
   {{ include "vehicle-identify" . }}
diff --git a/templates/definition/vehicle/ds.yaml b/templates/definition/vehicle/ds.yaml
index d2abb6397..65c4d5139 100644
--- a/templates/definition/vehicle/ds.yaml
+++ b/templates/definition/vehicle/ds.yaml
@@ -36,13 +36,9 @@ params:
   - preset: vehicle-identify
 render: |
   type: ds
-  title: {{ .title }}
-  icon: {{ .icon }}
+  {{ include "vehicle-common" . }}
   user: {{ .user }}
   tokens:
     access: {{ .accessToken }}
     refresh: {{ .refreshToken }}
-  capacity: {{ .capacity }}
-  phases: {{ .phases }}
-  vin: {{ .vin }}
   {{ include "vehicle-identify" . }}
diff --git a/templates/definition/vehicle/ford-connect.yaml b/templates/definition/vehicle/ford-connect.yaml
index 648ad90c5..5da48fd25 100644
--- a/templates/definition/vehicle/ford-connect.yaml
+++ b/templates/definition/vehicle/ford-connect.yaml
@@ -41,13 +41,11 @@ params:
   - preset: vehicle-identify
 render: |
   type: ford-connect
+  {{ include "vehicle-common" . }}
   credentials:
     id: {{ .clientid }}
     secret: {{ .clientsecret }}
   tokens:
     access: {{ .accessToken }}
     refresh: {{ .refreshToken }}
-  vin: {{ .vin }}
-  capacity: {{ .capacity }}
-  phases: {{ .phases }}
   {{ include "vehicle-identify" . }}
diff --git a/templates/definition/vehicle/mercedes.yaml b/templates/definition/vehicle/mercedes.yaml
index 1cde28284..ca30c3d8e 100644
--- a/templates/definition/vehicle/mercedes.yaml
+++ b/templates/definition/vehicle/mercedes.yaml
@@ -38,13 +38,9 @@ params:
   - preset: vehicle-identify
 render: |
   type: mercedes
-  title: {{ .title }}
-  icon: {{ .icon }}
+  {{ include "vehicle-common" . }}
   user: {{ .user }}
   tokens:
     access: {{ .accessToken }}
     refresh: {{ .refreshToken }}
-  capacity: {{ .capacity }}
-  phases: {{ .phases }}
-  vin: {{ .vin }}
   {{ include "vehicle-identify" . }}
diff --git a/templates/definition/vehicle/opel.yaml b/templates/definition/vehicle/opel.yaml
index 73db782c3..3e4d7a1ac 100644
--- a/templates/definition/vehicle/opel.yaml
+++ b/templates/definition/vehicle/opel.yaml
@@ -36,13 +36,9 @@ params:
   - preset: vehicle-identify
 render: |
   type: opel
-  title: {{ .title }}
-  icon: {{ .icon }}
+  {{ include "vehicle-common" . }}
   user: {{ .user }}
   tokens:
     access: {{ .accessToken }}
     refresh: {{ .refreshToken }}
-  capacity: {{ .capacity }}
-  phases: {{ .phases }}
-  vin: {{ .vin }}
   {{ include "vehicle-identify" . }}
diff --git a/templates/definition/vehicle/peugeot.yaml b/templates/definition/vehicle/peugeot.yaml
index ee15a0ef9..92b9a751d 100644
--- a/templates/definition/vehicle/peugeot.yaml
+++ b/templates/definition/vehicle/peugeot.yaml
@@ -36,13 +36,9 @@ params:
   - preset: vehicle-identify
 render: |
   type: peugeot
-  title: {{ .title }}
-  icon: {{ .icon }}
+  {{ include "vehicle-common" . }}
   user: {{ .user }}
   tokens:
     access: {{ .accessToken }}
     refresh: {{ .refreshToken }}
-  capacity: {{ .capacity }}
-  phases: {{ .phases }}
-  vin: {{ .vin }}
   {{ include "vehicle-identify" . }}
diff --git a/templates/definition/vehicle/tesla.yaml b/templates/definition/vehicle/tesla.yaml
index bde4e0a10..5c7c5d969 100644
--- a/templates/definition/vehicle/tesla.yaml
+++ b/templates/definition/vehicle/tesla.yaml
@@ -40,13 +40,9 @@ params:
   - preset: vehicle-identify
 render: |
   type: tesla
-  title: {{ .title }}
-  icon: {{ .icon }}
+  {{ include "vehicle-common" . }}
   tokens:
     access: {{ .accessToken }}
     refresh: {{ .refreshToken }}
-  capacity: {{ .capacity }}
-  phases: {{ .phases }}
-  vin: {{ .vin }}
   {{ include "vehicle-identify" . }}
   features: ["coarsecurrent"]
diff --git a/templates/definition/vehicle/tronity.yaml b/templates/definition/vehicle/tronity.yaml
index 0b1f79766..b017eb92b 100644
--- a/templates/definition/vehicle/tronity.yaml
+++ b/templates/definition/vehicle/tronity.yaml
@@ -33,16 +33,8 @@ params:
   - preset: vehicle-identify
 render: |
   type: tronity
-  {{- if .title }}
-  title: {{ .title }}
-  {{- end }}
-  {{- if .icon }}
-  icon: {{ .icon }}
-  {{- end }}
+  {{ include "vehicle-common" . }}
   credentials:
     id: {{ .clientid }}
     secret: {{ .clientsecret }}
-  vin: {{ .vin }}
-  capacity: {{ .capacity }}
-  phases: {{ .phases }}
   {{ include "vehicle-identify" . }}
diff --git a/util/templates/includes/vehicle-base.tpl b/util/templates/includes/vehicle-base.tpl
index 2f1ff9097..fd9a103e8 100644
--- a/util/templates/includes/vehicle-base.tpl
+++ b/util/templates/includes/vehicle-base.tpl
@@ -1,22 +1,5 @@
 {{ define "vehicle-base" }}
-{{- if .title }}
-title: {{ .title }}
-{{- end }}
-{{- if .icon }}
-icon: {{ .icon }}
-{{- end }}
 user: {{ .user }}
 password: {{ .password }}
-{{- if .capacity }}
-capacity: {{ .capacity }}
-{{- end }}
-{{- if .vin }}
-vin: {{ .vin }}
-{{- end }}
-{{- if .phases }}
-phases: {{ .phases }}
-{{- end }}
-{{- if .cache }}
-cache: {{ .cache }}
-{{- end }}
+{{ template "vehicle-common" . }}
 {{- end }}
diff --git a/util/templates/includes/vehicle-common.tpl b/util/templates/includes/vehicle-common.tpl
new file mode 100644
index 000000000..f9c5457fb
--- /dev/null
+++ b/util/templates/includes/vehicle-common.tpl
@@ -0,0 +1,20 @@
+{{ define "vehicle-common" }}
+{{- if .title }}
+title: {{ .title }}
+{{- end }}
+{{- if .icon }}
+icon: {{ .icon }}
+{{- end }}
+{{- if .capacity }}
+capacity: {{ .capacity }}
+{{- end }}
+{{- if .vin }}
+vin: {{ .vin }}
+{{- end }}
+{{- if .phases }}
+phases: {{ .phases }}
+{{- end }}
+{{- if .cache }}
+cache: {{ .cache }}
+{{- end }}
+{{- end }}