Change to work on custom domain
Changes