Ensure that we use a configured address, rather than a hardcoded one