Support ripe building artist owned infrastructure
Regression #45/222