diff --git a/CHANGELOG.md b/CHANGELOG.md
index b577646..cd269ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,9 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Added options `UUID_FILE` and `UUID`
+
 ### Changed
-- Update mlat-client to [#eaa95f3](https://github.com/wiedehopf/mlat-client/commit/eaa95f3a4ba7a6429a34142e4befb63edd9f087c)
-- Update Docker base image to `python:3.10-alpine3.17`
+- Update mlat-client to [#888eee5](https://github.com/wiedehopf/mlat-client/commit/888eee5e228ed8e0ecbd132af620ed378ca98bd9)
+- Update Docker base image to `python:3.12.0-alpine3.18`
 
 ## [1.0.1] - 2021-11-24
 ### Changed
diff --git a/Dockerfile b/Dockerfile
index 4747385..72b07d7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Builder
-FROM python:3.10.13-alpine3.17 AS builder
+FROM python:3.12.0-alpine3.18 AS builder
 
 ARG UPSTREAM_REMOTE
 ARG UPSTREAM_BRANCH
@@ -27,7 +27,7 @@ RUN rm -rf /app/mlat-client/.git*
 
 
 # Release
-FROM python:3.10.13-alpine3.17 AS release
+FROM python:3.12.0-alpine3.18 AS release
 
 # Workdir
 WORKDIR /app
@@ -41,7 +41,7 @@ COPY --from=builder /app/mlat-client/ /app/
 COPY entrypoint.sh /entrypoint.sh
 
 # Permissions
-RUN chmod +x /entrypoint.sh mlat-client fa-mlat-client && \
+RUN chmod +x /entrypoint.sh mlat-client && \
     mkdir /app/data
 
 # Environment
@@ -59,6 +59,8 @@ ENV INPUT_TYPE="auto" \
     SERVER_HOST="feed.adsbexchange.com" \
     SERVER_PORT="31090" \
     NO_UDP="no" \
+    UUID_FILE="" \
+    UUID="" \
     LOG_TIMESTAMPS="no"
 
 # Entrypoint
diff --git a/README.md b/README.md
index 96948b0..2a52d1c 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,8 @@ docker run \
 | SERVER_HOST | x | feed.adsbexchange.com | Host of the multilateration server to connect to |
 | SERVER_PORT | x | 31090 | Port of the multilateration server to connect to |
 | NO_UDP | | no | Don't offer to use UDP transport for sync/mlat messages: `yes`, `no` |
+| UUID_FILE | | | Filepath of a file containing the UUID (has lower priority than `UUID`) |
+| UUID | | | UUID string (has higher priority than `UUID_FILE`) |
 | LOG_TIMESTAMPS | | no | Print timestamps in logging output: `yes`, `no` |
 
 
diff --git a/entrypoint.sh b/entrypoint.sh
index 7c62093..08ebf6c 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -17,6 +17,8 @@ SERVER_HOST="${SERVER_HOST:-feed.adsbexchange.com}"
 SERVER_PORT="${SERVER_PORT:-31090}"
 SERVER="${SERVER_HOST}:${SERVER_PORT}"
 NO_UDP="${NO_UDP:-no}"
+UUID_FILE="${UUID_FILE:-}"
+UUID="${UUID:-}"
 LOG_TIMESTAMPS="${LOG_TIMESTAMPS:-no}"
 
 
@@ -57,6 +59,16 @@ then
     ARGS="${ARGS} --no-udp"
 fi
 
+if [ ! -z "$UUID_FILE" ]
+then
+    ARGS="${ARGS} --uuid-file ${UUID_FILE}"
+fi
+
+if [ ! -z "$UUID" ]
+then
+    ARGS="${ARGS} --uuid ${UUID}"
+fi
+
 if [ "$LOG_TIMESTAMPS" = "yes" ]
 then
     ARGS="${ARGS} --log-timestamps"
diff --git a/upstream b/upstream
index 633a53f..888eee5 160000
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-Subproject commit 633a53feb01f4a94918a74e303ede7ed9ed1f263
+Subproject commit 888eee5e228ed8e0ecbd132af620ed378ca98bd9