Support ripe building artist owned infrastructure
Regression #4/222