diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e9f795..691ddf4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -297,7 +297,7 @@ build:armhf:
   <<: *build
   variables:
     ADDON_ARCH: armhf
-    FROM: hassioaddons/base-armhf:2.1.2
+    FROM: hassioaddons/base-armhf:2.2.0
   tags:
     - build
     - armhf
@@ -306,7 +306,7 @@ build:aarch64:
   <<: *build
   variables:
     ADDON_ARCH: aarch64
-    FROM: hassioaddons/base-aarch64:2.1.2
+    FROM: hassioaddons/base-aarch64:2.2.0
   tags:
     - build
     - aarch64
@@ -315,7 +315,7 @@ build:i386:
   <<: *build
   variables:
     ADDON_ARCH: i386
-    FROM: hassioaddons/base-i386:2.1.2
+    FROM: hassioaddons/base-i386:2.2.0
   tags:
     - build
     - i386
@@ -324,7 +324,7 @@ build:amd64:
   <<: *build
   variables:
     ADDON_ARCH: amd64
-    FROM: hassioaddons/base-amd64:2.1.2
+    FROM: hassioaddons/base-amd64:2.2.0
   tags:
     - build
     - amd64
diff --git a/tasmoadmin/Dockerfile b/tasmoadmin/Dockerfile
index 01ab1b3..35f50c6 100755
--- a/tasmoadmin/Dockerfile
+++ b/tasmoadmin/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=hassioaddons/base:2.1.2
+ARG BUILD_FROM=hassioaddons/base:2.2.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
diff --git a/tasmoadmin/build.json b/tasmoadmin/build.json
index 8d940b9..e2b2d4d 100755
--- a/tasmoadmin/build.json
+++ b/tasmoadmin/build.json
@@ -1,10 +1,10 @@
 {
     "squash": false,
     "build_from": {
-        "aarch64": "hassioaddons/base-aarch64:2.1.2",
-        "amd64": "hassioaddons/base-amd64:2.1.2",
-        "armhf": "hassioaddons/base-armhf:2.1.2",
-        "i386": "hassioaddons/base-i386:2.1.2"
+        "aarch64": "hassioaddons/base-aarch64:2.2.0",
+        "amd64": "hassioaddons/base-amd64:2.2.0",
+        "armhf": "hassioaddons/base-armhf:2.2.0",
+        "i386": "hassioaddons/base-i386:2.2.0"
     },
     "args": {}
 }