diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
index 7da8a3f8f..edbb2cf00 100644
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Set up env variables
         run: |
-          base_version="3.0.0"
+          base_version="3.1.0"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index f0dc4bd0c..1a88a362f 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -174,7 +174,7 @@ jobs:
           echo "TAG=${TAG}" >> $GITHUB_ENV
       - name: Set up env variables
         run: |
-          base_version="3.0.0"
+          base_version="3.1.0"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1eca3be26..fff89040b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -194,7 +194,7 @@ jobs:
           echo "TAG=${TAG}" >> $GITHUB_ENV
       - name: Set up env variables
         run: |
-          base_version="3.0.0"
+          base_version="3.1.0"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7364299ba..927c62cf4 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=esphome/esphome-base-amd64:3.0.0
+ARG BUILD_FROM=esphome/esphome-base-amd64:3.1.0
 FROM ${BUILD_FROM}
 
 # First install requirements to leverage caching when requirements don't change
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 52495fc8a..e09eeb683 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM esphome/esphome-base-amd64:3.0.0
+FROM esphome/esphome-base-amd64:3.1.0
 
 COPY . .
 
diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index 5488e68c9..4a8866724 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -1,4 +1,4 @@
-FROM esphome/esphome-lint-base:3.0.0
+FROM esphome/esphome-lint-base:3.1.0
 
 COPY requirements.txt requirements_test.txt docker/platformio_install_deps.py  platformio.ini /
 RUN \