Don't be scared of a big number, since 2018 they do 2 releases each year.
You've probably done most of the work if you've already made that jump, as that's often the hardest transition.
I laughed. Jump straight to 25 next! It's awesome!
Just one more push to Java 17; from there on it should be smooth sailing. I hope you have built up a comprehensive regression test suite as part of the migration.