diff --git a/monitoring/publish.py b/monitoring/_archive/publish.py
similarity index 100%
rename from monitoring/publish.py
rename to monitoring/_archive/publish.py
diff --git a/monitoring/config/muc-kitchen.secret.yml b/monitoring/config/muc-kitchen.secret.yml
index ea2777d..deca78e 100644
--- a/monitoring/config/muc-kitchen.secret.yml
+++ b/monitoring/config/muc-kitchen.secret.yml
@@ -1,6 +1,20 @@
 esphome:
   name: muc-kitchen
 
+# due to problems we restart the controller every 
+# 1.5d (36h) + 1 h = 37h
+switch:
+  - platform: restart
+    name: "Restart muc-living"
+    id: myrestart
+time:
+  - platform: sntp
+    on_time:
+      # Cron syntax, trigger every 5 minutes
+      - cron: '0 0 1 * * *'
+        then:
+          - switch.toggle: myrestart
+
 esp32:
   board: nodemcu-32s
   framework:
@@ -13,12 +27,12 @@ logger:
 api:
   password: ""
 
-mqtt:
-  broker: "moritzgraf.de"
-  port: "30024"
-  username: "sender"
-  password: "ahQueteiRietufeko8do"
-  topic_prefix: "muc-kitchen"
+# mqtt:
+#   broker: "moritzgraf.de"
+#   port: "30024"
+#   username: "sender"
+#   password: "ahQueteiRietufeko8do"
+#   topic_prefix: "muc-kitchen"
 
 ota:
   password: ""
diff --git a/monitoring/config/muc-living.secret.yml b/monitoring/config/muc-living.secret.yml
index 8d22d22..1b2ef3a 100644
--- a/monitoring/config/muc-living.secret.yml
+++ b/monitoring/config/muc-living.secret.yml
@@ -1,6 +1,20 @@
 esphome:
   name: muc-living
 
+# due to problems we restart the controller every 
+# 1.5d (36h) + 1 h = 37h
+switch:
+  - platform: restart
+    name: "Restart muc-living"
+    id: myrestart
+time:
+  - platform: sntp
+    on_time:
+      # Cron syntax, trigger every 5 minutes
+      - cron: '0 0 1 * * *'
+        then:
+          - switch.toggle: myrestart
+
 esp32:
   board: nodemcu-32s
   framework:
@@ -45,6 +59,11 @@ prometheus:
 esp32_ble_tracker:
 
 sensor:
+  - platform: uptime
+    name: Uptime Sensor
+  - platform: wifi_signal
+    name: "WiFi Signal Sensor"
+    update_interval: 60s
   - platform: pvvx_mithermometer
     mac_address: "A4:C1:38:04:1A:70"
     temperature:
diff --git a/monitoring/config/rgbg-living.secret.yml b/monitoring/config/rgbg-living.secret.yml
index a5d8348..6faf6bd 100644
--- a/monitoring/config/rgbg-living.secret.yml
+++ b/monitoring/config/rgbg-living.secret.yml
@@ -19,13 +19,15 @@ ota:
 wifi:
   ssid: "Bababaambox"
   password: "mopRulezmopRulez"
+  reboot_timeout: "5 min"
+  fast_connect: True
 
   # Enable fallback hotspot (captive portal) in case wifi connection fails
-  ap:
-    ssid: "rgbg living Fallback Hotspot"
-    password: "iCMaF8TURlPg"
+  # ap:
+  #   ssid: "rgbg living Fallback Hotspot"
+  #   password: "iCMaF8TURlPg"
 
-captive_portal:
+# captive_portal:
 
 # http://oot6ainge9aef6iaf4Cu:oonohNaej6soh7TooPha@rgbg-kitchen.local/metrics
 web_server:
@@ -38,12 +40,16 @@ prometheus:
 esp32_ble_tracker:
 
 sensor:
+  - platform: wifi_signal
+    name: "rgbg-living WiFi Signal Sensor"
+  - platform: uptime
+    name: "rgbg-living Uptime Sensor"
   - platform: pvvx_mithermometer
     mac_address: "A4:C1:38:9B:18:D0"
     temperature:
       name: "rgbg-living-outside Temperature"
     humidity:
-      name: "rgbg-kilivingtchen-outside Humidity"
+      name: "rgbg-living-outside Humidity"
     battery_level:
       name: "rgbg-living-outside Battery-Level"
     battery_voltage:
@@ -61,9 +67,9 @@ sensor:
     battery_voltage:
       name: "rgbg-living-living Battery-Voltage"
     signal_strength:
-      name: "rgbg-living-kitchen Signal"
+      name: "rgbg-living-living Signal"
   - platform: xiaomi_hhccjcy01
-    mac_address: 'A4:C1:38:67:44:95'
+    mac_address: 'C4:7C:8D:67:44:95'
     temperature:
       name: "rgbg-living-outside-flora Temperature"
     moisture:
@@ -75,7 +81,7 @@ sensor:
     battery_level:
       name: "rgbg-living-outside-flora Battery-Level"
   - platform: xiaomi_hhccjcy01
-    mac_address: 'A4:C1:38:67:42:34'
+    mac_address: 'C4:7C:8D:67:42:34'
     temperature:
       name: "rgbg-living-krasser-kaktus Temperature"
     moisture:
diff --git a/monitoring/dyndns-muc.secret b/monitoring/dyndns-muc.secret
deleted file mode 100644
index bc51aa7..0000000
Binary files a/monitoring/dyndns-muc.secret and /dev/null differ