diff --git a/Dockerfile b/Dockerfile
index ee4ee79..39b53a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,8 @@ LABEL maintainer="CrazyMax" \
 
 ENV JLS_PATH="/opt/jetbrains-license-server" \
   JLS_VERSION="20308" \
-  JLS_SHA256="15cd436d41b1af8e273b8f8b037d654a9e9d9ca8a5f188e08426ca1024ba143a"
+  JLS_SHA256="15cd436d41b1af8e273b8f8b037d654a9e9d9ca8a5f188e08426ca1024ba143a" \
+  TZ="UTC"
 
 COPY entrypoint.sh /entrypoint.sh
 
@@ -44,4 +45,4 @@ ENTRYPOINT [ "/entrypoint.sh" ]
 CMD [ "/usr/local/bin/license-server", "run" ]
 
 HEALTHCHECK --interval=10s --timeout=5s \
-  CMD license-server status
+  CMD license-server status || exit 1
diff --git a/entrypoint.sh b/entrypoint.sh
index 24ce01a..51c7e6b 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,17 +1,11 @@
 #!/bin/sh
 
-TZ=${TZ:-UTC}
 JLS_PATH="/opt/jetbrains-license-server"
 JLS_LISTEN_ADDRESS="0.0.0.0"
 JLS_PORT=8000
 JLS_CONTEXT=${JLS_CONTEXT:-/}
 JLS_ACCESS_CONFIG=${JLS_ACCESS_CONFIG:-/data/access-config.json}
 
-# Timezone
-echo "Setting timezone to ${TZ}..."
-ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime
-echo ${TZ} > /etc/timezone
-
 # Init
 echo "Initializing files and folders..."
 mkdir -p /data/registration