Support ripe building artist owned infrastructure
Regression #32/222