Follow upgrade recipe to work with latest snapshot