96 Tj front axle swap

I have a 97 TJ with a U-joint front axle. Can I put axles from a later CV style axle in my housing ? Or should I swap out the whole housing? What year or P/N housing or axles would I be looking for?