diff --git a/chrony/Dockerfile b/chrony/Dockerfile
index e4f76d9..a6d8230 100644
--- a/chrony/Dockerfile
+++ b/chrony/Dockerfile
@@ -22,20 +22,20 @@ 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}