diff --git a/apps/rpi-dnsmasq/Dockerfile b/apps/rpi-dnsmasq/Dockerfile
index 27a6c78..4e17c92 100644
--- a/apps/rpi-dnsmasq/Dockerfile
+++ b/apps/rpi-dnsmasq/Dockerfile
@@ -1,8 +1,8 @@
 FROM docker.io/alpine:3.20 as rpi
-
+ARG VERSION
 COPY ./serials /serials
 
-ADD https://github.com/pftf/RPi4/releases/download/v1.37/RPi4_UEFI_Firmware_v1.37.zip RPi4_UEFI_Firmware.zip
+ADD https://github.com/pftf/RPi4/releases/download/v${VERSION}/RPi4_UEFI_Firmware_v${VERSION}.zip RPi4_UEFI_Firmware.zip
 
 RUN apk add --update --no-cache \
     unzip \
@@ -15,4 +15,9 @@ RUN apk add --update --no-cache \
     && mkdir /tftp \
     && ls /serials | while read serial; do mkdir /tftp/$serial && cp -r /rpi4/* /tftp/$serial && cp -r /serials/$serial/* /tftp/$serial/; done
 FROM quay.io/poseidon/dnsmasq:v0.5.0-31-gdc1adc8
+LABEL xyz.glants.image.target_platform=$TARGETPLATFORM
+LABEL xyz.glants.image.target_architecture=$TARGETARCH
+LABEL xyz.glants.image.target_os=$TARGETOS
+LABEL org.opencontainers.image.title="rpi-dnsmasq"
+LABEL org.opencontainers.image.source="github.com/poseidon/dnsmasq"
 COPY --from=rpi /tftp /var/lib/tftpboot
\ No newline at end of file
diff --git a/apps/rpi-dnsmasq/ci/latest.py b/apps/rpi-dnsmasq/ci/latest.py
index 4c747cc..d26f06c 100644
--- a/apps/rpi-dnsmasq/ci/latest.py
+++ b/apps/rpi-dnsmasq/ci/latest.py
@@ -1,9 +1,19 @@
 #!/usr/bin/env python
 
+import requests
+import json
+
+# Get the latest version of matchbox
+
+URL = "https://api.github.com/repos/pftf/RPi4/releases/latest"
+
 def get_latest(channel):
-    return "v0.0.1"
+    r = requests.get(URL)
+    data = json.loads(r.text)
+    version = data['tag_name'].removeprefix("v")
+    return version
 
 if __name__ == "__main__":
     import sys
     channel = sys.argv[1]
-    print(get_latest(channel))
\ No newline at end of file
+    print(get_latest(channel))