Life vest for 22 lbs!

Need recommendations for a life vest for my 22lb baby! Also for my son who’s 36lbs, I was thinking of a puddle jumper as his regular vest just is not working, but I see all these bad things about them and how they teach them to be upright. We rarely go swimming so it’s not like he’ll be building muscle memory or anything, but I do want something that will actually keep him afloat unlike the vest we have!