diff --git a/adb/Dockerfile b/adb/Dockerfile
index 97f464f..2cf8259 100755
--- a/adb/Dockerfile
+++ b/adb/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=hassioaddons/ubuntu-base:5.2.2
+ARG BUILD_FROM=ghcr.io/hassio-addons/ubuntu-base/amd64:6.1.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
diff --git a/adb/build.json b/adb/build.json
index 7fb15e3..c8e2119 100644
--- a/adb/build.json
+++ b/adb/build.json
@@ -1,8 +1,8 @@
 {
   "build_from": {
-    "aarch64": "hassioaddons/ubuntu-base-aarch64:5.2.2",
-    "amd64": "hassioaddons/ubuntu-base-amd64:5.2.2",
-    "armv7": "hassioaddons/ubuntu-base-armv7:5.2.2",
-    "i386": "hassioaddons/ubuntu-base-i386:5.2.2"
+    "aarch64": "ghcr.io/hassio-addons/ubuntu-base/aarch64:6.1.0",
+    "amd64": "ghcr.io/hassio-addons/ubuntu-base/amd64:6.1.0",
+    "armv7": "ghcr.io/hassio-addons/ubuntu-base/armv7:6.1.0",
+    "i386": "ghcr.io/hassio-addons/ubuntu-base/i386:6.1.0"
   }
 }
diff --git a/adb/config.json b/adb/config.json
index ded96a1..3b4e36f 100755
--- a/adb/config.json
+++ b/adb/config.json
@@ -14,7 +14,6 @@
   "arch": ["aarch64", "amd64", "armv7", "i386"],
   "init": false,
   "map": ["config:rw", "share:rw", "ssl:rw"],
-  "hassio_api": true,
   "options": {
     "devices": [],
     "reconnect_timeout": 90