Should be more secure, and avoid generating potentially confusing data

Trying to figure out why tests are broken in CI

This should ensure that passwords don't refer to old host names if they
are renamed, for example during discovery