Yeah, it should be in this file whenever possible. The env-sample file is an example of the environment vars that we still need to set in order for the values to be put in the secrets.yml file, so I don't think we can get rid of that.