diff --git a/bedroom_lilygo_t7v15.yaml b/bedroom_lilygo_t7v15.yaml
index 71cce19..5e72ad5 100644
--- a/bedroom_lilygo_t7v15.yaml
+++ b/bedroom_lilygo_t7v15.yaml
@@ -12,44 +12,12 @@ esphome:
         - lambda: |-
             id(wake_up_reason) = log(esp_sleep_get_ext1_wakeup_status())/log(2);
 
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-  manual_ip:
-    static_ip: ${device_ip}
-    gateway: 192.168.86.1
-    subnet: 255.255.254.0
-  fast_connect: True
-
-# captive_portal:
-
-# Enable logging
+<<: !include standard_wifi.yaml
 logger:
     level: INFO
-
-# Enable Home Assistant API
 api:
-
 ota:
-<<: !include standard_mqtt.yaml
-# mqtt:
-#   broker: !secret mqtt_broker
-#   discovery: True
-#   username: !secret mqtt_username
-#   password: !secret mqtt_password
-#   # keepalive: 2s
-#   birth_message:
-#           topic: ${device_name}/status
-#           payload: coming_online_birth
-#   will_message:
-#           topic: ${device_name}/status
-#           payload: going_offline_will
-#   on_message:
-#     topic: ${device_name}/ota_mode
-#     payload: 'ON'
-#     then:
-#       - deep_sleep.prevent: deep_sleep_1
-
+<<: !include standard_mqtt_deepsleep.yaml
 deep_sleep:
         run_duration: 20s
         sleep_duration: 40s #24h
@@ -94,4 +62,4 @@ binary_sensor:
         number: GPIO35
         mode: INPUT_PULLUP
     name: "TKM Test 35 (green)"
-    id: tkm_test35
+    id: tkm_test35
\ No newline at end of file
diff --git a/standard_mqtt.yaml b/standard_mqtt_deepsleep.yaml
similarity index 100%
rename from standard_mqtt.yaml
rename to standard_mqtt_deepsleep.yaml
diff --git a/standard_wifi.yaml b/standard_wifi.yaml
new file mode 100644
index 0000000..9c7be19
--- /dev/null
+++ b/standard_wifi.yaml
@@ -0,0 +1,8 @@
+wifi:
+  ssid: !secret wifi_ssid
+  password: !secret wifi_password
+  manual_ip:
+    static_ip: ${device_ip}
+    gateway: 192.168.86.1
+    subnet: 255.255.254.0
+  fast_connect: True
\ No newline at end of file