Refactor enviroment variables in docker-compose

[blcham]

Enviroment variables should be consistent within docker-compose file and with those in s-pipes docker-compose.