diff --git a/src/datastore/Datastore.cc b/src/datastore/Datastore.cc
index 681366b4b4..4bf2d61103 100644
--- a/src/datastore/Datastore.cc
+++ b/src/datastore/Datastore.cc
@@ -149,7 +149,6 @@ void Datastore::disk_attribute(
     if (VirtualMachine::is_volatile(disk))
     {
         disk->replace("DISK_TYPE", Image::disk_type_to_str(get_disk_type()));
-        disk->replace("TYPE", Image::disk_type_to_str(get_disk_type()));
     }
 }
 
diff --git a/src/vmm/LibVirtDriverKVM.cc b/src/vmm/LibVirtDriverKVM.cc
index ca39bcaa90..12b0305f4f 100644
--- a/src/vmm/LibVirtDriverKVM.cc
+++ b/src/vmm/LibVirtDriverKVM.cc
@@ -530,9 +530,9 @@ int LibVirtDriver::deployment_description_kvm(
                      << "\t\t\t</auth>\n";
             }
         }
-        else if ( type == "RBD" || type == "RBD_CDROM" )
+        else if ( type == "RBD" || type == "RBD_CDROM" || disk_type == "RBD" )
         {
-            if ( type == "RBD" )
+            if (type == "RBD" || disk_type == "RBD")
             {
                 file << "\t\t<disk type='network' device='disk'>" << endl;
             }