Update for CI and demo instances.