diff --git a/Dockerfile b/Dockerfile
index 2ce4d40..ce89c57 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,34 @@
-FROM steamcmd/steamcmd:ubuntu-22
+FROM steamcmd/steamcmd:ubuntu-24
+
+ENV AUTOSAVENUM="5" \
+    DEBIAN_FRONTEND="noninteractive" \
+    DEBUG="false" \
+    DISABLESEASONALEVENTS="false" \
+    GAMECONFIGDIR="/config/gamefiles/FactoryGame/Saved" \
+    GAMESAVESDIR="/home/steam/.config/Epic/FactoryGame/Saved/SaveGames" \
+    LOG="false" \
+    MAXOBJECTS="2162688" \
+    MAXPLAYERS="4" \
+    MAXTICKRATE="30" \
+    PGID="1000" \
+    PUID="1000" \
+    ROOTLESS="false" \
+    SERVERGAMEPORT="7777" \
+    SERVERSTREAMING="true" \
+    SKIPUPDATE="false" \
+    STEAMAPPID="1690800" \
+    STEAMBETA="false" \
+    TIMEOUT="30" \
+    VMOVERRIDE="false"
 
 # hadolint ignore=DL3008
 RUN set -x \
  && apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y gosu xdg-user-dirs curl jq tzdata --no-install-recommends \
+ && apt-get install -y gosu xdg-user-dirs curl jq tzdata --no-install-recommends \
  && rm -rf /var/lib/apt/lists/* \
- && useradd -ms /bin/bash steam \
+ && userdel ubuntu \
+ && groupadd -r steam -g $PGID \
+ && useradd -ms /bin/bash --no-log-init -r -u $PUID -g $PGID steam \
  && gosu nobody true
 
 RUN mkdir -p /config \
@@ -23,28 +46,8 @@ ARG VERSION="DEV"
 ENV VERSION=$VERSION
 LABEL version=$VERSION
 
-ENV AUTOSAVENUM="5" \
-    DEBUG="false" \
-    DISABLESEASONALEVENTS="false" \
-    GAMECONFIGDIR="/config/gamefiles/FactoryGame/Saved" \
-    GAMESAVESDIR="/home/steam/.config/Epic/FactoryGame/Saved/SaveGames" \
-    LOG="false" \
-    MAXOBJECTS="2162688" \
-    MAXPLAYERS="4" \
-    MAXTICKRATE="30" \
-    PGID="1000" \
-    PUID="1000" \
-    ROOTLESS="false" \
-    SERVERGAMEPORT="7777" \
-    SERVERSTREAMING="true" \
-    SKIPUPDATE="false" \
-    STEAMAPPID="1690800" \
-    STEAMBETA="false" \
-    TIMEOUT="30" \
-    VMOVERRIDE="false"
-
 STOPSIGNAL SIGINT
 
 EXPOSE 7777/udp 7777/tcp
 
-ENTRYPOINT [ "/init.sh" ]
+ENTRYPOINT [ "/init.sh" ]
\ No newline at end of file