Better separation and versioning per host