more env variables
Merge branch 'release/public-3'

* release/public-3:
  more env variables