PWEB-4742 Use new staging layout