diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 579ac8a58e..720df87efa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,11 +41,11 @@ stages:
 
     - |
       if [[ "${IS_HASSIO}" == "YES" ]]; then
-        BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:1.1.0
+        BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:1.2.1
         BUILD_TO=esphome/esphome-hassio-${BUILD_ARCH}
         DOCKERFILE=docker/Dockerfile.hassio
       else
-        BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:1.1.0
+        BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:1.2.1
         if [[ "${BUILD_ARCH}" == "amd64" ]]; then
           BUILD_TO=esphome/esphome
         else
@@ -177,20 +177,40 @@ deploy-beta:pypi:
 .dev-vars: &dev-vars
   DEV: YES
 
-# aarch64
+aarch64-beta-docker:
+  <<: *beta
+  variables:
+    BETA: "YES"
+    BUILD_ARCH: aarch64
+    IS_HASSIO: "NO"
+    RELEASE: "YES"
 aarch64-beta-hassio:
   <<: *beta
   variables:
     BETA: "YES"
     BUILD_ARCH: aarch64
-    RELEASE: "YES"
     IS_HASSIO: "YES"
-#aarch64-dev-hassio:
-#  <<: *dev
-#  variables:
-#    BUILD_ARCH: aarch64
-#    DEV: "YES"
-#    IS_HASSIO: "YES"
+    RELEASE: "YES"
+aarch64-dev-docker:
+  <<: *dev
+  variables:
+    BUILD_ARCH: aarch64
+    DEV: "YES"
+    IS_HASSIO: "NO"
+aarch64-dev-hassio:
+  <<: *dev
+  variables:
+    BUILD_ARCH: aarch64
+    DEV: "YES"
+    IS_HASSIO: "YES"
+aarch64-latest-docker:
+  <<: *latest
+  variables:
+    BETA: "YES"
+    BUILD_ARCH: aarch64
+    IS_HASSIO: "NO"
+    LATEST: "YES"
+    RELEASE: "YES"
 aarch64-latest-hassio:
   <<: *latest
   variables:
@@ -213,18 +233,18 @@ amd64-beta-hassio:
     BUILD_ARCH: amd64
     IS_HASSIO: "YES"
     RELEASE: "YES"
-#amd64-dev-docker:
-#  <<: *dev
-#  variables:
-#    BUILD_ARCH: amd64
-#    DEV: "YES"
-#    IS_HASSIO: "NO"
-#amd64-dev-hassio:
-#  <<: *dev
-#  variables:
-#    BUILD_ARCH: amd64
-#    DEV: "YES"
-#    IS_HASSIO: "YES"
+amd64-dev-docker:
+  <<: *dev
+  variables:
+    BUILD_ARCH: amd64
+    DEV: "YES"
+    IS_HASSIO: "NO"
+amd64-dev-hassio:
+  <<: *dev
+  variables:
+    BUILD_ARCH: amd64
+    DEV: "YES"
+    IS_HASSIO: "YES"
 amd64-latest-docker:
   <<: *latest
   variables:
@@ -241,6 +261,13 @@ amd64-latest-hassio:
     IS_HASSIO: "YES"
     LATEST: "YES"
     RELEASE: "YES"
+armhf-beta-docker:
+  <<: *beta
+  variables:
+    BETA: "YES"
+    BUILD_ARCH: armhf
+    IS_HASSIO: "NO"
+    RELEASE: "YES"
 armhf-beta-hassio:
   <<: *beta
   variables:
@@ -248,12 +275,26 @@ armhf-beta-hassio:
     BUILD_ARCH: armhf
     IS_HASSIO: "YES"
     RELEASE: "YES"
-#armhf-dev-hassio:
-#  <<: *dev
-#  variables:
-#    BUILD_ARCH: armhf
-#    DEV: "YES"
-#    IS_HASSIO: "YES"
+armhf-dev-docker:
+  <<: *dev
+  variables:
+    BUILD_ARCH: armhf
+    DEV: "YES"
+    IS_HASSIO: "NO"
+armhf-dev-hassio:
+  <<: *dev
+  variables:
+    BUILD_ARCH: armhf
+    DEV: "YES"
+    IS_HASSIO: "YES"
+armhf-latest-docker:
+  <<: *latest
+  variables:
+    BETA: "YES"
+    BUILD_ARCH: armhf
+    IS_HASSIO: "NO"
+    LATEST: "YES"
+    RELEASE: "YES"
 armhf-latest-hassio:
   <<: *latest
   variables:
@@ -276,18 +317,18 @@ i386-beta-hassio:
     BUILD_ARCH: i386
     IS_HASSIO: "YES"
     RELEASE: "YES"
-#i386-dev-docker:
-#  <<: *dev
-#  variables:
-#    BUILD_ARCH: i386
-#    DEV: "YES"
-#    IS_HASSIO: "NO"
-#i386-dev-hassio:
-#  <<: *dev
-#  variables:
-#    BUILD_ARCH: i386
-#    DEV: "YES"
-#    IS_HASSIO: "YES"
+i386-dev-docker:
+  <<: *dev
+  variables:
+    BUILD_ARCH: i386
+    DEV: "YES"
+    IS_HASSIO: "NO"
+i386-dev-hassio:
+  <<: *dev
+  variables:
+    BUILD_ARCH: i386
+    DEV: "YES"
+    IS_HASSIO: "YES"
 i386-latest-docker:
   <<: *latest
   variables:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index fa943fba5e..08c74bb2c2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,10 +1,9 @@
-ARG BUILD_FROM=esphome/esphome-base-amd64:1.1.0
+ARG BUILD_FROM=esphome/esphome-base-amd64:1.2.1
 FROM ${BUILD_FROM}
 
 COPY . .
 RUN \
-    pip install --no-cache-dir --no-binary :all: -e . && \
-    pip install --no-cache-dir pillow
+    pip2 install --no-cache-dir --no-binary :all: -e .
 
 WORKDIR /config
 ENTRYPOINT ["esphome"]
diff --git a/docker/Dockerfile.hassio b/docker/Dockerfile.hassio
index fa3f85011b..f077b8ebf8 100644
--- a/docker/Dockerfile.hassio
+++ b/docker/Dockerfile.hassio
@@ -1,15 +1,6 @@
-ARG BUILD_FROM=esphome/esphome-hassio-base-amd64:1.1.0
+ARG BUILD_FROM=esphome/esphome-hassio-base-amd64:1.2.1
 FROM ${BUILD_FROM}
 
-RUN \
-    apt-get update \
-    && apt-get install -y --no-install-recommends \
-        python-pil \
-    && rm -rf \
-        /tmp/* \
-        /var/{cache,log}/* \
-        /var/lib/apt/lists/*
-
 # Copy root filesystem
 COPY docker/rootfs/ /
 COPY setup.py setup.cfg MANIFEST.in /opt/esphome/
diff --git a/docker/hooks/build b/docker/hooks/build
index 3e37d54ad1..482dacafc4 100755
--- a/docker/hooks/build
+++ b/docker/hooks/build
@@ -16,11 +16,11 @@ echo "PWD: $PWD"
 
 if [[ ${IS_HASSIO} = "YES" ]]; then
     docker build \
-      --build-arg "BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:1.1.0" \
+      --build-arg "BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:1.2.1" \
       --build-arg "BUILD_VERSION=${CACHE_TAG}" \
       -t "${IMAGE_NAME}" -f ../docker/Dockerfile.hassio ..
 else
     docker build \
-      --build-arg "BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:1.1.0" \
+      --build-arg "BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:1.2.1" \
       -t "${IMAGE_NAME}" -f ../docker/Dockerfile ..
 fi