diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 46df51f27a..3278827486 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.8.0'
+  BASE_VERSION: '1.8.3'
   TZ: UTC
 
 stages:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2418144899..a5edeeec00 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=esphome/esphome-base-amd64:1.8.0
+ARG BUILD_FROM=esphome/esphome-base-amd64:1.8.3
 FROM ${BUILD_FROM}
 
 COPY . .
diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index 1373f1ee01..2cc65b85d2 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -1,4 +1,4 @@
-FROM esphome/esphome-base-amd64:1.8.0
+FROM esphome/esphome-base-amd64:1.8.3
 
 RUN \
     apt-get update \
diff --git a/docker/Dockerfile.test b/docker/Dockerfile.test
deleted file mode 100644
index daf1199796..0000000000
--- a/docker/Dockerfile.test
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM ubuntu:bionic
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-        python \
-        python-pip \
-        python-setuptools \
-        python-pil \
-        git \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/*rm -rf /var/lib/apt/lists/* /tmp/* && \
-    pip install --no-cache-dir platformio && \
-    platformio settings set enable_telemetry No && \
-    platformio settings set check_libraries_interval 1000000 && \
-    platformio settings set check_platformio_interval 1000000 && \
-    platformio settings set check_platforms_interval 1000000
-
-COPY docker/platformio.ini /pio/platformio.ini
-RUN platformio run -d /pio; rm -rf /pio
-
-COPY requirements.txt /requirements.txt
-
-RUN pip install --no-cache-dir -r /requirements.txt
diff --git a/docker/platformio.ini b/docker/platformio.ini
deleted file mode 100644
index 27f7dbea55..0000000000
--- a/docker/platformio.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-; This file allows the docker build file to install the required platformio
-; platforms
-
-[env:espressif8266]
-platform = espressif8266@1.8.0
-board = nodemcuv2
-framework = arduino
-
-[env:espressif32]
-platform = espressif32@1.5.0
-board = nodemcu-32s
-framework = arduino
diff --git a/esphome/core_config.py b/esphome/core_config.py
index 55ea02e8ee..051de896b5 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.8.0',
+    'RECOMMENDED': 'espressif32@1.6.0',
     'LATEST': 'espressif32',
     'DEV': ARDUINO_VERSION_ESP32_DEV,
 }