diff --git a/templates/definition/charger/luxtronik.yaml b/templates/definition/charger/luxtronik.yaml
index 6b668330c..2e72ff302 100644
--- a/templates/definition/charger/luxtronik.yaml
+++ b/templates/definition/charger/luxtronik.yaml
@@ -38,6 +38,8 @@ requirements:
 params:
   - name: modbus
     choice: ["tcpip"]
+  - name: timeout
+    default: 10s
   - name: wwoffset
     type: float
     unit: K
@@ -77,6 +79,7 @@ render: |
       config: 
         source: modbus
         {{- include "modbus" . | indent 6 }}
+        timeout: {{ .timeout }}
         register:
           address: 10040 # LPC mode [0=No-Limit;1=Soft-Limit;2=Hard-Limit]
           type: holding
@@ -86,6 +89,7 @@ render: |
       config: 
         source: modbus
         {{- include "modbus" . | indent 6 }}
+        timeout: {{ .timeout }}
         register:
           address: 10000 # Heiz.Mode [0=Aus;1=Setpoint;2=Offset]
           type: holding
@@ -95,6 +99,7 @@ render: |
       config: 
         source: modbus
         {{- include "modbus" . | indent 6 }}
+        timeout: {{ .timeout }}
         register:
           address: 10005 # WW Mode [0=Aus;1=Setpoint;2=Offset]
           type: holding
@@ -111,6 +116,7 @@ render: |
           set:
             source: modbus
             {{- include "modbus" . | indent 10 }}
+            timeout: {{ .timeout }}
             register:
               address: 10040 # LPC mode [0=No-Limit;1=Soft-Limit;2=Hard-Limit]
               type: writeholding
@@ -121,6 +127,7 @@ render: |
           set:
             source: modbus
             {{- include "modbus" . | indent 10 }}
+            timeout: {{ .timeout }}
             register:
               address: 10000 # Heiz.Mode [0=Aus;1=Setpoint;2=Offset]
               type: writeholding
@@ -132,6 +139,7 @@ render: |
           set:
             source: modbus
             {{- include "modbus" . | indent 10 }}
+            timeout: {{ .timeout }}
             register:
               address: 10005 # WW Mode [0=Aus;1=Setpoint;2=Offset]
               type: writeholding
@@ -146,6 +154,7 @@ render: |
           set:
             source: modbus
             {{- include "modbus" . | indent 10 }}
+            timeout: {{ .timeout }}
             register:
               address: 10040 # LPC mode [0=No-Limit;1=Soft-Limit;2=Hard-Limit]
               type: writeholding
@@ -156,6 +165,7 @@ render: |
           set:
             source: modbus
             {{- include "modbus" . | indent 10 }}
+            timeout: {{ .timeout }}
             register:
               address: 10000 # Heiz.Mode [0=Aus;1=Setpoint;2=Offset]
               type: writeholding
@@ -167,6 +177,7 @@ render: |
           set:
             source: modbus
             {{- include "modbus" . | indent 10 }}
+            timeout: {{ .timeout }}
             register:
               address: 10005 # WW Mode [0=Aus;1=Setpoint;2=Offset]
               type: writeholding
@@ -181,6 +192,7 @@ render: |
           set:
             source: modbus
             {{- include "modbus" . | indent 10 }}
+            timeout: {{ .timeout }}
             register:
               address: 10040 # LPC mode [0=No-Limit;1=Soft-Limit;2=Hard-Limit]
               type: writeholding
@@ -191,6 +203,7 @@ render: |
           set:
             source: modbus
             {{- include "modbus" . | indent 10 }}
+            timeout: {{ .timeout }}
             register:
               address: 10000 # Heiz.Mode [0=Aus;1=Setpoint;2=Offset]
               type: writeholding
@@ -200,6 +213,7 @@ render: |
           set:
             source: modbus
             {{- include "modbus" . | indent 10 }}
+            timeout: {{ .timeout }}
             register:
               address: 10002 # Heiz. Offset [0.1 K]
               type: writeholding
@@ -211,6 +225,7 @@ render: |
           set:
             source: modbus
             {{- include "modbus" . | indent 10 }}
+            timeout: {{ .timeout }}
             register:
               address: 10005 # WW Mode [0=Aus;1=Setpoint;2=Offset]
               type: writeholding
@@ -220,6 +235,7 @@ render: |
           set:
             source: modbus
             {{- include "modbus" . | indent 10 }}
+            timeout: {{ .timeout }}
             register:
               address: 10007 # WW Offset [0.1 K]
               type: writeholding
@@ -228,6 +244,7 @@ render: |
   temp:
     source: modbus
     {{- include "modbus" . | indent 2 }}
+    timeout: {{ .timeout }}
     register:
       address: {{ if gt $waterint 0 -}} 10120 {{ else }} 10100 {{- end }} # 10100 = Temp. x10 RL-Ist, 10120 = Temp x10 WW-Ist
       type: input
@@ -236,6 +253,7 @@ render: |
   limittemp:
     source: modbus
     {{- include "modbus" . | indent 2 }}
+    timeout: {{ .timeout }}
     register:
       address: {{ if gt $waterint 0 -}} 10121 {{ else }} 10101 {{- end }} # 10101 = Temp. x10 RL-Soll, 10121 = Temp x10 WW-Soll, 10123 = Temp x10 Tdi_solltemp
       type: input
@@ -244,6 +262,7 @@ render: |
   power:
     source: modbus
     {{- include "modbus" . | indent 2 }}
+    timeout: {{ .timeout }}
     register:
       address: 10301 # 10301 = kW x0.01 Power-In elektrisch
       type: input
@@ -252,6 +271,7 @@ render: |
   energy:
     source: modbus
     {{- include "modbus" . | indent 2 }}
+    timeout: {{ .timeout }}
     register:
       address: 10311 # 10311 = kWh x10 kumulierter Stromverbrauch
       type: input