Changed user for prod
Merge branch 'master' into cleanup-reporting