diff --git a/templates/definition/tariff/epex-predictor.yaml b/templates/definition/tariff/epex-predictor.yaml
new file mode 100644
index 000000000..cb64061d1
--- /dev/null
+++ b/templates/definition/tariff/epex-predictor.yaml
@@ -0,0 +1,37 @@
+template: epex-predictor
+products:
+  - brand: EPEX Predictor
+    description:
+      generic: Predicted EPEX spot prices
+requirements:
+  description:
+    de: EPEX Spot Preisvorhersagen von epexpredictor.batzill.com
+    en: EPEX spot price predictions from epexpredictor.batzill.com
+  evcc: ["skiptest"]
+group: price
+countries: ["DE", "AT", "NL", "BE", "SE", "DK"]
+params:
+  - name: uri
+    default: https://epexpredictor.batzill.com
+    description:
+      en: API endpoint (for self-hosted instances)
+      de: API-Endpunkt (für selbst gehostete Instanzen)
+    advanced: true
+  - name: region
+    example: DE
+    type: choice
+    choice: ["DE", "AT", "NL", "BE", "SE_1", "SE_2", "SE_3", "SE_4", "DK_1", "DK_2"]
+    required: true
+  - preset: tariff-base
+render: |
+  type: custom
+  {{ include "tariff-base" . }}
+  forecast:
+    source: http
+    uri: {{ .uri }}/prices?region={{ .region }}&unit=EUR_PER_KWH&timezone=UTC
+    jq: |
+      [.prices[] | {
+        "start": .startsAt,
+        "end": (.startsAt | strptime("%Y-%m-%dT%H:%M:%SZ") | mktime + 900 | strftime("%Y-%m-%dT%H:%M:%SZ")),
+        "value": .total
+      }] | tostring
diff --git a/util/templates/defaults.yaml b/util/templates/defaults.yaml
index 9ac5061f2..18d105763 100644
--- a/util/templates/defaults.yaml
+++ b/util/templates/defaults.yaml
@@ -525,7 +525,7 @@ presets:
     - name: language
   tariff-base:
     - name: charges
-      type: int
+      type: float
       advanced: true
       description:
         en: Charge
@@ -534,7 +534,7 @@ presets:
         de: Zusätzlicher fester Aufschlag pro kWh (z.B. 0.05 für 5 Cent)
         en: Additional fixed charge per kWh (e.g. 0.05 for 5 cents)
     - name: tax
-      type: int
+      type: float
       advanced: true
       description:
         en: Tax