Move configuration to .env
Merge commit '04f8eb6f4fc36e8c7231aa344f946892fda1121a'