Mail is upgraded to 20.04, this time successfully but I still have not fixed DKIM / DMARC, will work on that later this evening.