Upgrade production and staging to 6.0