Add better tagging (and a cleaner way to add -jdk* versions later)