Support ripe building artist owned infrastructure
Regression #2/222