diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index accc647c28..94116bcee1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,11 +41,11 @@ stages:
 
     - |
       if [[ "${IS_HASSIO}" == "YES" ]]; then
-        BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:1.6.0
+        BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:1.5.1
         BUILD_TO=esphome/esphome-hassio-${BUILD_ARCH}
         DOCKERFILE=docker/Dockerfile.hassio
       else
-        BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:1.6.0
+        BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:1.5.1
         if [[ "${BUILD_ARCH}" == "amd64" ]]; then
           BUILD_TO=esphome/esphome
         else
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f70d3e35a5..f844fa741e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=esphome/esphome-base-amd64:1.6.0
+ARG BUILD_FROM=esphome/esphome-base-amd64:1.5.1
 FROM ${BUILD_FROM}
 
 COPY . .
diff --git a/esphome/components/ota/ota_component.cpp b/esphome/components/ota/ota_component.cpp
index b69393c998..ee2d67c85e 100644
--- a/esphome/components/ota/ota_component.cpp
+++ b/esphome/components/ota/ota_component.cpp
@@ -4,7 +4,6 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/application.h"
 #include "esphome/core/util.h"
-//#include "esphome/components/status_led.h"
 
 #include <cstdio>
 #include <MD5Builder.h>
diff --git a/esphome/core_config.py b/esphome/core_config.py
index 71942c05e0..5230f723af 100644
--- a/esphome/core_config.py
+++ b/esphome/core_config.py
@@ -48,7 +48,7 @@ PLATFORMIO_ESP8266_LUT = {
     '2.4.1': 'espressif8266@1.7.3',
     '2.4.0': 'espressif8266@1.6.0',
     '2.3.0': 'espressif8266@1.5.0',
-    'RECOMMENDED': 'espressif8266@2.1.0',
+    'RECOMMENDED': 'espressif8266@1.8.0',
     'LATEST': 'espressif8266',
     'DEV': ARDUINO_VERSION_ESP8266_DEV,
 }