diff --git a/ironic_python_agent/shell/write_image.sh b/ironic_python_agent/shell/write_image.sh
index f79d2496e..3f07e07aa 100755
--- a/ironic_python_agent/shell/write_image.sh
+++ b/ironic_python_agent/shell/write_image.sh
@@ -35,8 +35,8 @@ DEVICE="$2"
 
 # In production this will be replaced with secure erasing the drives
 # For now we need to ensure there aren't any old (GPT) partitions on the drive
-log "Erasing existing mbr from ${DEVICE}"
-dd if=/dev/zero of=$DEVICE bs=512 count=10
+log "Erasing existing GPT and MBR data structures from ${DEVICE}"
+sgdisk -Z $DEVICE
 
 log "Imaging $IMAGEFILE to $DEVICE"
 qemu-img convert -t directsync -O host_device $IMAGEFILE $DEVICE