diff --git a/common/esp8266_mdns_ipv6.yaml b/common/esp8266_mdns_ipv6.yaml
new file mode 100644
index 0000000..34d4b7b
--- /dev/null
+++ b/common/esp8266_mdns_ipv6.yaml
@@ -0,0 +1,10 @@
+---
+# ESP8266 core with LEAmDNS announcing the IPv6 addresses (AAAA, ff02::fb) from
+# randybb/Arduino@mdns-ipv6-aaaa (esp8266/Arduino#9068); add next to common_esp8266.yaml.
+# The device must not set 'toolchain: arduino' (no custom framework source there).
+# Drop once it's upstream and in an ESPHome release.
+esp8266:
+  toolchain: platformio
+  framework:
+    version: 3.1.2
+    source: https://github.com/randybb/Arduino.git#mdns-ipv6-aaaa
diff --git a/mcu-basement-2.yaml b/mcu-basement-2.yaml
index 2cf8e07..c79af59 100644
--- a/mcu-basement-2.yaml
+++ b/mcu-basement-2.yaml
@@ -22,10 +22,10 @@ esphome:
 
 esp8266:
   board: esp01_1m
-  toolchain: arduino
 
 packages:
   common: !include common/common_esp8266.yaml
+  mdns_ipv6: !include common/esp8266_mdns_ipv6.yaml
 
 status_led:
   pin:
diff --git a/mcu-basement.yaml b/mcu-basement.yaml
index f4d966c..8d48eee 100644
--- a/mcu-basement.yaml
+++ b/mcu-basement.yaml
@@ -21,10 +21,10 @@ esphome:
 
 esp8266:
   board: esp01_1m
-  toolchain: arduino
 
 packages:
   common: !include common/common_esp8266.yaml
+  mdns_ipv6: !include common/esp8266_mdns_ipv6.yaml
 
 globals:
   - id: aerator_auto
diff --git a/mcu-rf433.yaml b/mcu-rf433.yaml
index 7e2a2ba..39333bf 100644
--- a/mcu-rf433.yaml
+++ b/mcu-rf433.yaml
@@ -18,10 +18,10 @@ esphome:
 
 esp8266:
   board: esp01_1m
-  toolchain: arduino
 
 packages:
   common: !include common/common_esp8266.yaml
+  mdns_ipv6: !include common/esp8266_mdns_ipv6.yaml
 
 remote_receiver:
   pin: 4
diff --git a/mcu-socket-01.yaml b/mcu-socket-01.yaml
index bd5bed9..57504aa 100644
--- a/mcu-socket-01.yaml
+++ b/mcu-socket-01.yaml
@@ -26,10 +26,10 @@ esphome:
 
 esp8266:
   board: esp01_1m
-  toolchain: arduino
 
 packages:
   common: !include common/common_esp8266.yaml
+  mdns_ipv6: !include common/esp8266_mdns_ipv6.yaml
 
 binary_sensor:
   - platform: gpio
diff --git a/mcu-socket-02.yaml b/mcu-socket-02.yaml
index 112b3a3..42604a1 100644
--- a/mcu-socket-02.yaml
+++ b/mcu-socket-02.yaml
@@ -26,10 +26,10 @@ esphome:
 
 esp8266:
   board: esp01_1m
-  toolchain: arduino
 
 packages:
   common: !include common/common_esp8266.yaml
+  mdns_ipv6: !include common/esp8266_mdns_ipv6.yaml
 
 binary_sensor:
   - platform: gpio
diff --git a/mcu-socket-03.yaml b/mcu-socket-03.yaml
index 8e67a5a..8c6c5c6 100644
--- a/mcu-socket-03.yaml
+++ b/mcu-socket-03.yaml
@@ -33,10 +33,10 @@ esphome:
 
 esp8266:
   board: esp01_1m
-  toolchain: arduino
 
 packages:
   common: !include common/common_esp8266.yaml
+  mdns_ipv6: !include common/esp8266_mdns_ipv6.yaml
 
 binary_sensor:
   - platform: gpio
diff --git a/mcu-staircase-light.yaml b/mcu-staircase-light.yaml
index a8a181b..8779278 100644
--- a/mcu-staircase-light.yaml
+++ b/mcu-staircase-light.yaml
@@ -17,10 +17,10 @@ esphome:
 
 esp8266:
   board: esp01_1m
-  toolchain: arduino
 
 packages:
   common: !include common/common_esp8266.yaml
+  mdns_ipv6: !include common/esp8266_mdns_ipv6.yaml
 
 # wifi:
 #   use_address: mcu-mini-04.local
diff --git a/mcu-tv-light.yaml b/mcu-tv-light.yaml
index 60432d2..468465d 100644
--- a/mcu-tv-light.yaml
+++ b/mcu-tv-light.yaml
@@ -31,10 +31,10 @@ esphome:
 
 esp8266:
   board: esp8285
-  toolchain: arduino
 
 packages:
   common: !include common/common_esp8266.yaml
+  mdns_ipv6: !include common/esp8266_mdns_ipv6.yaml
 
 light:
   - platform: status_led
diff --git a/mcu-waterproof-socket.yaml b/mcu-waterproof-socket.yaml
index 4ba18dc..6378821 100644
--- a/mcu-waterproof-socket.yaml
+++ b/mcu-waterproof-socket.yaml
@@ -20,10 +20,10 @@ esphome:
 
 esp8266:
   board: esp01_1m
-  toolchain: arduino
 
 packages:
   common: !include common/common_esp8266.yaml
+  mdns_ipv6: !include common/esp8266_mdns_ipv6.yaml
 
 binary_sensor:
   - platform: gpio