diff --git a/entrypoint-healthcheck.sh b/entrypoint-healthcheck.sh
index 2395897..e4a35c9 100755
--- a/entrypoint-healthcheck.sh
+++ b/entrypoint-healthcheck.sh
@@ -1,3 +1,2 @@
-#!/bin/bash
-echo HEALTHCHECK
-exec s6-setuidgid ${USERNAME} /linuxgsm/*server monitor
+#!/usr/bin/with-contenv bas
+exec s6-setuidgid ${USERNAME} /linuxgsm/*server monitor || exit 1
diff --git a/entrypoint-user.sh b/entrypoint-user.sh
index ab92018..344c481 100755
--- a/entrypoint-user.sh
+++ b/entrypoint-user.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-export HOME="/${USERNAME}"
 # Setup game server
 if [ ! -f "${GAMESERVER}" ]; then
   echo -e ""