diff --git a/src/image_mad/remotes/fs/cp b/src/image_mad/remotes/fs/cp
index bbb2a67783..0c96ae96d5 100755
--- a/src/image_mad/remotes/fs/cp
+++ b/src/image_mad/remotes/fs/cp
@@ -61,6 +61,11 @@ vmware://*)
 
     exec_and_log "cp -rf $SRC $DST" \
         "Error copying $SRC to $DST"
+    
+    BASE_DISK_FILE=`ls $DST | grep -v '.*-s[0-9]*\.vmdk'`
+
+    exec_and_log "mv $BASE_DISK_FILE $DST/disk.vmdk" \
+        "Error renaming disk file $BASE_DISK_FILE to disk.vmdk"
 
     exec_and_log "chmod 0770 $DST"
     ;;