diff --git a/_data/tv1-cpu-pwr.yaml b/_data/tv1-cpu-pwr.yaml
index d758b2f..44e75ac 100644
--- a/_data/tv1-cpu-pwr.yaml
+++ b/_data/tv1-cpu-pwr.yaml
@@ -11,16 +11,11 @@ esphome:
 wifi:
   ssid: !secret wifi_oss_ssid
   password: !secret wifi_oss_pw
-  fast_connect: true
-
-  manual_ip:
-    static_ip: 192.168.35.250
-    gateway: 192.168.35.1
-    subnet: 255.255.255.0
+  use_address: "${device_name}"
 
   # Enable fallback hotspot (captive portal) in case wifi connection fails
   ap:
-    ssid: "${device_name} Fallback Hotspot"
+    ssid: "${device_name}-fallback"
     password: !secret wifi_fallback_pw
 
 # Enable logging