diff --git a/Dockerfile.ubuntu-2004 b/Dockerfile.ubuntu-2004
index 9e694cf..2159d38 100644
--- a/Dockerfile.ubuntu-2004
+++ b/Dockerfile.ubuntu-2004
@@ -1,6 +1,8 @@
 FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
+ARG PUID=1000
+ARG PGID=1000
 ARG BUILD_DATE
 ARG VCS_REF
 
@@ -34,8 +36,9 @@ RUN locale-gen en_US.UTF-8
 ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US:en
 
-# Create non-root user
-RUN useradd -m -d /home/steam -s /bin/bash steam \
+# Create non-root user/group with configurable IDs
+RUN groupadd -g "${PGID}" steam \
+  && useradd -l -u "${PUID}" -g steam -m -d /home/steam -s /bin/bash steam \
   && mkdir -p /home/steam/Steam \
   && chown -R steam:steam /home/steam
 USER steam
diff --git a/Dockerfile.ubuntu-2204 b/Dockerfile.ubuntu-2204
index 03d2f75..abecfe7 100644
--- a/Dockerfile.ubuntu-2204
+++ b/Dockerfile.ubuntu-2204
@@ -1,6 +1,8 @@
 FROM ubuntu:22.04
 
 ARG DEBIAN_FRONTEND=noninteractive
+ARG PUID=1000
+ARG PGID=1000
 ARG BUILD_DATE
 ARG VCS_REF
 
@@ -34,8 +36,9 @@ RUN locale-gen en_US.UTF-8
 ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US:en
 
-# Create non-root user
-RUN useradd -m -d /home/steam -s /bin/bash steam \
+# Create non-root user/group with configurable IDs
+RUN groupadd -g "${PGID}" steam \
+  && useradd -l -u "${PUID}" -g steam -m -d /home/steam -s /bin/bash steam \
   && mkdir -p /home/steam/Steam \
   && chown -R steam:steam /home/steam
 USER steam
diff --git a/Dockerfile.ubuntu-2404 b/Dockerfile.ubuntu-2404
index decbfb5..8af22a2 100644
--- a/Dockerfile.ubuntu-2404
+++ b/Dockerfile.ubuntu-2404
@@ -1,6 +1,8 @@
 FROM ubuntu:24.04
 
 ARG DEBIAN_FRONTEND=noninteractive
+ARG PUID=1000
+ARG PGID=1000
 ARG BUILD_DATE
 ARG VCS_REF
 
@@ -35,7 +37,8 @@ ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US:en
 
 # Create non-root user
-RUN useradd -m -d /home/steam -s /bin/bash steam \
+RUN groupadd -g "${PGID}" steam \
+  && useradd -l -u "${PUID}" -g steam -m -d /home/steam -s /bin/bash steam \
   && mkdir -p /home/steam/Steam \
   && chown -R steam:steam /home/steam
 USER steam