ENV vars fixes and docker adjustments