diff --git a/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh b/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh
index 194413b9088..fc57c550f59 100755
--- a/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh
+++ b/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh
@@ -41,8 +41,18 @@ do
   fi
 done
 
+# eject all CD
 
 
+for vm in $(xe vbd-list type=CD empty=false | grep vm-uuid  | 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"
+  fi
+done
+
 # fake PV for PV VM
 
 fake_pv_driver() {