diff --git a/templates/definition/charger/ocpp-abb-tac.yaml b/templates/definition/charger/ocpp-abb-tac.yaml
index 19ff636ae5..bf73c3674b 100644
--- a/templates/definition/charger/ocpp-abb-tac.yaml
+++ b/templates/definition/charger/ocpp-abb-tac.yaml
@@ -1,4 +1,5 @@
 template: ocpp-abb-tac
+covers: ["ocpp-abb"]
 products:
   - brand: ABB
     description:
@@ -11,3 +12,4 @@ params:
   - preset: ocpp
 render: |
   {{ include "ocpp" . }}
+  stacklevelzero: true
diff --git a/templates/definition/charger/ocpp-abb.yaml b/templates/definition/charger/ocpp-abb.yaml
deleted file mode 100644
index 10af39c4cd..0000000000
--- a/templates/definition/charger/ocpp-abb.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-template: ocpp-abb
-products:
-  - brand: ABB
-    description:
-      generic: TerraAC
-requirements:
-  evcc: ["sponsorship", "skiptest"]
-params:
-  - preset: ocpp
-render: |
-  {{ include "ocpp" . }}
-  stacklevelzero: true
diff --git a/templates/definition/charger/ocpp-fronius-wattpilot.yaml b/templates/definition/charger/ocpp-fronius-wattpilot.yaml
deleted file mode 100644
index 03bf03e2d2..0000000000
--- a/templates/definition/charger/ocpp-fronius-wattpilot.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-template: ocpp-fronius-wattpilot
-products:
-  - brand: Fronius
-    description:
-      generic: Wattpilot (OCPP)
-requirements:
-  evcc: ["sponsorship", "skiptest"]
-params:
-  - preset: ocpp
-render: |
-  {{ include "ocpp" . }}
diff --git a/templates/definition/charger/ocpp-pulsarplus-fw5.yaml b/templates/definition/charger/ocpp-wallbox-fw5.yaml
similarity index 96%
rename from templates/definition/charger/ocpp-pulsarplus-fw5.yaml
rename to templates/definition/charger/ocpp-wallbox-fw5.yaml
index 60c4615515..e1045d4dce 100644
--- a/templates/definition/charger/ocpp-pulsarplus-fw5.yaml
+++ b/templates/definition/charger/ocpp-wallbox-fw5.yaml
@@ -1,4 +1,5 @@
-template: pulsarplus-fw5
+template: wallbox-fw5
+covers: ["pulsarplus-fw5"]
 products:
   - brand: wallbox
     description: