diff --git a/src/vmm/LibVirtDriverKVM.cc b/src/vmm/LibVirtDriverKVM.cc
index 29c1b5eb1f..4952f733f6 100644
--- a/src/vmm/LibVirtDriverKVM.cc
+++ b/src/vmm/LibVirtDriverKVM.cc
@@ -339,20 +339,20 @@ int LibVirtDriver::deployment_description_kvm(
         if ( type == "BLOCK" )
         {
             file << "\t\t<disk type='block' device='disk'>" << endl
-                 << "\t\t\t<source dev='" << vm->get_remote_dir() << "/disk."
-                 << i << "'/>" << endl;
+                 << "\t\t\t<source dev='" << vm->get_remote_system_dir() 
+                 << "/disk." << i << "'/>" << endl;
         }
         else if ( type == "CDROM" )
         {
             file << "\t\t<disk type='file' device='cdrom'>" << endl
-                 << "\t\t\t<source file='" << vm->get_remote_dir() << "/disk."
-                 << i << "'/>" << endl;
+                 << "\t\t\t<source file='" << vm->get_remote_system_dir() 
+                 << "/disk." << i << "'/>" << endl;
         }
         else
         {
             file << "\t\t<disk type='file' device='disk'>" << endl
-                 << "\t\t\t<source file='" << vm->get_remote_dir() << "/disk."
-                 << i << "'/>" << endl;
+                 << "\t\t\t<source file='" << vm->get_remote_system_dir() 
+                 << "/disk." << i << "'/>" << endl;
         }
 
         // ---- target device to map the disk ----
@@ -419,8 +419,10 @@ int LibVirtDriver::deployment_description_kvm(
         if ( !target.empty() )
         {
             file << "\t\t<disk type='file' device='cdrom'>" << endl;
-            file << "\t\t\t<source file='" << vm->get_remote_dir() << "/disk."
-                 << num << "'/>" << endl;
+
+            file << "\t\t\t<source file='" << vm->get_remote_system_dir() 
+                 << "/disk." << num << "'/>" << endl;
+
             file << "\t\t\t<target dev='" << target << "'/>" << endl;
             file << "\t\t\t<readonly/>" << endl;
 
diff --git a/src/vmm/XenDriver.cc b/src/vmm/XenDriver.cc
index 0e5fa0bee6..0add29a1d9 100644
--- a/src/vmm/XenDriver.cc
+++ b/src/vmm/XenDriver.cc
@@ -281,7 +281,7 @@ int XenDriver::deployment_description(
             }
         }
 
-        file << vm->get_remote_dir() << "/disk." << i << ","
+        file << vm->get_remote_system_dir() << "/disk." << i << ","
              << target << ","
              << mode
              << "'," << endl;
@@ -312,7 +312,7 @@ int XenDriver::deployment_description(
                 file << default_driver;
             }
 
-            file << vm->get_remote_dir() << "/disk." << num <<","<< target <<","
+            file << vm->get_remote_system_dir() << "/disk." << num <<","<< target <<","
                  << "r'," << endl;
         }
         else