diff --git a/empty/empty32.yaml b/empty/empty32.yaml
index 5613be8..b88ea0d 100644
--- a/empty/empty32.yaml
+++ b/empty/empty32.yaml
@@ -1,16 +1,12 @@
 # To bootstrap and then use OTA to flash firmware.
 
+esp32:
+  board: esp32doit-devkit-v1
+
 esphome:
   name: empty32
   name_add_mac_suffix: true
 
-esp32:
-  board: esp32doit-devkit-v1
-
-ota:
-  password: !secret ota_password
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-  domain: ""
+packages:
+  wifi: !include ../templates/wifi.yaml
+  ota: !include ../templates/ota.yaml
diff --git a/empty/empty8266.yaml b/empty/empty8266.yaml
index 44d5085..6490638 100644
--- a/empty/empty8266.yaml
+++ b/empty/empty8266.yaml
@@ -1,16 +1,12 @@
 # To bootstrap and then use OTA to flash firmware.
 
+esp8266:
+  board: nodemcuv2
+
 esphome:
   name: empty8266
   name_add_mac_suffix: true
 
-esp8266:
-  board: nodemcuv2
-
-ota:
-  password: !secret ota_password
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-  domain: ""
+packages:
+  wifi: !include ../templates/wifi.yaml
+  ota: !include ../templates/ota.yaml