For UEFI please check the other thread I started on this forum.

https://ubuntuforums.org/showthread.php?t=2448722