diff --git a/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh b/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh
index c2b2426ac33..cc0ede49591 100755
--- a/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh
+++ b/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh
@@ -30,9 +30,8 @@ done
 # eject all CD
 
 
-for vm in $(xe vbd-list type=CD empty=false | grep vm-uuid  | awk '{print $NF}')
+for vmname in $(xe vbd-list type=CD empty=false | grep vm-name-label | awk '{print $NF}')
 do
-  vmname=$(xe vm-param-get uuid=f873bb90-2e86-f7c5-364c-f315ecea826e param-name=name-label)
   xe vm-cd-eject vm=$vmname
   if [ $? -ne 0 ]; then
     echo "Need to eject CD for VM $vmname"