Absolutely yes, Senators should get 2 full terms (12 years) and House Members get the same 6 terms (12 years) in a lifetime. That’s it, and if you run for another office such as Governor or President you forfeit your current position when you file the paperwork to run.
I would prefer even less time for so many of these bums.