diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e3df652f67..cdb2693f46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@
 variables:
   DOCKER_DRIVER: overlay2
   DOCKER_HOST: tcp://docker:2375/
-  BASE_VERSION: '2.1.0'
+  BASE_VERSION: '2.1.1'
   TZ: UTC
 
 stages:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 01ff8f048b..bcdc5feaf7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=esphome/esphome-base-amd64:2.1.0
+ARG BUILD_FROM=esphome/esphome-base-amd64:2.1.1
 FROM ${BUILD_FROM}
 
 COPY . .
diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index 47b1520aa3..e65aebcccb 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -1,4 +1,4 @@
-FROM esphome/esphome-base-amd64:2.1.0
+FROM esphome/esphome-base-amd64:2.1.1
 
 RUN \
     apt-get update \