diff --git a/templates/definition/charger/zaptec-go2.yaml b/templates/definition/charger/zaptec-go2.yaml
new file mode 100644
index 0000000000..d6985f2384
--- /dev/null
+++ b/templates/definition/charger/zaptec-go2.yaml
@@ -0,0 +1,31 @@
+template: zaptec-go2
+products:
+  - brand: Zaptec
+    description:
+      generic: Go 2
+capabilities: ["rfid", "1p3p"]
+requirements:
+  evcc: ["sponsorship"]
+  description:
+    de: |
+      Im Zaptec-Portal (Installationen -> Einstellungen -> Leistungsregelung) müssen für die Zaptec Go 2 folgende Einstellungen vorgenommen werden:
+        - Aktiviere "Ladegeräten erlauben, zum dreiphasigen Laden zurückkehren"
+        - Setze "Erlaubte Wechsel vor der Festlegung auf einphasiges Laden" auf das Maximum von 20
+        - Setze "Wechsel von drei- auf einphasiges Laden" auf 1 A
+    en: |
+      In the Zaptec portal (Installations -> Settings -> Power Management), the following settings must be configured for the Zaptec Go 2:
+        - Enable "Allow chargers to return to three-phase charging"
+        - Set "Allowed switches before locking to single-phase charging" to the maximum of 20
+        - Set "Switch from three-phase to single-phase charging" to 1 A
+params:
+  - name: id
+    help:
+      de: Wallbox ID
+      en: Charger ID
+  - name: user
+  - name: password
+render: |
+  type: zaptec
+  id: {{ .id }}
+  user: {{ .user }}
+  password: '{{ .password }}'
diff --git a/templates/definition/charger/zaptec-pro.yaml b/templates/definition/charger/zaptec-pro.yaml
new file mode 100644
index 0000000000..aacde73ddd
--- /dev/null
+++ b/templates/definition/charger/zaptec-pro.yaml
@@ -0,0 +1,20 @@
+template: zaptec-pro
+products:
+  - brand: Zaptec
+    description:
+      generic: Pro
+capabilities: ["rfid", "1p3p"]
+requirements:
+  evcc: ["sponsorship"]
+params:
+  - name: id
+    help:
+      de: Wallbox ID
+      en: Charger ID
+  - name: user
+  - name: password
+render: |
+  type: zaptec
+  id: {{ .id }}
+  user: {{ .user }}
+  password: '{{ .password }}'
diff --git a/templates/definition/charger/zaptec.yaml b/templates/definition/charger/zaptec.yaml
index 84d0628058..fd5d3ba160 100644
--- a/templates/definition/charger/zaptec.yaml
+++ b/templates/definition/charger/zaptec.yaml
@@ -3,12 +3,6 @@ products:
   - brand: Zaptec
     description:
       generic: Go
-  - brand: Zaptec
-    description:
-      generic: Go 2
-  - brand: Zaptec
-    description:
-      generic: Pro
 capabilities: ["rfid"]
 requirements:
   evcc: ["sponsorship"]