diff --git a/core/storage/__init__.py b/core/storage/__init__.py
index ef8b27e0..f835d964 100644
--- a/core/storage/__init__.py
+++ b/core/storage/__init__.py
@@ -57,12 +57,6 @@ class QubesVmStorage(object):
         else:
             self.root_img_size = defaults['root_img_size']
 
-        self.private_img = vm.absolute_path(vm_files["private_img"], None)
-        if self.vm.template:
-            self.root_img = self.vm.template.root_img
-        else:
-            self.root_img = vm.absolute_path(vm_files["root_img"], None)
-        self.volatile_img = vm.absolute_path(vm_files["volatile_img"], None)
 
         # For now compute this path still in QubesVm
         self.modules_img = modules_img
diff --git a/core/storage/xen.py b/core/storage/xen.py
index 1647eeb8..63d856e9 100644
--- a/core/storage/xen.py
+++ b/core/storage/xen.py
@@ -64,6 +64,13 @@ class XenStorage(QubesVmStorage):
         else:
             self.rootcow_img = None
 
+        self.private_img = os.path.join(vmdir, 'private.img')
+        if self.vm.template:
+            self.root_img = self.vm.template.root_img
+        else:
+            self.root_img = os.path.join(vmdir, 'root.img')
+        self.volatile_img = os.path.join(vmdir, 'volatile.img')
+
     def _format_disk_dev(self, path, script, vdev, rw=True, type="disk", domain=None):
         if path is None:
             return ''