ALM-625 use underscore instead of hyphen for ENV variables