Support ripe building artist owned infrastructure
Regression #7/222