diff --git a/src/vmm_mad/exec/one_vmm_exec.rb b/src/vmm_mad/exec/one_vmm_exec.rb
index fb3f1aa7f0..a8e132bc77 100755
--- a/src/vmm_mad/exec/one_vmm_exec.rb
+++ b/src/vmm_mad/exec/one_vmm_exec.rb
@@ -516,6 +516,8 @@ class ExecDriver < VirtualMachineDriver
         disk_xpath = "VM/TEMPLATE/DISK[DISK_ID='#{disk_id}']/TARGET"
         target     = ensure_xpath(xml_data, id, action, disk_xpath) || return
 
+        target_index = target.downcase[-1..-1].unpack('c').first - 97
+
         action = VmmAction.new(self, id, :attach_disk, drv_message)
 
         steps = [
@@ -529,7 +531,12 @@ class ExecDriver < VirtualMachineDriver
             {
                 :driver       => :vmm,
                 :action       => :attach_disk,
-                :parameters   => [:deploy_id, :disk_target_path, target]
+                :parameters   => [
+                        :deploy_id,
+                        :disk_target_path,
+                        target,
+                        target_index
+                ]
             }
         ]
 
@@ -549,6 +556,8 @@ class ExecDriver < VirtualMachineDriver
         disk_xpath = "VM/TEMPLATE/DISK[DISK_ID='#{disk_id}']/TARGET"
         target     = ensure_xpath(xml_data, id, action, disk_xpath) || return
 
+        target_index = target.downcase[-1..-1].unpack('c').first - 97
+
         action = VmmAction.new(self, id, :detach_disk, drv_message)
 
         steps = [
@@ -556,7 +565,12 @@ class ExecDriver < VirtualMachineDriver
             {
                 :driver       => :vmm,
                 :action       => :attach_disk,
-                :parameters   => [:deploy_id, target]
+                :parameters   => [
+                        :deploy_id,
+                        :disk_target_path,
+                        target,
+                        target_index
+                ]
             },
             # Perform an EPILOG on the disk
             {
diff --git a/src/vmm_mad/remotes/kvm/attach_disk b/src/vmm_mad/remotes/kvm/attach_disk
index 995c63c47b..99f63f8709 100755
--- a/src/vmm_mad/remotes/kvm/attach_disk
+++ b/src/vmm_mad/remotes/kvm/attach_disk
@@ -22,6 +22,7 @@ source $(dirname $0)/../../scripts_common.sh
 DOMAIN="$1"
 SOURCE="$2"
 TARGET="$3"
+TARGET_INDEX="$4"
 
 ATTACH_PARAMS="--domain $DOMAIN --source $SOURCE --target $TARGET"
 
diff --git a/src/vmm_mad/remotes/kvm/detach_disk b/src/vmm_mad/remotes/kvm/detach_disk
index b270dfcd1a..9eac2eddb7 100755
--- a/src/vmm_mad/remotes/kvm/detach_disk
+++ b/src/vmm_mad/remotes/kvm/detach_disk
@@ -20,7 +20,9 @@ source $(dirname $0)/kvmrc
 source $(dirname $0)/../../scripts_common.sh
 
 DOMAIN="$1"
-TARGET="$2"
+SOURCE="$2"
+TARGET="$3"
+TARGET_INDEX="$4"
 
 DETACH_PARAMS="--domain $DOMAIN --target $TARGET"