diff --git a/chrony/Dockerfile b/chrony/Dockerfile
index 2115d0b..b63742e 100644
--- a/chrony/Dockerfile
+++ b/chrony/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=hassioaddons/base:8.0.6
+ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:9.0.1
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
@@ -9,7 +9,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # hadolint ignore=DL3003
 RUN \
     apk add --no-cache \
-        chrony=3.5.1-r0
+        chrony=4.0-r1
 
 # Copy root filesystem
 COPY rootfs /
@@ -17,25 +17,28 @@ COPY rootfs /
 # Build arguments
 ARG BUILD_ARCH
 ARG BUILD_DATE
+ARG BUILD_DESCRIPTION
+ARG BUILD_NAME
 ARG BUILD_REF
+ARG BUILD_REPOSITORY
 ARG BUILD_VERSION
 
 # Labels
 LABEL \
-    io.hass.name="chrony" \
-    io.hass.description="chrony NTP Server" \
+    io.hass.name="${BUILD_NAME}" \
+    io.hass.description="${BUILD_DESCRIPTION}" \
     io.hass.arch="${BUILD_ARCH}" \
     io.hass.type="addon" \
     io.hass.version=${BUILD_VERSION} \
     maintainer="Paul Sinclair <hello@addons.community>" \
-    org.opencontainers.image.title="chrony" \
-    org.opencontainers.image.description="chrony NTP Server" \
+    org.opencontainers.image.title="${BUILD_NAME}" \
+    org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
     org.opencontainers.image.vendor="Home Assistant Community Add-ons" \
     org.opencontainers.image.authors="Paul Sinclair <hello@addons.community>" \
     org.opencontainers.image.licenses="MIT" \
     org.opencontainers.image.url="https://addons.community" \
-    org.opencontainers.image.source="https://github.com/hassio-addons/addon-chrony" \
-    org.opencontainers.image.documentation="https://github.com/hassio-addons/addon-chrony/blob/master/README.md" \
+    org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
+    org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
     org.opencontainers.image.created=${BUILD_DATE} \
     org.opencontainers.image.revision=${BUILD_REF} \
     org.opencontainers.image.version=${BUILD_VERSION}
diff --git a/chrony/build.json b/chrony/build.json
index 56b0309..8b6d940 100644
--- a/chrony/build.json
+++ b/chrony/build.json
@@ -1,9 +1,9 @@
 {
   "build_from": {
-    "aarch64": "hassioaddons/base-aarch64:8.0.6",
-    "amd64": "hassioaddons/base-amd64:8.0.6",
-    "armhf": "hassioaddons/base-armhf:8.0.6",
-    "armv7": "hassioaddons/base-armv7:8.0.6",
-    "i386": "hassioaddons/base-i386:8.0.6"
+    "aarch64": "ghcr.io/hassio-addons/base/aarch64:9.0.1",
+    "amd64": "ghcr.io/hassio-addons/base/amd64:9.0.1",
+    "armhf": "ghcr.io/hassio-addons/base/armhf:9.0.1",
+    "armv7": "ghcr.io/hassio-addons/base/armv7:9.0.1",
+    "i386": "ghcr.io/hassio-addons/base/i386:9.0.1"
   }
 }