diff --git a/config/gas-kocheg-wemos.yaml b/config/gas-kocheg-wemos.yaml
index 67e51b7..ac58619 100644
--- a/config/gas-kocheg-wemos.yaml
+++ b/config/gas-kocheg-wemos.yaml
@@ -46,5 +46,13 @@ sensor:
     unit_of_measurement: "ppm"
     icon: "mdi:meter-gas-outline"
 
-web_server:
-  port: 80
\ No newline at end of file
+
+mqtt:
+  broker: 192.168.88.4
+  username: 'miroca'
+  password: 'cbvgcjy0'
+  discovery: False # disable entity discovery
+  discover_ip: True # enable device discovery
+
+# web_server:
+#   port: 80
\ No newline at end of file
diff --git a/config/kc868-a6.yaml b/config/kc868-a6.yaml
index 0502d38..c032a26 100644
--- a/config/kc868-a6.yaml
+++ b/config/kc868-a6.yaml
@@ -63,6 +63,7 @@ modbus_controller:
   - id: modbus_sensor
     address: 0x01  # device address
     modbus_id: modbus1
+    update_interval: 2s
 
 i2c:
   sda: GPIO4
diff --git a/config/kontroller-kocheg-a16.yaml b/config/kontroller-kocheg-a16.yaml
index 8c0fbc1..f1fcd22 100644
--- a/config/kontroller-kocheg-a16.yaml
+++ b/config/kontroller-kocheg-a16.yaml
@@ -50,6 +50,18 @@ uart:
     rx_pin: GPIO16
     baud_rate: 9600
 
+
+# Config Modbus
+modbus:
+  uart_id: uart_modbus
+  id: modbus1
+
+modbus_controller:
+  - id: modbus_sensor
+    address: 0x01  # device address
+    modbus_id: modbus1
+    update_interval: 10s
+
 remote_receiver:
   pin:
     number: GPIO2
@@ -158,7 +170,7 @@ binary_sensor:
       inverted: true
 
   - platform: gpio
-    name: "KC868-A16-X08"
+    name: "input8_podval_osv"
     pin:
       pcf8574: inputs_1_8
       number: 7
@@ -166,7 +178,7 @@ binary_sensor:
       inverted: true
 
   - platform: gpio
-    name: "KC868-A16-X09"
+    name: "input9_nasos"
     pin:
       pcf8574: inputs_9_16
       number: 0
@@ -174,7 +186,7 @@ binary_sensor:
       inverted: true
 
   - platform: gpio
-    name: "KC868-A16-X10"
+    name: "input10_boiler"
     pin:
       pcf8574: inputs_9_16
       number: 1
@@ -232,7 +244,7 @@ binary_sensor:
 
 switch:
   - platform: gpio
-    name: "Output01"
+    name: "Output01_podval_boiler"
     id: out_y01
     pin:
       pcf8574: outputs_1_8
@@ -241,7 +253,7 @@ switch:
       inverted: true
 
   - platform: gpio
-    name: "Output02"
+    name: "Output02_podval_nasos"
     id: out_y02
     pin:
       pcf8574: outputs_1_8
@@ -250,7 +262,7 @@ switch:
       inverted: true
 
   - platform: gpio
-    name: "Output03"
+    name: "Output03_podval_svet"
     id: out_y03
     pin:
       pcf8574: outputs_1_8
@@ -379,6 +391,31 @@ switch:
 #   update_interval: 1s
 
 sensor:
+  - platform: modbus_controller
+    modbus_controller_id: modbus_sensor
+    name: "Temperature Sensor"
+    id: temperature_sensor
+    address: 0x0001
+    register_type: read
+    value_type: U_WORD
+    unit_of_measurement: "°C"
+    accuracy_decimals: 1
+    filters:
+      - lambda: if (x < 10000) return x * 0.1; else return -1 * (x - 10000) * 0.1;
+
+   
+  - platform: modbus_controller
+    modbus_controller_id: modbus_sensor
+    name: "Humidity Sensor"
+    id: humidity_sensor
+    address: 0x0002
+    register_type: read
+    value_type: U_WORD
+    unit_of_measurement: "%"
+    accuracy_decimals: 1
+    filters:
+      - multiply: 0.1
+
   - platform: dallas_temp
     one_wire_id: bus32
     name: "DS18B20"
diff --git a/config/teplica-a8.yaml b/config/teplica-a8.yaml
index 88fb12f..2912385 100644
--- a/config/teplica-a8.yaml
+++ b/config/teplica-a8.yaml
@@ -1,5 +1,5 @@
 esphome:
-  name: teplica_a8
+  name: teplica8
   friendly_name: Teplica_A8
 
 esp32:
@@ -205,12 +205,12 @@ one_wire:
   - platform: gpio
     pin: GPIO14
     id: bus14
-
+  
 sensor:
   - platform: dallas_temp
     one_wire_id: bus14
     name: "DS18B20"
-    update_interval: 30s
+    update_interval: 2s
 
   - platform: adc
     pin: 34
@@ -218,7 +218,7 @@ sensor:
     device_class: 'humidity'
     update_interval: 5s
     unit_of_measurement: "%"
-    attenuation: 11db
+    attenuation: 12db
     filters:
     - median:
         window_size: 7