diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78566baff8..8caa870ce5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,7 +61,7 @@ test2:
   stage: build
   script:
     - docker run --rm --privileged hassioaddons/qemu-user-static:latest
-    - BUILD_FROM=hassioaddons/ubuntu-base-${ADDON_ARCH}:2.2.0
+    - BUILD_FROM=hassioaddons/ubuntu-base-${ADDON_ARCH}:2.2.1
     - ADDON_VERSION="${CI_COMMIT_TAG#v}"
     - ADDON_VERSION="${ADDON_VERSION:-${CI_COMMIT_SHA:0:7}}"
     - echo "Build from ${BUILD_FROM}"
diff --git a/docker/Dockerfile.hassio b/docker/Dockerfile.hassio
index 8950495483..45db490975 100644
--- a/docker/Dockerfile.hassio
+++ b/docker/Dockerfile.hassio
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=hassioaddons/ubuntu-base:2.2.0
+ARG BUILD_FROM=hassioaddons/ubuntu-base:2.2.1
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
diff --git a/esphomeyaml-edge/Dockerfile b/esphomeyaml-edge/Dockerfile
index e258d8b0f0..a3db1d24ad 100644
--- a/esphomeyaml-edge/Dockerfile
+++ b/esphomeyaml-edge/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=hassioaddons/ubuntu-base:2.2.0
+ARG BUILD_FROM=hassioaddons/ubuntu-base:2.2.1
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
diff --git a/esphomeyaml-edge/build.json b/esphomeyaml-edge/build.json
index eb0295384a..a2a8eabb94 100644
--- a/esphomeyaml-edge/build.json
+++ b/esphomeyaml-edge/build.json
@@ -1,10 +1,10 @@
 {
   "squash": false,
   "build_from": {
-    "aarch64": "hassioaddons/ubuntu-base-aarch64:2.2.0",
-    "amd64": "hassioaddons/ubuntu-base-amd64:2.2.0",
-    "armhf": "hassioaddons/ubuntu-base-armhf:2.2.0",
-    "i386": "hassioaddons/ubuntu-base-i386:2.2.0"
+    "aarch64": "hassioaddons/ubuntu-base-aarch64:2.2.1",
+    "amd64": "hassioaddons/ubuntu-base-amd64:2.2.1",
+    "armhf": "hassioaddons/ubuntu-base-armhf:2.2.1",
+    "i386": "hassioaddons/ubuntu-base-i386:2.2.1"
   },
   "args": {}
 }