Support ripe building artist owned infrastructure
Regression #23/222