Support ripe building artist owned infrastructure
Regression #20/222