diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index 475813b21a..9d0928b9ca 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -107,8 +107,8 @@ RUN \
 # Install any Python wheels
 RUN pip install /wheels/*
 
-ENV NETDATA_PORT 19999
-EXPOSE $NETDATA_PORT
+ENV NETDATA_LISTENER_PORT 19999
+EXPOSE $NETDATA_LISTENER_PORT
 
 ENTRYPOINT ["/usr/sbin/run.sh"]
 
diff --git a/packaging/docker/run.sh b/packaging/docker/run.sh
index 8a2ed8c6c6..726f3849d5 100755
--- a/packaging/docker/run.sh
+++ b/packaging/docker/run.sh
@@ -19,6 +19,6 @@ if [ -n "${PGID}" ]; then
   usermod -a -G "${PGID}" "${DOCKER_USR}" || echo >&2 "Could not add netdata user to group docker with ID ${PGID}"
 fi
 
-exec /usr/sbin/netdata -u "${DOCKER_USR}" -D -s /host -p "${NETDATA_PORT}" -W set web "web files group" root -W set web "web files owner" root "$@"
+exec /usr/sbin/netdata -u "${DOCKER_USR}" -D -s /host -p "${NETDATA_LISTENER_PORT}" -W set web "web files group" root -W set web "web files owner" root "$@"
 
 echo "Netdata entrypoint script, completed!"