The Catechism in Questions & Answers

484. Are there any references to Holy Baptism with water in the Old Testament?

Yes, the deliverance of Noah in the ark, which was carried on the water, is a reference to Holy Baptism with water. The sevenfold immersion of Naaman in the water of the Jordan (cf. 2 Kings 5: 1-14) can also be seen as a symbol for the washing away of original sin in baptism.

“...when once the Divine longsuffering waited in the days of Noah, while the ark was being prepared, in which a few, that is, eight souls, were saved through water. There is also an antitype which now saves us—baptism.”
1 Peter 3: 20,21