Support ripe building artist owned infrastructure
Regression #14/222