Adds support for HOSTNAME env