diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/host.rb b/src/vmm_mad/remotes/lib/vcenter_driver/host.rb
index 231433361d..cc908f075a 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/host.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/host.rb
@@ -360,7 +360,8 @@ class ClusterComputeResource
             "config.extraConfig", #VM extraconfig info e.g opennebula.vm.running
             "config.hardware.numCPU",
             "config.hardware.memoryMB",
-            "config.annotation"
+            "config.annotation",
+            "datastore"
         ]
 
         filterSpec = RbVmomi::VIM.PropertyFilterSpec(
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 895bd7da4d..68c370444a 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
@@ -603,11 +603,7 @@ class Template
         str << "IMPORT_STATE =\"#{@state}\"\n"
 
         # Get DS information
-        ds_folder = get_dc.datastore_folder
-        ds_name   = self["config.datastoreUrl"][0].name
-        ds_folder.fetch!
-        ds_vcenter_ref = ds_folder.items.select{|_,d| d["name"] == ds_name}.values[0]["_ref"]
-        str << "VCENTER_DS_REF = \"#{ds_vcenter_ref}\"\n"
+        str << "VCENTER_DS_REF = \"#{@vm_info["datastore"].first._ref}\"\n"
 
         vnc_port = nil
         keymap = nil