How to replace hard drive and convert dual-boot system to Ubuntu only?

Question

This pc started as my first Ubuntu daily driver when I transitioned from Windows, it's a dual-boot UEFI 64-bit system with Windows 8 (original system) and Ubuntu 18.04.5. Secure Boot is disabled.

Here is the current partition setup for the 2 disks.

I haven't booted it into Windows for three or four years now, and sda is showing some issues on SMART, so it's time to replace it. I'd like to get rid of Windows in the same operation. Here's my proposed final config.

So, how to get from "current" to "final"? Here is my plan, asking if it won't work and how to fix the plan if it's wrong.

1. Clonezilla the UEFI system partition and the data partition to our samba server.
2. Use gparted to set the new hard-drive up as gpt and make the partitions.
3. Clonezilla the partitions to the new drive.
4. Swap out the drives in the pc.
5. Boot the pc with a live USB.
6. update-grub with bind mounts and chroot like in this answer
7. Update the fstab to include the data partition's new UUID
8. Profit?

One thing I'm not sure of, do I need to do a grub-install? I'm not sure what that does on UEFI systems. If it just fills in the UEFI system partition, seems like I wouldn't need to since I cloned it.

Answer 1

I executed the above procedure and it worked. There was still a Windows entry in grub, though. I had to go into /boot/efi/EFI/Microsoft/Boot and rename bootmgfw.efi to keep grub from finding a windows install. I also used efibootmgr to remove the Windows entry.

I believe windows is gone forever now from the pc.