Merge branch 'issue/54' into 'master'

Issue #54: Update config files to use env vars

See merge request !49
1 job for master in 55 seconds (queued for 4 seconds)