diff --git a/Dockerfile.ubuntu-1804 b/Dockerfile.ubuntu-1804
index fdb45b1..0f0bca7 100644
--- a/Dockerfile.ubuntu-1804
+++ b/Dockerfile.ubuntu-1804
@@ -24,5 +24,15 @@ 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 \
+  && mkdir -p /home/steam/Steam \
+  && chown -R steam:steam /home/steam
+USER steam
+WORKDIR /home/steam
+
 ENTRYPOINT ["steamcmd"]
 CMD ["+help", "+quit"]
+
+# Basic health check: run a no-op steamcmd help then quit
+HEALTHCHECK --interval=30m --timeout=30s --start-period=30s --retries=3 CMD steamcmd +login anonymous +app_info_update 1 +quit > /dev/null 2>&1 || exit 1
diff --git a/Dockerfile.ubuntu-2004 b/Dockerfile.ubuntu-2004
index 3cefb6c..7afdb67 100644
--- a/Dockerfile.ubuntu-2004
+++ b/Dockerfile.ubuntu-2004
@@ -24,5 +24,15 @@ 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 \
+  && mkdir -p /home/steam/Steam \
+  && chown -R steam:steam /home/steam
+USER steam
+WORKDIR /home/steam
+
 ENTRYPOINT ["steamcmd"]
 CMD ["+help", "+quit"]
+
+# Basic health check: run a no-op steamcmd help then quit
+HEALTHCHECK --interval=30m --timeout=30s --start-period=30s --retries=3 CMD steamcmd +login anonymous +app_info_update 1 +quit > /dev/null 2>&1 || exit 1
diff --git a/Dockerfile.ubuntu-2204 b/Dockerfile.ubuntu-2204
index c60604d..0644211 100644
--- a/Dockerfile.ubuntu-2204
+++ b/Dockerfile.ubuntu-2204
@@ -24,5 +24,15 @@ 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 \
+  && mkdir -p /home/steam/Steam \
+  && chown -R steam:steam /home/steam
+USER steam
+WORKDIR /home/steam
+
 ENTRYPOINT ["steamcmd"]
 CMD ["+help", "+quit"]
+
+# Basic health check: run a no-op steamcmd help then quit
+HEALTHCHECK --interval=30m --timeout=30s --start-period=30s --retries=3 CMD steamcmd +login anonymous +app_info_update 1 +quit > /dev/null 2>&1 || exit 1
diff --git a/Dockerfile.ubuntu-2404 b/Dockerfile.ubuntu-2404
index 20a1643..d10ac3f 100644
--- a/Dockerfile.ubuntu-2404
+++ b/Dockerfile.ubuntu-2404
@@ -24,5 +24,15 @@ 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 \
+  && mkdir -p /home/steam/Steam \
+  && chown -R steam:steam /home/steam
+USER steam
+WORKDIR /home/steam
+
 ENTRYPOINT ["steamcmd"]
 CMD ["+help", "+quit"]
+
+# Basic health check: run a no-op steamcmd help then quit
+HEALTHCHECK --interval=30m --timeout=30s --start-period=30s --retries=3 CMD steamcmd +login anonymous +app_info_update 1 +quit > /dev/null 2>&1 || exit 1
diff --git a/README.md b/README.md
index 9c0e490..1f96b56 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ SteamCMD is a command-line version of the Steam client. It allows you to downloa
 
 ## Usage
 
-docker cli
+Docker cli
 
 ```bash
 docker run -it gameservermanagers/steamcmd:latest