Support ripe building artist owned infrastructure
Regression #24/222