diff --git a/templates/release/de/meter/bge_tech_ds100_0.yaml b/templates/release/de/meter/bge_tech_ds100_0.yaml
new file mode 100644
index 000000000..14bc06d87
--- /dev/null
+++ b/templates/release/de/meter/bge_tech_ds100_0.yaml
@@ -0,0 +1,100 @@
+product:
+  brand: BGEtech
+  description: DS100
+render:
+  - usage: grid
+    default: |
+      type: template
+      template: bge_tech_ds100
+      usage: grid
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 1200 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: pv
+    default: |
+      type: template
+      template: bge_tech_ds100
+      usage: pv
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 1200 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: charge
+    default: |
+      type: template
+      template: bge_tech_ds100
+      usage: charge
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 1200 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: aux
+    default: |
+      type: template
+      template: bge_tech_ds100
+      usage: aux
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 1200 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
diff --git a/templates/release/de/meter/bge_tech_ws100_0.yaml b/templates/release/de/meter/bge_tech_ws100_0.yaml
new file mode 100644
index 000000000..13119038a
--- /dev/null
+++ b/templates/release/de/meter/bge_tech_ws100_0.yaml
@@ -0,0 +1,100 @@
+product:
+  brand: BGEtech
+  description: WS100
+render:
+  - usage: grid
+    default: |
+      type: template
+      template: bge_tech_ws100
+      usage: grid
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 1200 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: pv
+    default: |
+      type: template
+      template: bge_tech_ws100
+      usage: pv
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 1200 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: charge
+    default: |
+      type: template
+      template: bge_tech_ws100
+      usage: charge
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 1200 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: aux
+    default: |
+      type: template
+      template: bge_tech_ws100
+      usage: aux
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 1200 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
diff --git a/templates/release/de/meter/huawei-emma_0.yaml b/templates/release/de/meter/huawei-emma_0.yaml
new file mode 100644
index 000000000..bf5892cc4
--- /dev/null
+++ b/templates/release/de/meter/huawei-emma_0.yaml
@@ -0,0 +1,68 @@
+product:
+  brand: Huawei
+  description: EMMA
+render:
+  - usage: grid
+    default: |
+      type: template
+      template: huawei-emma
+      usage: grid
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+    advanced: |
+      type: template
+      template: huawei-emma
+      usage: grid
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: pv
+    default: |
+      type: template
+      template: huawei-emma
+      usage: pv
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+    advanced: |
+      type: template
+      template: huawei-emma
+      usage: pv
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: battery
+    default: |
+      type: template
+      template: huawei-emma
+      usage: battery
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+    advanced: |
+      type: template
+      template: huawei-emma
+      usage: battery
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+      capacity: 50 # Akkukapazität in kWh (optional)
diff --git a/templates/release/de/meter/sofarsolar-g3_0.yaml b/templates/release/de/meter/sofarsolar-g3_0.yaml
index 993621f4d..cd5c9a6ce 100644
--- a/templates/release/de/meter/sofarsolar-g3_0.yaml
+++ b/templates/release/de/meter/sofarsolar-g3_0.yaml
@@ -3,7 +3,7 @@ product:
   description: HYD 5…20K-3PH
 capabilities: ["battery-control"]
 description: |
-  Die Verbindung über einen LSE-3 Logger Stick mittels ModBus TCP ist möglich, jedoch kann Battery Control darüber nicht genutzt werden. Der LSW-3 WLAN Stick wird nicht unterstützt. Bei seriellem Anschluss via RS485 am COM Port ist eine wechselrichterseitige Terminierung notwendig.
+  Die Verbindung über einen LSE-3 Logger Stick mittels LAN Anschluss und ModBus TCP über Port 8899 ist die einfachste Anbindung. Der LSW-3 WLAN Stick wird nicht unterstützt. Bei seriellem Anschluss via RS485 am COM Port ist eine wechselrichterseitige Terminierung notwendig.
 render:
   - usage: grid
     default: |
diff --git a/templates/release/de/meter/sofarsolar-g3_1.yaml b/templates/release/de/meter/sofarsolar-g3_1.yaml
index 6b60b0391..37b3676ee 100644
--- a/templates/release/de/meter/sofarsolar-g3_1.yaml
+++ b/templates/release/de/meter/sofarsolar-g3_1.yaml
@@ -3,7 +3,7 @@ product:
   description: HYD 3…6K-EP
 capabilities: ["battery-control"]
 description: |
-  Die Verbindung über einen LSE-3 Logger Stick mittels ModBus TCP ist möglich, jedoch kann Battery Control darüber nicht genutzt werden. Der LSW-3 WLAN Stick wird nicht unterstützt. Bei seriellem Anschluss via RS485 am COM Port ist eine wechselrichterseitige Terminierung notwendig.
+  Die Verbindung über einen LSE-3 Logger Stick mittels LAN Anschluss und ModBus TCP über Port 8899 ist die einfachste Anbindung. Der LSW-3 WLAN Stick wird nicht unterstützt. Bei seriellem Anschluss via RS485 am COM Port ist eine wechselrichterseitige Terminierung notwendig.
 render:
   - usage: grid
     default: |
diff --git a/templates/release/de/meter/sofarsolar-g3_2.yaml b/templates/release/de/meter/sofarsolar-g3_2.yaml
index 3662d381c..ba7552550 100644
--- a/templates/release/de/meter/sofarsolar-g3_2.yaml
+++ b/templates/release/de/meter/sofarsolar-g3_2.yaml
@@ -3,7 +3,7 @@ product:
   description: SOFAR 80…136KTL
 capabilities: ["battery-control"]
 description: |
-  Die Verbindung über einen LSE-3 Logger Stick mittels ModBus TCP ist möglich, jedoch kann Battery Control darüber nicht genutzt werden. Der LSW-3 WLAN Stick wird nicht unterstützt. Bei seriellem Anschluss via RS485 am COM Port ist eine wechselrichterseitige Terminierung notwendig.
+  Die Verbindung über einen LSE-3 Logger Stick mittels LAN Anschluss und ModBus TCP über Port 8899 ist die einfachste Anbindung. Der LSW-3 WLAN Stick wird nicht unterstützt. Bei seriellem Anschluss via RS485 am COM Port ist eine wechselrichterseitige Terminierung notwendig.
 render:
   - usage: grid
     default: |
diff --git a/templates/release/de/meter/sofarsolar-g3_3.yaml b/templates/release/de/meter/sofarsolar-g3_3.yaml
index 795cc5a8d..a0b2c49e7 100644
--- a/templates/release/de/meter/sofarsolar-g3_3.yaml
+++ b/templates/release/de/meter/sofarsolar-g3_3.yaml
@@ -3,7 +3,7 @@ product:
   description: SOFAR 5…24KTL-G3
 capabilities: ["battery-control"]
 description: |
-  Die Verbindung über einen LSE-3 Logger Stick mittels ModBus TCP ist möglich, jedoch kann Battery Control darüber nicht genutzt werden. Der LSW-3 WLAN Stick wird nicht unterstützt. Bei seriellem Anschluss via RS485 am COM Port ist eine wechselrichterseitige Terminierung notwendig.
+  Die Verbindung über einen LSE-3 Logger Stick mittels LAN Anschluss und ModBus TCP über Port 8899 ist die einfachste Anbindung. Der LSW-3 WLAN Stick wird nicht unterstützt. Bei seriellem Anschluss via RS485 am COM Port ist eine wechselrichterseitige Terminierung notwendig.
 render:
   - usage: grid
     default: |
diff --git a/templates/release/de/tariff/allinpower_0.yaml b/templates/release/de/tariff/allinpower_0.yaml
index 556e58564..9bf244671 100644
--- a/templates/release/de/tariff/allinpower_0.yaml
+++ b/templates/release/de/tariff/allinpower_0.yaml
@@ -7,6 +7,9 @@ render:
   - default: |
       type: template
       template: allinpower
+    advanced: |
+      type: template
+      template: allinpower
       charges: # Zusätzlicher fester Aufschlag pro kWh (z.B. 0.05 für 5 Cent) (optional)
       tax: # Zusätzlicher prozentualer Aufschlag (z.B. 0.2 für 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individuelle Formel zur Berechnung des Preises (optional)
diff --git a/templates/release/de/tariff/amber_0.yaml b/templates/release/de/tariff/amber_0.yaml
index 867303bb1..5461a407b 100644
--- a/templates/release/de/tariff/amber_0.yaml
+++ b/templates/release/de/tariff/amber_0.yaml
@@ -10,6 +10,12 @@ render:
       token: # optional
       siteid: # optional
       channel: # optional
+    advanced: |
+      type: template
+      template: amber
+      token: # optional
+      siteid: # optional
+      channel: # optional
       charges: # Zusätzlicher fester Aufschlag pro kWh (z.B. 0.05 für 5 Cent) (optional)
       tax: # Zusätzlicher prozentualer Aufschlag (z.B. 0.2 für 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individuelle Formel zur Berechnung des Preises (optional)
diff --git a/templates/release/de/tariff/awattar_0.yaml b/templates/release/de/tariff/awattar_0.yaml
index be9315c2e..6ec3aa249 100644
--- a/templates/release/de/tariff/awattar_0.yaml
+++ b/templates/release/de/tariff/awattar_0.yaml
@@ -8,6 +8,10 @@ render:
       type: template
       template: awattar
       region: AT # optional
+    advanced: |
+      type: template
+      template: awattar
+      region: AT # optional
       charges: # Zusätzlicher fester Aufschlag pro kWh (z.B. 0.05 für 5 Cent) (optional)
       tax: # Zusätzlicher prozentualer Aufschlag (z.B. 0.2 für 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individuelle Formel zur Berechnung des Preises (optional)
diff --git a/templates/release/de/tariff/elering_0.yaml b/templates/release/de/tariff/elering_0.yaml
index 33715e2a9..407eb496b 100644
--- a/templates/release/de/tariff/elering_0.yaml
+++ b/templates/release/de/tariff/elering_0.yaml
@@ -9,6 +9,10 @@ render:
       type: template
       template: elering
       region: ee # optional
+    advanced: |
+      type: template
+      template: elering
+      region: ee # optional
       charges: # Zusätzlicher fester Aufschlag pro kWh (z.B. 0.05 für 5 Cent) (optional)
       tax: # Zusätzlicher prozentualer Aufschlag (z.B. 0.2 für 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individuelle Formel zur Berechnung des Preises (optional)
diff --git a/templates/release/de/tariff/energinet_0.yaml b/templates/release/de/tariff/energinet_0.yaml
index 7083cfe07..32b51625e 100644
--- a/templates/release/de/tariff/energinet_0.yaml
+++ b/templates/release/de/tariff/energinet_0.yaml
@@ -9,6 +9,10 @@ render:
       type: template
       template: energinet
       region: dk1 # optional
+    advanced: |
+      type: template
+      template: energinet
+      region: dk1 # optional
       charges: # Zusätzlicher fester Aufschlag pro kWh (z.B. 0.05 für 5 Cent) (optional)
       tax: # Zusätzlicher prozentualer Aufschlag (z.B. 0.2 für 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individuelle Formel zur Berechnung des Preises (optional)
diff --git a/templates/release/de/tariff/energy-charts-api_0.yaml b/templates/release/de/tariff/energy-charts-api_0.yaml
index dbf979103..51943c928 100644
--- a/templates/release/de/tariff/energy-charts-api_0.yaml
+++ b/templates/release/de/tariff/energy-charts-api_0.yaml
@@ -9,6 +9,10 @@ render:
       type: template
       template: energy-charts-api
       bzn: DE-LU # Gebotszonen - https://api.energy-charts.info/#/prices/day_ahead_price_price_get
+    advanced: |
+      type: template
+      template: energy-charts-api
+      bzn: DE-LU # Gebotszonen - https://api.energy-charts.info/#/prices/day_ahead_price_price_get
       charges: # Zusätzlicher fester Aufschlag pro kWh (z.B. 0.05 für 5 Cent) (optional)
       tax: # Zusätzlicher prozentualer Aufschlag (z.B. 0.2 für 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individuelle Formel zur Berechnung des Preises (optional)
diff --git a/templates/release/de/tariff/entsoe_0.yaml b/templates/release/de/tariff/entsoe_0.yaml
index c73eda104..70b87ff49 100644
--- a/templates/release/de/tariff/entsoe_0.yaml
+++ b/templates/release/de/tariff/entsoe_0.yaml
@@ -11,6 +11,11 @@ render:
       template: entsoe
       securitytoken: # Registrierung und anschließende Helpdesk-Anfrage erforderlich. Details zum Ablauf gibts hier https://transparency.entsoe.eu/content/static_content/Static%20content/web%20api/Guide.html#_authentication_and_authorisation (optional)
       domain: BZN|DE-LU # siehe https://transparency.entsoe.eu/content/static_content/Static%20content/web%20api/Guide.html#_areas (optional)
+    advanced: |
+      type: template
+      template: entsoe
+      securitytoken: # Registrierung und anschließende Helpdesk-Anfrage erforderlich. Details zum Ablauf gibts hier https://transparency.entsoe.eu/content/static_content/Static%20content/web%20api/Guide.html#_authentication_and_authorisation (optional)
+      domain: BZN|DE-LU # siehe https://transparency.entsoe.eu/content/static_content/Static%20content/web%20api/Guide.html#_areas (optional)
       charges: # Zusätzlicher fester Aufschlag pro kWh (z.B. 0.05 für 5 Cent) (optional)
       tax: # Zusätzlicher prozentualer Aufschlag (z.B. 0.2 für 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individuelle Formel zur Berechnung des Preises (optional)
diff --git a/templates/release/de/tariff/groupe-e_0.yaml b/templates/release/de/tariff/groupe-e_0.yaml
index 005104129..db8c3f0ef 100644
--- a/templates/release/de/tariff/groupe-e_0.yaml
+++ b/templates/release/de/tariff/groupe-e_0.yaml
@@ -9,6 +9,9 @@ render:
   - default: |
       type: template
       template: groupe-e
+    advanced: |
+      type: template
+      template: groupe-e
       charges: # Zusätzlicher fester Aufschlag pro kWh (z.B. 0.05 für 5 Cent) (optional)
       tax: # Zusätzlicher prozentualer Aufschlag (z.B. 0.2 für 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individuelle Formel zur Berechnung des Preises (optional)
diff --git a/templates/release/de/tariff/ostrom_0.yaml b/templates/release/de/tariff/ostrom_0.yaml
new file mode 100644
index 000000000..75b5a382a
--- /dev/null
+++ b/templates/release/de/tariff/ostrom_0.yaml
@@ -0,0 +1,13 @@
+product:
+  brand: Ostrom
+  group: Dynamischer Strompreis
+requirements: ["skiptest"]
+description: |
+  Erzeuge einen 'Production Client' in dem Tibber-Entwicklerportal: https://developer.ostrom-api.io/
+render:
+  - default: |
+      type: template
+      template: ostrom
+      clientid: 476c477d8a039529478ebd690d35ddd80e3308ffc49b59c65b142321aee963a4
+      clientsecret: 476c477d8a039529478ebd690d35ddd80e3308ffc49b59c65b142321aee963a4476c477d8a039529478ebd690d35ddd80e3308ffc49b59c65b142321aee963a4a
+      contract: 100523456 # Nur erforderlich, wenn mehrere Verträge unter einem Benutzer existieren (optional)
diff --git a/templates/release/de/tariff/pun_0.yaml b/templates/release/de/tariff/pun_0.yaml
index 6ce6ce735..47a0c75d5 100644
--- a/templates/release/de/tariff/pun_0.yaml
+++ b/templates/release/de/tariff/pun_0.yaml
@@ -8,6 +8,9 @@ render:
   - default: |
       type: template
       template: pun
+    advanced: |
+      type: template
+      template: pun
       charges: # Zusätzlicher fester Aufschlag pro kWh (z.B. 0.05 für 5 Cent) (optional)
       tax: # Zusätzlicher prozentualer Aufschlag (z.B. 0.2 für 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individuelle Formel zur Berechnung des Preises (optional)
diff --git a/templates/release/de/tariff/smartenergy_0.yaml b/templates/release/de/tariff/smartenergy_0.yaml
index 6266d7a83..3c410d2a0 100644
--- a/templates/release/de/tariff/smartenergy_0.yaml
+++ b/templates/release/de/tariff/smartenergy_0.yaml
@@ -8,6 +8,9 @@ render:
   - default: |
       type: template
       template: smartenergy
+    advanced: |
+      type: template
+      template: smartenergy
       charges: # Zusätzlicher fester Aufschlag pro kWh (z.B. 0.05 für 5 Cent) (optional)
       tax: # Zusätzlicher prozentualer Aufschlag (z.B. 0.2 für 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individuelle Formel zur Berechnung des Preises (optional)
diff --git a/templates/release/de/tariff/spottyenergy_0.yaml b/templates/release/de/tariff/spottyenergy_0.yaml
index 11d157fd6..38648fa65 100644
--- a/templates/release/de/tariff/spottyenergy_0.yaml
+++ b/templates/release/de/tariff/spottyenergy_0.yaml
@@ -9,6 +9,11 @@ render:
       template: spottyenergy
       contractid: ffffffff-4444-6666-2222-aaaaaabbbbbb # Die Vertragsnummer bekommst du im Kundenportal https://i.spottyenergie.at/
       pricetype: CONSUMPTION # Preistyp, entweder Börsenpreis, Verbrauchspreis oder Einspeisevergütung (falls vereinbart), siehe https://www.spottyenergie.at/blog/energie-smart-produzieren
+    advanced: |
+      type: template
+      template: spottyenergy
+      contractid: ffffffff-4444-6666-2222-aaaaaabbbbbb # Die Vertragsnummer bekommst du im Kundenportal https://i.spottyenergie.at/
+      pricetype: CONSUMPTION # Preistyp, entweder Börsenpreis, Verbrauchspreis oder Einspeisevergütung (falls vereinbart), siehe https://www.spottyenergie.at/blog/energie-smart-produzieren
       charges: # Zusätzlicher fester Aufschlag pro kWh (z.B. 0.05 für 5 Cent) (optional)
       tax: # Zusätzlicher prozentualer Aufschlag (z.B. 0.2 für 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individuelle Formel zur Berechnung des Preises (optional)
diff --git a/templates/release/de/tariff/tibber_0.yaml b/templates/release/de/tariff/tibber_0.yaml
index 9d5e5d603..00c02a004 100644
--- a/templates/release/de/tariff/tibber_0.yaml
+++ b/templates/release/de/tariff/tibber_0.yaml
@@ -10,6 +10,11 @@ render:
       template: tibber
       token: 476c477d8a039529478ebd690d35ddd80e3308ffc49b59c65b142321aee963a4
       homeid: cc83e83e-8cbf-4595-9bf7-c3cf192f7d9c # Nur erforderlich, wenn du mehrere Häuser in deinem Tibber-Konto hast. (optional)
+    advanced: |
+      type: template
+      template: tibber
+      token: 476c477d8a039529478ebd690d35ddd80e3308ffc49b59c65b142321aee963a4
+      homeid: cc83e83e-8cbf-4595-9bf7-c3cf192f7d9c # Nur erforderlich, wenn du mehrere Häuser in deinem Tibber-Konto hast. (optional)
       charges: # Zusätzlicher fester Aufschlag pro kWh (z.B. 0.05 für 5 Cent) (optional)
       tax: # Zusätzlicher prozentualer Aufschlag (z.B. 0.2 für 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individuelle Formel zur Berechnung des Preises (optional)
diff --git a/templates/release/en/meter/bge_tech_ds100_0.yaml b/templates/release/en/meter/bge_tech_ds100_0.yaml
new file mode 100644
index 000000000..14bc06d87
--- /dev/null
+++ b/templates/release/en/meter/bge_tech_ds100_0.yaml
@@ -0,0 +1,100 @@
+product:
+  brand: BGEtech
+  description: DS100
+render:
+  - usage: grid
+    default: |
+      type: template
+      template: bge_tech_ds100
+      usage: grid
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 1200 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: pv
+    default: |
+      type: template
+      template: bge_tech_ds100
+      usage: pv
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 1200 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: charge
+    default: |
+      type: template
+      template: bge_tech_ds100
+      usage: charge
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 1200 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: aux
+    default: |
+      type: template
+      template: bge_tech_ds100
+      usage: aux
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 1200 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
diff --git a/templates/release/en/meter/bge_tech_ws100_0.yaml b/templates/release/en/meter/bge_tech_ws100_0.yaml
new file mode 100644
index 000000000..13119038a
--- /dev/null
+++ b/templates/release/en/meter/bge_tech_ws100_0.yaml
@@ -0,0 +1,100 @@
+product:
+  brand: BGEtech
+  description: WS100
+render:
+  - usage: grid
+    default: |
+      type: template
+      template: bge_tech_ws100
+      usage: grid
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 1200 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: pv
+    default: |
+      type: template
+      template: bge_tech_ws100
+      usage: pv
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 1200 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: charge
+    default: |
+      type: template
+      template: bge_tech_ws100
+      usage: charge
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 1200 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: aux
+    default: |
+      type: template
+      template: bge_tech_ws100
+      usage: aux
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 1200 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
diff --git a/templates/release/en/meter/huawei-emma_0.yaml b/templates/release/en/meter/huawei-emma_0.yaml
new file mode 100644
index 000000000..461bec1ee
--- /dev/null
+++ b/templates/release/en/meter/huawei-emma_0.yaml
@@ -0,0 +1,68 @@
+product:
+  brand: Huawei
+  description: EMMA
+render:
+  - usage: grid
+    default: |
+      type: template
+      template: huawei-emma
+      usage: grid
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+    advanced: |
+      type: template
+      template: huawei-emma
+      usage: grid
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: pv
+    default: |
+      type: template
+      template: huawei-emma
+      usage: pv
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+    advanced: |
+      type: template
+      template: huawei-emma
+      usage: pv
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: battery
+    default: |
+      type: template
+      template: huawei-emma
+      usage: battery
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+    advanced: |
+      type: template
+      template: huawei-emma
+      usage: battery
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+      capacity: 50 # Battery capacity in kWh (optional)
diff --git a/templates/release/en/meter/sofarsolar-g3_0.yaml b/templates/release/en/meter/sofarsolar-g3_0.yaml
index de1483210..9dbf33820 100644
--- a/templates/release/en/meter/sofarsolar-g3_0.yaml
+++ b/templates/release/en/meter/sofarsolar-g3_0.yaml
@@ -3,7 +3,7 @@ product:
   description: HYD 5…20K-3PH
 capabilities: ["battery-control"]
 description: |
-  Connection via LSE-3 logger stick using ModBus TCP is possible, however does not allow Battery Control. The LSW-3 WiFi stick is not supported. For RS485 serial connection using the inverter's COM port the inverter's side must be properly terminated.
+  LSE-3 logger stick using a LAN connection and ModBus TCP via the port 8899 is the easiest connection. The LSW-3 WiFi stick is not supported. For a RS485 serial connection using the inverter's COM port the inverter's side must be properly terminated.
 render:
   - usage: grid
     default: |
diff --git a/templates/release/en/meter/sofarsolar-g3_1.yaml b/templates/release/en/meter/sofarsolar-g3_1.yaml
index 733449296..465c911f0 100644
--- a/templates/release/en/meter/sofarsolar-g3_1.yaml
+++ b/templates/release/en/meter/sofarsolar-g3_1.yaml
@@ -3,7 +3,7 @@ product:
   description: HYD 3…6K-EP
 capabilities: ["battery-control"]
 description: |
-  Connection via LSE-3 logger stick using ModBus TCP is possible, however does not allow Battery Control. The LSW-3 WiFi stick is not supported. For RS485 serial connection using the inverter's COM port the inverter's side must be properly terminated.
+  LSE-3 logger stick using a LAN connection and ModBus TCP via the port 8899 is the easiest connection. The LSW-3 WiFi stick is not supported. For a RS485 serial connection using the inverter's COM port the inverter's side must be properly terminated.
 render:
   - usage: grid
     default: |
diff --git a/templates/release/en/meter/sofarsolar-g3_2.yaml b/templates/release/en/meter/sofarsolar-g3_2.yaml
index 52b372b32..b774ad7fe 100644
--- a/templates/release/en/meter/sofarsolar-g3_2.yaml
+++ b/templates/release/en/meter/sofarsolar-g3_2.yaml
@@ -3,7 +3,7 @@ product:
   description: SOFAR 80…136KTL
 capabilities: ["battery-control"]
 description: |
-  Connection via LSE-3 logger stick using ModBus TCP is possible, however does not allow Battery Control. The LSW-3 WiFi stick is not supported. For RS485 serial connection using the inverter's COM port the inverter's side must be properly terminated.
+  LSE-3 logger stick using a LAN connection and ModBus TCP via the port 8899 is the easiest connection. The LSW-3 WiFi stick is not supported. For a RS485 serial connection using the inverter's COM port the inverter's side must be properly terminated.
 render:
   - usage: grid
     default: |
diff --git a/templates/release/en/meter/sofarsolar-g3_3.yaml b/templates/release/en/meter/sofarsolar-g3_3.yaml
index 4b4a3f63c..2fd045aac 100644
--- a/templates/release/en/meter/sofarsolar-g3_3.yaml
+++ b/templates/release/en/meter/sofarsolar-g3_3.yaml
@@ -3,7 +3,7 @@ product:
   description: SOFAR 5…24KTL-G3
 capabilities: ["battery-control"]
 description: |
-  Connection via LSE-3 logger stick using ModBus TCP is possible, however does not allow Battery Control. The LSW-3 WiFi stick is not supported. For RS485 serial connection using the inverter's COM port the inverter's side must be properly terminated.
+  LSE-3 logger stick using a LAN connection and ModBus TCP via the port 8899 is the easiest connection. The LSW-3 WiFi stick is not supported. For a RS485 serial connection using the inverter's COM port the inverter's side must be properly terminated.
 render:
   - usage: grid
     default: |
diff --git a/templates/release/en/tariff/allinpower_0.yaml b/templates/release/en/tariff/allinpower_0.yaml
index 522a9c95a..2be0e9858 100644
--- a/templates/release/en/tariff/allinpower_0.yaml
+++ b/templates/release/en/tariff/allinpower_0.yaml
@@ -7,6 +7,9 @@ render:
   - default: |
       type: template
       template: allinpower
+    advanced: |
+      type: template
+      template: allinpower
       charges: # Additional fixed charge per kWh (e.g. 0.05 for 5 cents) (optional)
       tax: # Additional percentage charge (e.g. 0.2 for 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individual formula for calculating the price (optional)
diff --git a/templates/release/en/tariff/amber_0.yaml b/templates/release/en/tariff/amber_0.yaml
index adf87ec2e..e31af768f 100644
--- a/templates/release/en/tariff/amber_0.yaml
+++ b/templates/release/en/tariff/amber_0.yaml
@@ -10,6 +10,12 @@ render:
       token: # optional
       siteid: # optional
       channel: # optional
+    advanced: |
+      type: template
+      template: amber
+      token: # optional
+      siteid: # optional
+      channel: # optional
       charges: # Additional fixed charge per kWh (e.g. 0.05 for 5 cents) (optional)
       tax: # Additional percentage charge (e.g. 0.2 for 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individual formula for calculating the price (optional)
diff --git a/templates/release/en/tariff/awattar_0.yaml b/templates/release/en/tariff/awattar_0.yaml
index 5331cf9e1..642c65384 100644
--- a/templates/release/en/tariff/awattar_0.yaml
+++ b/templates/release/en/tariff/awattar_0.yaml
@@ -8,6 +8,10 @@ render:
       type: template
       template: awattar
       region: AT # optional
+    advanced: |
+      type: template
+      template: awattar
+      region: AT # optional
       charges: # Additional fixed charge per kWh (e.g. 0.05 for 5 cents) (optional)
       tax: # Additional percentage charge (e.g. 0.2 for 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individual formula for calculating the price (optional)
diff --git a/templates/release/en/tariff/elering_0.yaml b/templates/release/en/tariff/elering_0.yaml
index f5a1c5a64..8ce8162ae 100644
--- a/templates/release/en/tariff/elering_0.yaml
+++ b/templates/release/en/tariff/elering_0.yaml
@@ -9,6 +9,10 @@ render:
       type: template
       template: elering
       region: ee # optional
+    advanced: |
+      type: template
+      template: elering
+      region: ee # optional
       charges: # Additional fixed charge per kWh (e.g. 0.05 for 5 cents) (optional)
       tax: # Additional percentage charge (e.g. 0.2 for 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individual formula for calculating the price (optional)
diff --git a/templates/release/en/tariff/energinet_0.yaml b/templates/release/en/tariff/energinet_0.yaml
index 6aacb55c1..cb660a684 100644
--- a/templates/release/en/tariff/energinet_0.yaml
+++ b/templates/release/en/tariff/energinet_0.yaml
@@ -9,6 +9,10 @@ render:
       type: template
       template: energinet
       region: dk1 # optional
+    advanced: |
+      type: template
+      template: energinet
+      region: dk1 # optional
       charges: # Additional fixed charge per kWh (e.g. 0.05 for 5 cents) (optional)
       tax: # Additional percentage charge (e.g. 0.2 for 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individual formula for calculating the price (optional)
diff --git a/templates/release/en/tariff/energy-charts-api_0.yaml b/templates/release/en/tariff/energy-charts-api_0.yaml
index 64353f37c..93518eb6a 100644
--- a/templates/release/en/tariff/energy-charts-api_0.yaml
+++ b/templates/release/en/tariff/energy-charts-api_0.yaml
@@ -9,6 +9,10 @@ render:
       type: template
       template: energy-charts-api
       bzn: DE-LU # Bidding zones - https://api.energy-charts.info/#/prices/day_ahead_price_price_get
+    advanced: |
+      type: template
+      template: energy-charts-api
+      bzn: DE-LU # Bidding zones - https://api.energy-charts.info/#/prices/day_ahead_price_price_get
       charges: # Additional fixed charge per kWh (e.g. 0.05 for 5 cents) (optional)
       tax: # Additional percentage charge (e.g. 0.2 for 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individual formula for calculating the price (optional)
diff --git a/templates/release/en/tariff/entsoe_0.yaml b/templates/release/en/tariff/entsoe_0.yaml
index a8dbd2931..e9226c712 100644
--- a/templates/release/en/tariff/entsoe_0.yaml
+++ b/templates/release/en/tariff/entsoe_0.yaml
@@ -11,6 +11,11 @@ render:
       template: entsoe
       securitytoken: # Registration and subsequent helpdesk request required. Details on the process can be found here https://transparency.entsoe.eu/content/static_content/Static%20content/web%20api/Guide.html#_authentication_and_authorisation (optional)
       domain: BZN|DE-LU # see https://transparency.entsoe.eu/content/static_content/Static%20content/web%20api/Guide.html#_areas (optional)
+    advanced: |
+      type: template
+      template: entsoe
+      securitytoken: # Registration and subsequent helpdesk request required. Details on the process can be found here https://transparency.entsoe.eu/content/static_content/Static%20content/web%20api/Guide.html#_authentication_and_authorisation (optional)
+      domain: BZN|DE-LU # see https://transparency.entsoe.eu/content/static_content/Static%20content/web%20api/Guide.html#_areas (optional)
       charges: # Additional fixed charge per kWh (e.g. 0.05 for 5 cents) (optional)
       tax: # Additional percentage charge (e.g. 0.2 for 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individual formula for calculating the price (optional)
diff --git a/templates/release/en/tariff/groupe-e_0.yaml b/templates/release/en/tariff/groupe-e_0.yaml
index 8b8215ab4..4e8b493ab 100644
--- a/templates/release/en/tariff/groupe-e_0.yaml
+++ b/templates/release/en/tariff/groupe-e_0.yaml
@@ -9,6 +9,9 @@ render:
   - default: |
       type: template
       template: groupe-e
+    advanced: |
+      type: template
+      template: groupe-e
       charges: # Additional fixed charge per kWh (e.g. 0.05 for 5 cents) (optional)
       tax: # Additional percentage charge (e.g. 0.2 for 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individual formula for calculating the price (optional)
diff --git a/templates/release/en/tariff/ostrom_0.yaml b/templates/release/en/tariff/ostrom_0.yaml
new file mode 100644
index 000000000..3bdd3641f
--- /dev/null
+++ b/templates/release/en/tariff/ostrom_0.yaml
@@ -0,0 +1,13 @@
+product:
+  brand: Ostrom
+  group: Dynamic electricity price
+requirements: ["skiptest"]
+description: |
+  Create a 'Production Client' in the Ostrom developer portal: https://developer.ostrom-api.io/
+render:
+  - default: |
+      type: template
+      template: ostrom
+      clientid: 476c477d8a039529478ebd690d35ddd80e3308ffc49b59c65b142321aee963a4
+      clientsecret: 476c477d8a039529478ebd690d35ddd80e3308ffc49b59c65b142321aee963a4476c477d8a039529478ebd690d35ddd80e3308ffc49b59c65b142321aee963a4a
+      contract: 100523456 # Only required if multiple contracts belong to the same user (optional)
diff --git a/templates/release/en/tariff/pun_0.yaml b/templates/release/en/tariff/pun_0.yaml
index 6ee2a9e0f..759537157 100644
--- a/templates/release/en/tariff/pun_0.yaml
+++ b/templates/release/en/tariff/pun_0.yaml
@@ -8,6 +8,9 @@ render:
   - default: |
       type: template
       template: pun
+    advanced: |
+      type: template
+      template: pun
       charges: # Additional fixed charge per kWh (e.g. 0.05 for 5 cents) (optional)
       tax: # Additional percentage charge (e.g. 0.2 for 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individual formula for calculating the price (optional)
diff --git a/templates/release/en/tariff/smartenergy_0.yaml b/templates/release/en/tariff/smartenergy_0.yaml
index a2da92a37..558122ffa 100644
--- a/templates/release/en/tariff/smartenergy_0.yaml
+++ b/templates/release/en/tariff/smartenergy_0.yaml
@@ -8,6 +8,9 @@ render:
   - default: |
       type: template
       template: smartenergy
+    advanced: |
+      type: template
+      template: smartenergy
       charges: # Additional fixed charge per kWh (e.g. 0.05 for 5 cents) (optional)
       tax: # Additional percentage charge (e.g. 0.2 for 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individual formula for calculating the price (optional)
diff --git a/templates/release/en/tariff/spottyenergy_0.yaml b/templates/release/en/tariff/spottyenergy_0.yaml
index d8aa9d0e2..be065c40d 100644
--- a/templates/release/en/tariff/spottyenergy_0.yaml
+++ b/templates/release/en/tariff/spottyenergy_0.yaml
@@ -9,6 +9,11 @@ render:
       template: spottyenergy
       contractid: ffffffff-4444-6666-2222-aaaaaabbbbbb # You can get your contract id from the customer portal https://i.spottyenergie.at/
       pricetype: CONSUMPTION # Price type, either spotmarket price, consumption price or generation compensation (if contractually agreed), more info at https://www.spottyenergie.at/blog/energie-smart-produzieren
+    advanced: |
+      type: template
+      template: spottyenergy
+      contractid: ffffffff-4444-6666-2222-aaaaaabbbbbb # You can get your contract id from the customer portal https://i.spottyenergie.at/
+      pricetype: CONSUMPTION # Price type, either spotmarket price, consumption price or generation compensation (if contractually agreed), more info at https://www.spottyenergie.at/blog/energie-smart-produzieren
       charges: # Additional fixed charge per kWh (e.g. 0.05 for 5 cents) (optional)
       tax: # Additional percentage charge (e.g. 0.2 for 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individual formula for calculating the price (optional)
diff --git a/templates/release/en/tariff/tibber_0.yaml b/templates/release/en/tariff/tibber_0.yaml
index e80e18132..84d59f8ec 100644
--- a/templates/release/en/tariff/tibber_0.yaml
+++ b/templates/release/en/tariff/tibber_0.yaml
@@ -10,6 +10,11 @@ render:
       template: tibber
       token: 476c477d8a039529478ebd690d35ddd80e3308ffc49b59c65b142321aee963a4
       homeid: cc83e83e-8cbf-4595-9bf7-c3cf192f7d9c # Only required if you have multiple homes in your Tibber account. (optional)
+    advanced: |
+      type: template
+      template: tibber
+      token: 476c477d8a039529478ebd690d35ddd80e3308ffc49b59c65b142321aee963a4
+      homeid: cc83e83e-8cbf-4595-9bf7-c3cf192f7d9c # Only required if you have multiple homes in your Tibber account. (optional)
       charges: # Additional fixed charge per kWh (e.g. 0.05 for 5 cents) (optional)
       tax: # Additional percentage charge (e.g. 0.2 for 20%) (optional)
       formula: math.Max((price + charges) * (1 + tax), 0.0) # Individual formula for calculating the price (optional)