diff --git a/Dockerfile.ubuntu-1804 b/Dockerfile.ubuntu-1804
index 5549c2e..785c619 100644
--- a/Dockerfile.ubuntu-1804
+++ b/Dockerfile.ubuntu-1804
@@ -100,7 +100,7 @@ RUN echo "**** Get LinuxGSM Modules ****" \
 RUN echo "**** Create Cronjob ****"
 RUN (crontab -l 2>/dev/null; echo "*/30 * * * * /linuxgsm/*server update > /dev/null 2>&1") | crontab -
 
-HEALTHCHECK --interval=1m --timeout=1m --start-period=15s --retries=1 CMD [ "/linuxgsm/*server monitor" ]
+HEALTHCHECK --interval=1m --timeout=1m --start-period=2m --retries=1 CMD /linuxgsm/*server monitor || exit 1
 
 RUN rm -f /linuxgsm/entrypoint.sh
 COPY entrypoint.sh /linuxgsm/entrypoint.sh
diff --git a/Dockerfile.ubuntu-2004 b/Dockerfile.ubuntu-2004
index 7e87695..517b94f 100644
--- a/Dockerfile.ubuntu-2004
+++ b/Dockerfile.ubuntu-2004
@@ -99,7 +99,7 @@ RUN echo "**** Get LinuxGSM Modules ****" \
 RUN echo "**** Create Cronjob ****"
 RUN (crontab -l 2>/dev/null; echo "*/30 * * * * /linuxgsm/*server update > /dev/null 2>&1") | crontab -
 
-HEALTHCHECK --interval=1m --timeout=1m --start-period=15s --retries=1 CMD [ "/linuxgsm/*server monitor" ]
+HEALTHCHECK --interval=1m --timeout=1m --start-period=2m --retries=1 CMD /linuxgsm/*server monitor || exit 1
 
 RUN rm -f /linuxgsm/entrypoint.sh
 COPY entrypoint.sh /linuxgsm/entrypoint.sh
diff --git a/Dockerfile.ubuntu-2204 b/Dockerfile.ubuntu-2204
index b228c19..a0dc3c7 100644
--- a/Dockerfile.ubuntu-2204
+++ b/Dockerfile.ubuntu-2204
@@ -99,7 +99,7 @@ RUN echo "**** Get LinuxGSM Modules ****" \
 RUN echo "**** Create Cronjob ****"
 RUN (crontab -l 2>/dev/null; echo "*/30 * * * * /linuxgsm/*server update > /dev/null 2>&1") | crontab -
 
-HEALTHCHECK --interval=1m --timeout=1m --start-period=15s --retries=1 CMD [ "/linuxgsm/*server monitor" ]
+HEALTHCHECK --interval=1m --timeout=1m --start-period=2m --retries=1 CMD /linuxgsm/*server monitor || exit 1
 
 RUN rm -f /linuxgsm/entrypoint.sh
 COPY entrypoint.sh /linuxgsm/entrypoint.sh
diff --git a/entrypoint.sh b/entrypoint.sh
index 158ab8c..fc04fa7 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -71,10 +71,10 @@ echo "updating ${GAMESERVER}"
 echo ""
 echo "starting ${GAMESERVER}"
 ./${GAMESERVER} start
-sleep 2
+sleep 5
 ./${GAMESERVER} details
 sleep 2
-tail -f log/script/*
+tail -F log/script/*
 
 # with no command, just spawn a running container suitable for exec's
 if [ $# = 0 ]; then