Support ripe building artist owned infrastructure
Regression #27/222