diff --git a/Dockerfile b/Dockerfile
index 5637434..603b24a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ FROM ghcr.io/sdr-enthusiasts/docker-tar1090:latest
 
 LABEL org.opencontainers.image.source="https://github.com/sdr-enthusiasts/docker-adsb-ultrafeeder"
 
-ENV URL_MLAT_CLIENT_REPO="https://github.com/wiedehopf/mlat-client.git" \
+ENV \
     PRIVATE_MLAT="false" \
     MLAT_INPUT_TYPE="auto"
 
diff --git a/rootfs/etc/s6-overlay/scripts/mlat-client b/rootfs/etc/s6-overlay/scripts/mlat-client
index 515da71..4a1ddfa 100755
--- a/rootfs/etc/s6-overlay/scripts/mlat-client
+++ b/rootfs/etc/s6-overlay/scripts/mlat-client
@@ -51,6 +51,8 @@ then
     stop_service
 fi
 
+mkdir -p /run/mlat-client
+
 function check_gpsd() {
     if (( GPSD == 0 )) || ! [[ -f /run/readsb/gpsd.json ]]; then
         return 1
@@ -276,6 +278,8 @@ do
         "${s6wrap[@]}" --args echo "WARNING: UUID is not defined, proceeding without UUID"
     fi
 
+    MLAT_PARAM+=(--stats-json "/run/mlat-client/${params[0]}:${params[1]}.json")
+
     # Now add the extra_args, if any:
     [[ -n "${extra_args}" ]] && MLAT_PARAM+=("${extra_args}") || true