Software Deployment

I'm trying to take one of our current images and set it up for manual USB stick imaging for "one offs" in some of our remote offices.  The making of the USB stick is no issue but the deployment itself isnt' working seems to be related to how the disk partitioning is working. When I image a system, in this case E7440/7450, and the deployment works fine to these machines.  I am unsure if the original captured image has 2 partitions or 1.  I do know that when finished, the system has a 200mb windows boot partition and the rest is allocated for the C: drive.  This is what we want but I think that the current pre-installation task isn't doing what want because certain machines "break" during the drive creation task. The current task does this:

select disk 0
clean
create partition primary size=200
assign letter="g"
create partition primary
assign letter="c"
active
exit

format /q /y /fs:ntfs /v:System g:
bootsect.exe /NT60 g:
format /q /y /fs:ntfs /v:Windows c:
bootsect.exe /NT60 c:

Select disk  0
Clean
Convert gpt
Create partition efi size=200
Assign letter=s
Format quick fs=FAT32
Create partition msr size=128
Create partition primary
Assign letter=c
Format quick fs=NTFS
Exit