diff --git a/builds/amd64/installer/legacy/builds/amd64-installer.sh b/builds/amd64/installer/legacy/builds/amd64-installer.sh
index 8bce42b0..a75ba06d 100644
--- a/builds/amd64/installer/legacy/builds/amd64-installer.sh
+++ b/builds/amd64/installer/legacy/builds/amd64-installer.sh
@@ -143,12 +143,16 @@ do_handle_partitions()
 
   installer_say "Examining $DEV part $part"
 
-  if [ "$label" = "ONIE-BOOT" ] || [ "$label" = "PLATFORM-DIAG" ] || [ "$label" = "GRUB-BOOT" ]; then
-      installer_say "Partition $DEV$part: $label: Preserving..."
-  else
-      installer_say "Partition $DEV$part: $label: Deleting..."
-      parted $DEV rm $part || return 1
-  fi
+
+  case "$label" in
+      ONIE-BOOT|GRUB-BOOT|*-DIAG)
+          installer_say "Partition $DEV$part: $label: Preserving..."
+          ;;
+      *)
+          installer_say "Partition $DEV$part: $label: Deleting..."
+          parted $DEV rm $part || return 1
+          ;;
+  esac
 
   return 0
 }