Support ripe building artist owned infrastructure
Regression #21/222