diff --git a/common/common_esp8266.yaml b/common/common_esp8266.yaml
new file mode 100644
index 0000000..dd2ed0c
--- /dev/null
+++ b/common/common_esp8266.yaml
@@ -0,0 +1,26 @@
+---
+<<: !include wifi_esp8266.yaml
+<<: !include api.yaml
+<<: !include ota.yaml
+<<: !include logger.yaml
+
+binary_sensor:
+  - <<: !include binary_sensor/status.yaml
+
+button:
+  - <<: !include button/factory_reset.yaml
+  - <<: !include button/restart.yaml
+  - <<: !include button/safe_mode.yaml
+  - <<: !include button/shutdown.yaml
+
+sensor:
+  - <<: !include sensor/uptime.yaml
+  - <<: !include sensor/wifi_signal.yaml
+
+text_sensor:
+  - <<: !include text_sensor/version.yaml
+  - <<: !include text_sensor/wifi_info.yaml
+
+network:
+  enable_ipv6: true
+#   min_ipv6_addr_count: 2
\ No newline at end of file
diff --git a/common/wifi.yaml b/common/wifi.yaml
index d38e1f4..c2348d6 100644
--- a/common/wifi.yaml
+++ b/common/wifi.yaml
@@ -1,7 +1,8 @@
 ---
 wifi:
+  # reboot_timeout: 0s
   networks:
     - ssid: !secret wifi_ssid
       password: !secret wifi_password
-#  enable_btm: true
-#  enable_rrm: true
+  enable_btm: true
+  enable_rrm: true
diff --git a/common/wifi_esp8266.yaml b/common/wifi_esp8266.yaml
new file mode 100644
index 0000000..a9591ab
--- /dev/null
+++ b/common/wifi_esp8266.yaml
@@ -0,0 +1,8 @@
+---
+wifi:
+  # reboot_timeout: 0s
+  networks:
+    - ssid: !secret wifi_ssid
+      password: !secret wifi_password
+#  enable_btm: true
+#  enable_rrm: true
diff --git a/mcu-basement-2.yaml b/mcu-basement-2.yaml
index 174203c..95b56f4 100644
--- a/mcu-basement-2.yaml
+++ b/mcu-basement-2.yaml
@@ -12,7 +12,7 @@ esphome:
 
 
 packages:
-  common: !include common/common.yaml
+  common: !include common/common_esp8266.yaml
   
 # Sonoff Dual R2
 # GPIO10	Push Button
diff --git a/mcu-basement.yaml b/mcu-basement.yaml
index fdfb009..caf0ed7 100644
--- a/mcu-basement.yaml
+++ b/mcu-basement.yaml
@@ -10,7 +10,7 @@ esphome:
   board: esp01_1m
 
 packages:
-  common: !include common/common.yaml
+  common: !include common/common_esp8266.yaml
   
 # Sonoff Dual R2
 # Pin 	  Function
diff --git a/mcu-fireplace-old.yaml b/mcu-fireplace-old.yaml
index 5b15501..1dd5348 100644
--- a/mcu-fireplace-old.yaml
+++ b/mcu-fireplace-old.yaml
@@ -13,7 +13,7 @@ esphome:
 #   use_address: mcu-fireplace.local
 
 packages:
-  common: !include common/common.yaml
+  common: !include common/common_esp8266.yaml
 
 dallas:
   - pin: 4
diff --git a/mcu-irrigation-1.yaml b/mcu-irrigation-1.yaml
index d9ffe84..985bc2f 100644
--- a/mcu-irrigation-1.yaml
+++ b/mcu-irrigation-1.yaml
@@ -22,7 +22,7 @@ esphome:
   #     - switch.turn_off: relay_5
 
 packages:
-  common: !include common/common.yaml
+  common: !include common/common_esp8266.yaml
   
 # api:
 #   services:
diff --git a/mcu-rf433.yaml b/mcu-rf433.yaml
index 63e51fc..783c1c6 100644
--- a/mcu-rf433.yaml
+++ b/mcu-rf433.yaml
@@ -10,7 +10,7 @@ esphome:
   board: esp01_1m
 
 packages:
-  common: !include common/common.yaml
+  common: !include common/common_esp8266.yaml
 
 remote_receiver:
   pin: 4
diff --git a/mcu-socket-01.yaml b/mcu-socket-01.yaml
index 095dd07..1f7d87e 100644
--- a/mcu-socket-01.yaml
+++ b/mcu-socket-01.yaml
@@ -13,7 +13,7 @@ esphome:
   board: esp01_1m
 
 packages:
-  common: !include common/common.yaml
+  common: !include common/common_esp8266.yaml
 
 # BlitzWolf BW-SHP2 and BW-SHP6 (ESP8285 - BL0937 or HJL-01 Energy Monitoring)
 # Pin 	  Name              Function
diff --git a/mcu-socket-02.yaml b/mcu-socket-02.yaml
index 025fbfe..9204524 100644
--- a/mcu-socket-02.yaml
+++ b/mcu-socket-02.yaml
@@ -13,7 +13,7 @@ esphome:
   board: esp01_1m
 
 packages:
-  common: !include common/common.yaml
+  common: !include common/common_esp8266.yaml
 
 # BlitzWolf BW-SHP2 and BW-SHP6 (ESP8285 - BL0937 or HJL-01 Energy Monitoring)
 # Pin 	  Name              Function
diff --git a/mcu-socket-03.yaml b/mcu-socket-03.yaml
index c6f8d94..f2d9055 100644
--- a/mcu-socket-03.yaml
+++ b/mcu-socket-03.yaml
@@ -20,7 +20,7 @@ esphome:
   board: esp01_1m
 
 packages:
-  common: !include common/common.yaml
+  common: !include common/common_esp8266.yaml
 
 # BlitzWolf BW-SHP2 and BW-SHP6 (ESP8285 - BL0937 or HJL-01 Energy Monitoring)
 # Pin 	  Name              Function
diff --git a/mcu-staircase-light.yaml b/mcu-staircase-light.yaml
index b4d7daf..9c5ccb3 100644
--- a/mcu-staircase-light.yaml
+++ b/mcu-staircase-light.yaml
@@ -11,7 +11,7 @@ esp8266:
   board: esp01_1m
 
 packages:
-  common: !include common/common.yaml
+  common: !include common/common_esp8266.yaml
 
 # wifi:
 #   use_address: mcu-mini-04.local
diff --git a/mcu-tv-light.yaml b/mcu-tv-light.yaml
index 93e4038..384ec13 100644
--- a/mcu-tv-light.yaml
+++ b/mcu-tv-light.yaml
@@ -10,7 +10,7 @@ esphome:
   board: esp8285
 
 packages:
-  common: !include common/common.yaml
+  common: !include common/common_esp8266.yaml
   
 # Module type 	18 Generic 	Module type
 # D2 GPIO4 	51 IRRecv 	IR Remote (optional, view console for debugging!)
diff --git a/mcu-waterproof-socket.yaml b/mcu-waterproof-socket.yaml
index 97ad8c0..6014ac4 100644
--- a/mcu-waterproof-socket.yaml
+++ b/mcu-waterproof-socket.yaml
@@ -10,7 +10,7 @@ esphome:
   board: esp01_1m
 
 packages:
-  common: !include common/common.yaml
+  common: !include common/common_esp8266.yaml
 
 # Sonoff Basic R2
 # GPIO00 - BUTTON