Use the environment variables in the runit script
Merge branch 'hotfix/1.2.2'