This commit makes it easier to make changes to the instance config without worrying about overwriting secrets and database configuration. It also mitigates some possibility of leaking secrets.
