Upgrade OCW to fix tag persistence issue