Support ripe building artist owned infrastructure
Regression #58/222