diff --git a/entrypoint-healthcheck.sh b/entrypoint-healthcheck.sh
index b749262..96091ac 100755
--- a/entrypoint-healthcheck.sh
+++ b/entrypoint-healthcheck.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-exec gosu ${USERNAME} /app/*server monitor || exit 1
+exec gosu "${USERNAME}" /app/*server monitor || exit 1
diff --git a/entrypoint-user.sh b/entrypoint-user.sh
index e2d4344..c9d3245 100755
--- a/entrypoint-user.sh
+++ b/entrypoint-user.sh
@@ -17,7 +17,7 @@ elif [ -d "/app/lgsm/modules" ]; then
 fi
 
 # Install game server
-if [ -z "$(ls -A -- "serverfiles" 2> /dev/null)" ]; then
+if [ -z "$(ls -A -- "/data/serverfiles" 2> /dev/null)" ]; then
   echo -e ""
   echo -e "Installing ${GAMESERVER}"
   echo -e "================================="