diff --git a/Dockerfile b/Dockerfile
index 61ac401..347edae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG VERSION
 LABEL maintainer="CrazyMax" \
   org.label-schema.build-date=$BUILD_DATE \
   org.label-schema.name="librenms" \
-  org.label-schema.description="LibreNMS based on Alpine Linux and Nginx" \
+  org.label-schema.description="LibreNMS" \
   org.label-schema.version=$VERSION \
   org.label-schema.url="https://github.com/librenms/docker" \
   org.label-schema.vcs-ref=$VCS_REF \
diff --git a/entrypoint.sh b/entrypoint.sh
index 1dd1906..15853ae 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -4,25 +4,25 @@ function runas_librenms() {
   su - librenms -s /bin/sh -c "$1"
 }
 
-TZ=${TZ:-"UTC"}
+TZ=${TZ:-UTC}
 PUID=${PUID:-1000}
 PGID=${PGID:-1000}
 
-MEMORY_LIMIT=${MEMORY_LIMIT:-"256M"}
-UPLOAD_MAX_SIZE=${UPLOAD_MAX_SIZE:-"16M"}
-OPCACHE_MEM_SIZE=${OPCACHE_MEM_SIZE:-"128"}
+MEMORY_LIMIT=${MEMORY_LIMIT:-256M}
+UPLOAD_MAX_SIZE=${UPLOAD_MAX_SIZE:-16M}
+OPCACHE_MEM_SIZE=${OPCACHE_MEM_SIZE:-128}
 
-MEMCACHED_PORT=${MEMCACHED_PORT:-"11211"}
-RRDCACHED_PORT=${RRDCACHED_PORT:-"42217"}
+MEMCACHED_PORT=${MEMCACHED_PORT:-11211}
+RRDCACHED_PORT=${RRDCACHED_PORT:-42217}
 
-LIBRENMS_POLLER_THREADS=${LIBRENMS_POLLER_THREADS:-"16"}
-LIBRENMS_POLLER_INTERVAL=${LIBRENMS_POLLER_INTERVAL:-"5"}
+LIBRENMS_POLLER_THREADS=${LIBRENMS_POLLER_THREADS:-16}
+LIBRENMS_POLLER_INTERVAL=${LIBRENMS_POLLER_INTERVAL:-5}
 
 LIBRENMS_DISTRIBUTED_POLLER_ENABLE=${LIBRENMS_DISTRIBUTED_POLLER_ENABLE:-false}
 LIBRENMS_DISTRIBUTED_POLLER_NAME=${LIBRENMS_DISTRIBUTED_POLLER_NAME:-$(hostname -f)}
 LIBRENMS_DISTRIBUTED_POLLER_GROUP=${LIBRENMS_DISTRIBUTED_POLLER_GROUP:-'0'}
-LIBRENMS_DISTRIBUTED_POLLER_MEMCACHED_HOST=${LIBRENMS_DISTRIBUTED_POLLER_MEMCACHED_HOST:-"${MEMCACHED_HOST}"}
-LIBRENMS_DISTRIBUTED_POLLER_MEMCACHED_PORT=${LIBRENMS_DISTRIBUTED_POLLER_MEMCACHED_PORT:-"${MEMCACHED_PORT}"}
+LIBRENMS_DISTRIBUTED_POLLER_MEMCACHED_HOST=${LIBRENMS_DISTRIBUTED_POLLER_MEMCACHED_HOST:-${MEMCACHED_HOST}}
+LIBRENMS_DISTRIBUTED_POLLER_MEMCACHED_PORT=${LIBRENMS_DISTRIBUTED_POLLER_MEMCACHED_PORT:-${MEMCACHED_PORT}}
 
 LIBRENMS_CRON_DISCOVERY_ENABLE=${LIBRENMS_CRON_DISCOVERY_ENABLE:-true}
 LIBRENMS_CRON_DAILY_ENABLE=${LIBRENMS_CRON_DAILY_ENABLE:-true}
@@ -32,13 +32,13 @@ LIBRENMS_CRON_BILLING_CALCULATE_ENABLE=${LIBRENMS_CRON_BILLING_CALCULATE_ENABLE:
 LIBRENMS_CRON_CHECK_SERVICES_ENABLE=${LIBRENMS_CRON_CHECK_SERVICES_ENABLE:-true}
 LIBRENMS_CRON_POLLER_ENABLE=${LIBRENMS_CRON_POLLER_ENABLE:-true}
 
-DB_PORT=${DB_PORT:-"3306"}
-DB_NAME=${DB_NAME:-"librenms"}
-DB_USER=${DB_USER:-"librenms"}
-DB_TIMEOUT=${DB_TIMEOUT:-"30"}
+DB_PORT=${DB_PORT:-3306}
+DB_NAME=${DB_NAME:-librenms}
+DB_USER=${DB_USER:-librenms}
+DB_TIMEOUT=${DB_TIMEOUT:-30}
 
-MEMCACHED_PORT=${MEMCACHED_PORT:-"11211"}
-RRDCACHED_PORT=${RRDCACHED_PORT:-"42217"}
+MEMCACHED_PORT=${MEMCACHED_PORT:-11211}
+RRDCACHED_PORT=${RRDCACHED_PORT:-42217}
 
 # From https://github.com/docker-library/mariadb/blob/master/docker-entrypoint.sh#L21-L41
 # usage: file_env VAR [DEFAULT]