diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index debd98849ce..44c87f0e7fc 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -866,7 +866,7 @@ public abstract class CitrixResourceBase implements ServerResource {
             if(  _host.systemvmisouuid == null ) {
                 for( VDI vdi : srr.VDIs ) {
                     VDI.Record vdir = vdi.getRecord(conn);
-                        if(vdir.nameLabel.contains("systemvm")){
+                        if(vdir.nameLabel.contains("systemvm.iso")){
                             _host.systemvmisouuid = vdir.uuid;
                             break;
                      }
diff --git a/scripts/vm/hypervisor/xenserver/setupxenserver.sh b/scripts/vm/hypervisor/xenserver/setupxenserver.sh
index 911dc03b11f..dcbbe2e455e 100755
--- a/scripts/vm/hypervisor/xenserver/setupxenserver.sh
+++ b/scripts/vm/hypervisor/xenserver/setupxenserver.sh
@@ -29,5 +29,7 @@ echo 1048576 >/proc/sys/fs/aio-max-nr
 # empty heartbeat
 cat /dev/null > /opt/xensource/bin/heartbeat
 
+rm -f /opt/xensource/packages/iso/systemvm-premium.iso
+
 echo "success"