diff --git a/templates/definition/vehicle/flobz.yaml b/templates/definition/vehicle/flobz.yaml
new file mode 100644
index 000000000..f47a63610
--- /dev/null
+++ b/templates/definition/vehicle/flobz.yaml
@@ -0,0 +1,40 @@
+template: flobz
+products:
+  - brand: PSA
+    description:
+      generic: PSA Car Controller (flobz)
+params:
+  - name: host
+  - name: port
+  - name: vin
+    required: true
+    help:
+      de: Erforderlich
+      en: Required
+  - name: capacity
+render: |
+  type: custom
+  soc:
+    {{- include "source" . | indent 2 }}
+    jq: .energy[0].level
+  status:
+    source: combined
+    plugged:
+      {{- include "source" . | indent 4 }}
+      jq: .energy[0].charging.plugged
+    charging:
+      {{- include "source" . | indent 4 }}
+      jq: .energy[0].charging.status == "InProgress"
+  range:
+    {{- include "source" . | indent 2 }}
+    jq: .energy[0].autonomy
+  odometer:
+    {{- include "source" . | indent 2 }}
+    jq: .timed_odometer.mileage
+  climater:
+    {{- include "source" . | indent 2 }}
+    jq: .preconditionning.air_conditioning.status != "Disabled"
+  {{- define "source" }}
+  source: http
+  uri: http://{{ .host }}{{ if .port }}:{{ .port }}{{ end }}/get_vehicleinfo/{{ .vin }}?from_cache=1
+  {{- end }}
diff --git a/templates/docs/vehicle/flobz_0.yaml b/templates/docs/vehicle/flobz_0.yaml
new file mode 100644
index 000000000..8767a37f0
--- /dev/null
+++ b/templates/docs/vehicle/flobz_0.yaml
@@ -0,0 +1,11 @@
+product:
+  brand: PSA
+  description: PSA Car Controller (flobz)
+render:
+  - default: |
+      type: template
+      template: flobz
+      host: 192.0.2.2 # IP-Adresse oder Hostname
+      port: # Port (Optional)
+      vin: W... # Erforderlich
+      capacity: 50 # Akkukapazität in kWh (Optional)
diff --git a/templates/evcc.io/brands.json b/templates/evcc.io/brands.json
index 453a5dbb0..469311475 100644
--- a/templates/evcc.io/brands.json
+++ b/templates/evcc.io/brands.json
@@ -172,6 +172,7 @@
   "Opel",
   "Peugeot",
   "Porsche",
+  "PSA",
   "Renault",
   "Seat",
   "Silence",