diff --git a/bsp-files/kickstarts/pre_disk_setup_common.cfg b/bsp-files/kickstarts/pre_disk_setup_common.cfg
index 604d5a99..0a9d2ece 100644
--- a/bsp-files/kickstarts/pre_disk_setup_common.cfg
+++ b/bsp-files/kickstarts/pre_disk_setup_common.cfg
@@ -162,7 +162,12 @@ do
         echo "Wiping partition $part"
         dd if=/dev/zero of=$part bs=512 count=34
         dd if=/dev/zero of=$part bs=512 count=34 seek=$((`blockdev --getsz $part` - 34))
-        parted -s $dev rm $p
+        parted -s $dev rm $part_number
+        # LP 1876374: On some nvme systems udev doesn't correctly remove the
+        # links to the deleted partitions from /dev/nvme* causing them to be
+        # seen as non block devices.
+        sleep 0.3 # Wait for udev to settle
+        rm -f $part # Delete remaining /dev node leftover
     done
     if [ $BACKUP_CREATED -eq 0 ] ; then
         echo "Creating disk label for $dev"