Adapt to new infrastructure
Merge pull request #234 from geoadmin/dev_new_infra

Adapt to new infrastructure