diff --git a/netbird/Dockerfile b/netbird/Dockerfile
index 2fa41fd..64f6a28 100644
--- a/netbird/Dockerfile
+++ b/netbird/Dockerfile
@@ -1,6 +1,6 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base:18.0.3
+ARG BUILD_FROM=ghcr.io/hassio-addons/base:18.1.0
 
-FROM netbirdio/netbird:0.51.2 as netbird-container
+FROM netbirdio/netbird:0.54.2 as netbird-container
 
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
diff --git a/netbird/build.yaml b/netbird/build.yaml
index 706d022..5cbeaec 100644
--- a/netbird/build.yaml
+++ b/netbird/build.yaml
@@ -1,10 +1,10 @@
 ---
 build_from:
-  aarch64: ghcr.io/hassio-addons/base:18.0.3
-  amd64: ghcr.io/hassio-addons/base:18.0.3
-  armhf: ghcr.io/hassio-addons/base:18.0.3
-  armv7: ghcr.io/hassio-addons/base:18.0.3
-  i386: ghcr.io/hassio-addons/base:18.0.3
+  aarch64: ghcr.io/hassio-addons/base:18.1.0
+  amd64: ghcr.io/hassio-addons/base:18.1.0
+  armhf: ghcr.io/hassio-addons/base:18.1.0
+  armv7: ghcr.io/hassio-addons/base:18.1.0
+  i386: ghcr.io/hassio-addons/base:18.1.0
 codenotary:
   base_image: notary@home-assistant.io
   signer: lfarkas@lfarkas.org