diff --git a/overlay/usr/local/bin/entrypoint b/overlay/usr/local/bin/entrypoint
index ae41926..09fad06 100755
--- a/overlay/usr/local/bin/entrypoint
+++ b/overlay/usr/local/bin/entrypoint
@@ -1,17 +1,20 @@
 #!/usr/bin/env sh
 
+# shellcheck disable=SC3040
 set -eo pipefail
 
+# shellcheck disable=SC1091
+. /usr/local/lib/log.sh
+
 /usr/local/bin/gomplate -o /app/.env -f /etc/templates/env.tmpl
 
-if [ -n "$VAULTWARDEN_DATABASE_URL" ]
-then
+if [ -n "$VAULTWARDEN_DATABASE_URL" ]; then
   WAITFOR_HOST=$(/usr/local/bin/url-parser host --url "$VAULTWARDEN_DATABASE_URL")
   WAITFOR_PORT=$(/usr/local/bin/url-parser port --url "$VAULTWARDEN_DATABASE_URL")
 
-  printf "Wait for database server on '%s:%s' ...\n" "${WAITFOR_HOST}" "${WAITFOR_PORT:-5432}"
+  log_info "Wait for database server on '${WAITFOR_HOST}:${WAITFOR_PORT:-5432}'"
   /usr/local/bin/wait-for "${WAITFOR_HOST}":"${WAITFOR_PORT:-5432}"
 fi
 
-printf "Start Vaultwarden Server ...\n"
+log_info "Start Vaultwarden Server\n"
 exec /app/vaultwarden
diff --git a/overlay/usr/local/bin/healthcheck b/overlay/usr/local/bin/healthcheck
index 78ebb77..cb2ab4b 100755
--- a/overlay/usr/local/bin/healthcheck
+++ b/overlay/usr/local/bin/healthcheck
@@ -1,10 +1,10 @@
 #!/usr/bin/env sh
 
+# shellcheck disable=SC3040
 set -eo pipefail
 
 URL=http://127.0.0.1:8080/alive
 
-wget --quiet --tries=1 --spider ${URL}
-[ $? -ne 0 ] && exit 1
+! wget --quiet --tries=1 --spider ${URL} || exit 1
 
 exit 0