diff --git a/src/tm_mad/vcenter/clone b/src/tm_mad/vcenter/clone
index c081844242..067b0fcbca 100755
--- a/src/tm_mad/vcenter/clone
+++ b/src/tm_mad/vcenter/clone
@@ -93,7 +93,7 @@ begin
 
     # Unmanaged disks are those with OPENNEBULA_MANAGED=NO or volatile disks
     # that are created in StorageDRS clusters
-    unmanaged_disk = (!!disk['OPENNEBULA_MANAGED'] && disk['OPENNEBULA_MANAGED'] == "NO") ||
+    unmanaged_disk = (!!disk['OPENNEBULA_MANAGED'] && disk['OPENNEBULA_MANAGED'].downcase == "no") ||
                      (target_ds_ref.start_with?('group-') && !!disk["TYPE"] && disk["TYPE"].downcase == "fs")
 
     if !unmanaged_disk
diff --git a/src/tm_mad/vcenter/cpds b/src/tm_mad/vcenter/cpds
index 4fe55697db..b2c57b113f 100755
--- a/src/tm_mad/vcenter/cpds
+++ b/src/tm_mad/vcenter/cpds
@@ -79,7 +79,7 @@ begin
     source_ds_ref = ""
 
     # If disk is unmanaged get the reference from template
-    if disk["OPENNEBULA_MANAGED"] && disk["OPENNEBULA_MANAGED"] == "NO"
+    if disk["OPENNEBULA_MANAGED"] && disk["OPENNEBULA_MANAGED"].downcase == "no"
         unmanaged_keys = vm.get_unmanaged_keys
         device_key = unmanaged_keys["opennebula.disk.#{disk["DISK_ID"]}"].to_i
         image_path, source_ds_ref = vm.get_device_filename_and_ds_from_key(device_key)
diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
index 7eef343f3a..52444325d4 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
@@ -1212,7 +1212,7 @@ class VirtualMachine < Template
         device_change = []
 
         # Get unmanaged disks in OpenNebula's VM template
-        xpath = "TEMPLATE/DISK[OPENNEBULA_MANAGED=\"NO\"]"
+        xpath = "TEMPLATE/DISK[OPENNEBULA_MANAGED=\"NO\" or OPENNEBULA_MANAGED=\"no\"]"
         unmanaged_disks = one_item.retrieve_xmlelements(xpath)
 
         if !unmanaged_disks.empty?
@@ -1241,7 +1241,7 @@ class VirtualMachine < Template
         end
 
         # Add info for existing nics in template in vm xml
-        xpath = "TEMPLATE/NIC[OPENNEBULA_MANAGED=\"NO\"]"
+        xpath = "TEMPLATE/NIC[OPENNEBULA_MANAGED=\"NO\" or OPENNEBULA_MANAGED=\"no\"]"
         unmanaged_nics = one_item.retrieve_xmlelements(xpath)
 
         if !unmanaged_nics.empty?
@@ -1273,7 +1273,7 @@ class VirtualMachine < Template
         vc_disks = get_vcenter_disks
 
         # Look for unmanaged disks with original size changed
-        xpath = "TEMPLATE/DISK[OPENNEBULA_MANAGED=\"NO\" and boolean(ORIGINAL_SIZE)]"
+        xpath = "TEMPLATE/DISK[(OPENNEBULA_MANAGED=\"NO\" or OPENNEBULA_MANAGED=\"no\") and boolean(ORIGINAL_SIZE) and ORIGINAL_SIZE != SIZE]"
         unmanaged_resized_disks = one_item.retrieve_xmlelements(xpath)
 
         return if unmanaged_resized_disks.empty?