Fix up staging esr24 config so staging build master works out of the box