Unable to image Surface Laptop 2 devices

Hi guys,

I am trying to image Microsoft Surface Laptop 2 devices however I am stuck at the step just after re-partitioning the drives.

The error I am seeing is

Last action (Disk Format)
has failed for the following reason:
Unable to find an existing partition on disk 0, with number 1.

If I look at the disks on a new Surface Laptop 2 device, the disk number starts at disk 2. Any thoughts on what I should do?

Here is an MS link which describes the issue but I am unsure on what needs to be done within BigFix to accommodate.
https://support.microsoft.com/en-au/help/4046108/disk0-not-found-when-you-deploy-windows-on-surface

Cheers,
B