Optiplex 5040 UEFI cannot add new boot disk .efi path

All attempts to add a new boot disk with the location of:
/EFI/qubes/xen.efi
fail.
On reboot the location of the boot disk is found set to:
\EFI\BOOT\BOOTX64.EFI

Also,
Using efibootmgr sets the correct data:
efibootmgr -v -c -u -L Qubes -l /EFI/qubes/xen.efi -d /dev/sda -p 1 "placeholer /mapbs /noexitboot"
but the disk and location entries are reset to:
\EFI\BOOT\BOOTX64.EFI