Revert "Revert "Feat!: Update JJB version to 6x""