diff --git a/docs/syncserver/Dockerfile b/docs/syncserver/Dockerfile
index f770e4760..45c693112 100644
--- a/docs/syncserver/Dockerfile
+++ b/docs/syncserver/Dockerfile
@@ -13,16 +13,14 @@ FROM alpine:3.21.0
 
 ARG SYNC_PORT=8080
 
-RUN adduser -D -h /home/anki anki
-
-RUN mkdir -p /anki_data && chown -R anki /anki_data
+# Default PUID and PGID values (can be overridden at runtime). Use these to
+# ensure the files on the volume have the permissions you need.
+ENV PUID=1000
+ENV PGID=1000
 
 COPY --from=builder /anki-server/bin/anki-sync-server /usr/local/bin/anki-sync-server
 
-
-RUN apk update && apk add --no-cache bash && rm -rf /var/cache/apk/*
-
-USER anki
+RUN apk update && apk add --no-cache bash su-exec && rm -rf /var/cache/apk/*
 
 ENV SYNC_PORT=${SYNC_PORT}
 
@@ -30,6 +28,10 @@ ENV SYNC_BASE=/anki_data
 
 EXPOSE ${SYNC_PORT}
 
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
 CMD ["anki-sync-server"]
 
 # This health check will work for Anki versions 24.08.x and newer.
diff --git a/docs/syncserver/README.md b/docs/syncserver/README.md
index 8e88441e3..3e717a657 100644
--- a/docs/syncserver/README.md
+++ b/docs/syncserver/README.md
@@ -22,14 +22,15 @@ the build products and runtime dependencies from the rest of your system.
 | **Start-up Time**      | ❌ Slower start-up time due to larger image size           | ✅ Faster start-up time                                   |
 | **Tool Compatibility** | ✅ Compatible with more tools and libraries                | ❌ Compatibility limitations with certain tools           |
 | **Maintenance**        | ❌ Higher maintenance due to larger image and dependencies | ✅ Lower maintenance with minimal base image              |
+| **Custom uid/gid**     | ✅ It's possible to pass in PUID and PGID                  | ❌ PUID and PGID are not supported                        |
 
 # Building image
 
 To proceed with building, you must specify the Anki version you want, by replacing `<version>` with something like `24.11` and `<Dockerfile>` with the chosen Dockerfile (e.g., `Dockerfile` or `Dockerfile.distroless`)
 
 ```bash
-# Execute this command from the root directory of your project
-docker build -f docs/syncserver/<Dockerfile> --no-cache --build-arg ANKI_VERSION=<version> -t anki-sync-server .
+# Execute this command from this directory
+docker build -f <Dockerfile> --no-cache --build-arg ANKI_VERSION=<version> -t anki-sync-server .
 ```
 
 # Run container
@@ -46,7 +47,17 @@ docker run -d \
     anki-sync-server
 ```
 
-However, if you want to have multiple users, you have to use the following approach:
+If the image you are using was built with `Dockerfile` you can specify the
+`PUID` and `PGID` env variables for the user and group id of the process that
+will run the anki-sync-server process. This is valuable when you want the files
+written and read from the `/anki_data` volume to belong to a particular
+user/group e.g. to access it from the host or another container. Note the the
+ids chosen for `PUID` and `PGID` must not already be in use inside the
+container (1000 and above is fine). For example add `-e "PUID=1050"` and `-e
+"PGID=1050"` to the above command.
+
+If you want to have multiple Anki users that can sync their devices, you can
+specify multiple `SYNC_USER` as follows:
 
 ```bash
 # this will create anki server with multiple users
diff --git a/docs/syncserver/entrypoint.sh b/docs/syncserver/entrypoint.sh
new file mode 100644
index 000000000..467e863a5
--- /dev/null
+++ b/docs/syncserver/entrypoint.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+set -o errexit
+set -o nounset
+set -o pipefail
+
+# Default PUID and PGID if not provided
+export PUID=${PUID:-1000}
+export PGID=${PGID:-1000}
+
+# Check if group exists, create if not
+if ! getent group anki-group > /dev/null 2>&1; then
+    addgroup -g "$PGID" anki-group
+fi
+
+# Check if user exists, create if not
+if ! id -u anki > /dev/null 2>&1; then
+    adduser -D -H -u "$PUID" -G anki-group anki
+fi
+
+# Fix ownership of mounted volumes
+mkdir -p /anki_data
+chown anki:anki-group /anki_data
+
+# Run the provided command as the `anki` user
+exec su-exec anki "$@"