Support ripe building artist owned infrastructure
Regression #5/222