So what I'm in the process of doing is removing the different

server_facts[environment]

settings, and switching to a single environment.