diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 969a53b311..ef83284eaa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@
 variables:
   DOCKER_DRIVER: overlay2
   DOCKER_HOST: tcp://docker:2375/
-  BASE_VERSION: '1.5.1'
+  BASE_VERSION: '1.7.0'
   TZ: UTC
 
 stages:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f844fa741e..a65fa19726 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=esphome/esphome-base-amd64:1.5.1
+ARG BUILD_FROM=esphome/esphome-base-amd64:1.7.0
 FROM ${BUILD_FROM}
 
 COPY . .
diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index bad7967085..62155b9cde 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -1,4 +1,4 @@
-FROM esphome/esphome-base-amd64:1.5.1
+FROM esphome/esphome-base-amd64:1.7.0
 
 RUN \
     apt-get update \
diff --git a/esphome/core_config.py b/esphome/core_config.py
index 840191d39d..4061582266 100644
--- a/esphome/core_config.py
+++ b/esphome/core_config.py
@@ -61,7 +61,7 @@ PLATFORMIO_ESP32_LUT = {
     '1.0.0': 'espressif32@1.4.0',
     '1.0.1': 'espressif32@1.6.0',
     '1.0.2': 'espressif32@1.8.0',
-    'RECOMMENDED': 'espressif32@1.6.0',
+    'RECOMMENDED': 'espressif32@1.8.0',
     'LATEST': 'espressif32',
     'DEV': ARDUINO_VERSION_ESP32_DEV,
 }