diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a5a0c2..90dae48 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,10 +6,10 @@ variables:
   ADDON_SLUG: "airsonos"
   ADDON_TARGET: "airsonos"
 
-  ADDON_ARMV7: "false"
+  ADDON_ARMHF: "false"
   ADDON_LEGACY_TAGS: "true"
 
-  ADDON_AARCH64_BASE: "hassioaddons/ubuntu-base-aarch64:2.3.1"
-  ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:2.3.1"
-  ADDON_ARMHF_BASE: "hassioaddons/ubuntu-base-armhf:2.3.1"
-  ADDON_I386_BASE: "hassioaddons/ubuntu-base-i386:2.3.1"
+  ADDON_AARCH64_BASE: "hassioaddons/ubuntu-base-aarch64:3.0.0"
+  ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:3.0.0"
+  ADDON_ARMV7_BASE: "hassioaddons/ubuntu-base-armv7:3.0.0"
+  ADDON_I386_BASE: "hassioaddons/ubuntu-base-i386:3.0.0"
diff --git a/airsonos/Dockerfile b/airsonos/Dockerfile
index 0578ad7..d6dfb81 100755
--- a/airsonos/Dockerfile
+++ b/airsonos/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=hassioaddons/ubuntu-base:2.3.1
+ARG BUILD_FROM=hassioaddons/ubuntu-base:3.0.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
diff --git a/airsonos/build.json b/airsonos/build.json
index 0b415bc..70ca2c6 100644
--- a/airsonos/build.json
+++ b/airsonos/build.json
@@ -1,9 +1,9 @@
 {
     "build_from": {
-        "aarch64": "hassioaddons/ubuntu-base-aarch64:2.3.1",
-        "amd64": "hassioaddons/ubuntu-base-amd64:2.3.1",
-        "armhf": "hassioaddons/ubuntu-base-armhf:2.3.1",
-        "i386": "hassioaddons/ubuntu-base-i386:2.3.1"
+        "aarch64": "hassioaddons/ubuntu-base-aarch64:3.0.0",
+        "amd64": "hassioaddons/ubuntu-base-amd64:3.0.0",
+        "armv7": "hassioaddons/ubuntu-base-armv7:3.0.0",
+        "i386": "hassioaddons/ubuntu-base-i386:3.0.0"
     },
     "args": {}
 }
diff --git a/airsonos/config.json b/airsonos/config.json
index 8958d52..ad0dbbc 100755
--- a/airsonos/config.json
+++ b/airsonos/config.json
@@ -8,7 +8,7 @@
   "arch": [
     "aarch64",
     "amd64",
-    "armhf",
+    "armv7",
     "i386"
   ],
   "boot": "auto",