I decided to use @authy this time to manage the 2FA codes, so this becomes less painful when I change phones. You *could* also save screenshots of all the 2FA setup QR codes, if you prefer a simpler method