diff --git a/configuration.yaml b/configuration.yaml
index aafcb91..06245b4 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -105,10 +105,6 @@
 stecamonitor:
   ip: 10.0.1.4
 
-aula:
-  username: rolf1451
-  password: b3K0utzxIMuuXbFUe5NG
-
 sensor: !include_dir_merge_list sensors/
 
 template: !include_dir_merge_list template/
diff --git a/esphome/nilan300.yaml b/esphome/nilan300.yaml
index 43973bc..6acd85c 100644
--- a/esphome/nilan300.yaml
+++ b/esphome/nilan300.yaml
@@ -8,6 +8,7 @@
 
 # Enable logging
 logger:
+  level: INFO
   baud_rate: 0
 
 # Enable Home Assistant API
diff --git a/esphome/sovebt.yaml b/esphome/sovebt.yaml
index 859ee92..e513e8e 100644
--- a/esphome/sovebt.yaml
+++ b/esphome/sovebt.yaml
@@ -8,6 +8,8 @@
 
 # Enable logging
 logger:
+  level: INFO
+  baud_rate: 0
 
 # Enable Home Assistant API
 api:
@@ -29,15 +31,14 @@
 captive_portal:
 
 esp32_ble_tracker:
-  scan_parameters:
-    interval: 300ms
-    window: 300ms
-    duration: 1s
 
 bluetooth_proxy:
   active: true
 
 sensor:
+  - platform: uptime
+    name: Uptime
+
   - platform: xiaomi_miscale
     mac_address: '5C:CA:D3:8F:B1:B6'
     weight:
diff --git a/esphome/waterproxy.yaml b/esphome/waterproxy.yaml
index 552c5b1..2e63ea1 100644
--- a/esphome/waterproxy.yaml
+++ b/esphome/waterproxy.yaml
@@ -6,6 +6,8 @@
 
 # Enable logging
 logger:
+  level: INFO
+  baud_rate: 0
 
 # Enable Home Assistant API
 api:
diff --git a/esphome/wavin9000.yaml b/esphome/wavin9000.yaml
index ad1fe99..56db40b 100644
--- a/esphome/wavin9000.yaml
+++ b/esphome/wavin9000.yaml
@@ -8,6 +8,7 @@
 
 # Enable logging
 logger:
+  level: INFO
   baud_rate: 0
 
 # Enable Home Assistant API
diff --git a/sensors/energy.yaml b/sensors/energy.yaml
index 6fe57e6..3d38aff 100644
--- a/sensors/energy.yaml
+++ b/sensors/energy.yaml
@@ -48,7 +48,7 @@
 
 - platform: integration
   source: sensor.retur_til_elnet
-  name: solcelle_energy_to_grid
+  name: Solcelle Energy To Grid
   method: left
   unit_prefix: k
   unit_time: h
diff --git a/zigbee2mqtt/configuration.yaml b/zigbee2mqtt/configuration.yaml
index e5fe5d7..f6d6645 100644
--- a/zigbee2mqtt/configuration.yaml
+++ b/zigbee2mqtt/configuration.yaml
@@ -22,20 +22,18 @@
     protocol: tcp4
     type: '5424'
   channel: 15
-  log_level: info
+  log_level: warn
 device_options:
   legacy: false
 devices:
   '0x000b57fffeda5b94':
     friendly_name: Bryggers
-  '0xf0d1b8000015a9dd':
-    friendly_name: JanusDims
-  '0x00000000e203d9a9':
-    friendly_name: Elmåler
-  '0xa4c138c41ff7c306':
-    friendly_name: Teknikskab_Plug
   '0xa4c1387b259019f2':
     friendly_name: Mikroovn_Plug
+  '0xf082c0fffe9be262':
+    friendly_name: TeknikRepeater
+  '0x00000000e203d9a9':
+    friendly_name: Elmåler
 availability:
   active:
     timeout: 10