Support ripe building artist owned infrastructure
Regression #57/222