diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ed0973cdd..c3808b7381 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.3'
+  BASE_VERSION: '2.0.0'
   TZ: UTC
 
 stages:
@@ -33,7 +33,7 @@ stages:
     - docker info
     - docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
   script:
-    - docker run --rm --privileged hassioaddons/qemu-user-static:latest
+    - docker run --rm --privileged multiarch/qemu-user-static:4.1.0-1 --reset -p yes
     - TAG="${CI_COMMIT_TAG#v}"
     - TAG="${TAG:-${CI_COMMIT_SHA:0:7}}"
     - echo "Tag ${TAG}"
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9a6ebb1564..66d88655f4 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,8 @@
-ARG BUILD_FROM=esphome/esphome-base-amd64:1.8.3
+ARG BUILD_FROM=esphome/esphome-base-amd64:2.0.0
 FROM ${BUILD_FROM}
 
 COPY . .
-RUN pip2 install --no-cache-dir -e .
+RUN pip3 install --no-cache-dir -e .
 
 ENV USERNAME=""
 ENV PASSWORD=""
diff --git a/docker/Dockerfile.hassio b/docker/Dockerfile.hassio
index 4d3d0b88f1..e5c9625680 100644
--- a/docker/Dockerfile.hassio
+++ b/docker/Dockerfile.hassio
@@ -6,7 +6,7 @@ COPY docker/rootfs/ /
 COPY setup.py setup.cfg MANIFEST.in /opt/esphome/
 COPY esphome /opt/esphome/esphome
 
-RUN pip2 install --no-cache-dir -e /opt/esphome
+RUN pip3 install --no-cache-dir -e /opt/esphome
 
 # Build arguments
 ARG BUILD_VERSION=dev
diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index 2cc65b85d2..98c22d4c88 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -1,4 +1,4 @@
-FROM esphome/esphome-base-amd64:1.8.3
+FROM esphome/esphome-base-amd64:2.0.0
 
 RUN \
     apt-get update \
@@ -12,7 +12,7 @@ RUN \
         /var/lib/apt/lists/*
 
 COPY requirements_test.txt /requirements_test.txt
-RUN pip2 install --no-cache-dir wheel && pip2 install --no-cache-dir -r /requirements_test.txt
+RUN pip3 install --no-cache-dir wheel && pip3 install --no-cache-dir -r /requirements_test.txt
 
 VOLUME ["/esphome"]
 WORKDIR /esphome
diff --git a/docker/rootfs/etc/cont-init.d/30-esphome.sh b/docker/rootfs/etc/cont-init.d/30-esphome.sh
index 8fc1b472c0..086c5af19f 100644
--- a/docker/rootfs/etc/cont-init.d/30-esphome.sh
+++ b/docker/rootfs/etc/cont-init.d/30-esphome.sh
@@ -10,6 +10,6 @@ if bashio::config.has_value 'esphome_version'; then
     esphome_version=$(bashio::config 'esphome_version')
     full_url="https://github.com/esphome/esphome/archive/${esphome_version}.zip"
     bashio::log.info "Installing esphome version '${esphome_version}' (${full_url})..."
-    pip2 install -U --no-cache-dir "${full_url}" \
+    pip3 install -U --no-cache-dir "${full_url}" \
       || bashio::exit.nok "Failed installing esphome pinned version."
 fi