diff --git a/devices/sonoff.rst b/devices/sonoff.rst
index a46f2b4c2..6bac7b251 100644
--- a/devices/sonoff.rst
+++ b/devices/sonoff.rst
@@ -14,11 +14,15 @@ and shipping from China takes a long time, I've only set up dedicated guides for
     esphome:
       name: <NAME_OF_NODE>
       platform: ESP8266
-      board: esp01_1m
+      board: esp8285
+      arduino_version: 2.4.2
+
+The selected board and arduino_version are required in v1.14.3 (and probably later), see
+https://github.com/esphome/issues/issues/931 for details.
 
 After that use the following list of pin to function mappings to set up your Sonoff device.
 This list has been compiled from the Sonoff Tasmota pin source file which can be found here:
-https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/sonoff_template.h ❤️
+https://github.com/arendst/Tasmota/blob/development/tasmota/tasmota_template.h ❤️
 
 Sonoff RF
 ---------
diff --git a/devices/sonoff_basic.rst b/devices/sonoff_basic.rst
index 031f8e205..2c52edc46 100644
--- a/devices/sonoff_basic.rst
+++ b/devices/sonoff_basic.rst
@@ -54,7 +54,8 @@ exposes all of the basic functions.
     esphome:
       name: <NAME_OF_NODE>
       platform: ESP8266
-      board: esp01_1m
+      board: esp8285
+      arduino_version: 2.4.2
 
     wifi:
       ssid: <YOUR_SSID>
diff --git a/devices/sonoff_s20.rst b/devices/sonoff_s20.rst
index 8fd8683f8..d8ee52631 100644
--- a/devices/sonoff_s20.rst
+++ b/devices/sonoff_s20.rst
@@ -128,7 +128,8 @@ or alternatively, you can just take the below configuration file and modify it t
     esphome:
       name: <NAME_OF_NODE>
       platform: ESP8266
-      board: esp01_1m
+      board: esp8285
+      arduino_version: 2.4.2
 
     wifi:
       ssid: <YOUR_SSID>
@@ -206,8 +207,9 @@ of the basic functions.
     esphome:
       name: <NAME_OF_NODE>
       platform: ESP8266
-      board: esp01_1m
-
+      board: esp8285
+      arduino_version: 2.4.2
+      
     wifi:
       ssid: <YOUR_SSID>
       password: <YOUR_PASSWORD>
diff --git a/devices/sonoff_s20.yaml b/devices/sonoff_s20.yaml
index 517a0cd8e..6ff2001dd 100644
--- a/devices/sonoff_s20.yaml
+++ b/devices/sonoff_s20.yaml
@@ -1,7 +1,8 @@
 esphome:
   name: <NAME_OF_NODE>
   platform: ESP8266
-  board: esp01_1m
+  board: esp8285
+  arduino_version: 2.4.2
 
 wifi:
   ssid: <YOUR_SSID>