Add support to self-hosted instances