XD-1371: Make use of env vars more explicit