diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index 02ddfdea50d..a1d29659da1 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -2035,11 +2035,11 @@ class VirtualMachine : public PoolObjectSQL
      *  netowrking updates.
      *    @param context attribute of the VM
      *    @param error string if any
-     *    @param  only_auto boolean to generate context only for vnets 
+     *    @param  only_auto boolean to generate context only for vnets
      *            with NETWORK_MODE = auto
      *    @return 0 on success
      */
-    int generate_network_context(VectorAttribute * context, string& error, 
+    int generate_network_context(VectorAttribute * context, string& error,
             bool only_auto);
 
     /**
diff --git a/include/VirtualMachineDisk.h b/include/VirtualMachineDisk.h
index eb9fb0cccb8..ed26f369fe1 100644
--- a/include/VirtualMachineDisk.h
+++ b/include/VirtualMachineDisk.h
@@ -154,7 +154,7 @@ class VirtualMachineDisk : public VirtualMachineAttribute
     /**
      *  Return the TM_MAD_SYSTEM attribute
      */
-    std::string get_tm_mad_system();
+    std::string get_tm_mad_system() const;
 
     /* ---------------------------------------------------------------------- */
     /* Image Manager Interface                                                */
diff --git a/src/tm/TransferManager.cc b/src/tm/TransferManager.cc
index db8d8d369cf..ba25df2926d 100644
--- a/src/tm/TransferManager.cc
+++ b/src/tm/TransferManager.cc
@@ -423,14 +423,18 @@ int TransferManager::prolog_transfer_command(
         // <CLONE|LN> tm_mad fe:SOURCE host:remote_system_ds/disk.i vmid dsid
         if (clon == "YES")
         {
-            xfr << "CLONE ";
+            xfr << "CLONE";
         }
         else
         {
-            xfr << "LN ";
+            xfr << "LN";
         }
 
-        xfr << tm_mad << " ";
+        std::string tsys = disk->get_tm_mad_system();
+
+        xfr << "." << tsys;
+
+        xfr << " " << tm_mad << " ";
 
         if ( source.find(":") == string::npos ) //Regular file
         {
@@ -1121,7 +1125,14 @@ void TransferManager::epilog_transfer_command(
             return;
         }
 
-        //MVDS tm_mad hostname:remote_system_dir/disk.0 <fe:SOURCE|SOURCE> vmid dsid
+
+        string tsys = disk->vector_value("TM_MAD_SYSTEM");
+        if (!tsys.empty())
+        {
+            tm_mad = tm_mad + "." + tsys;
+        }
+
+        //MVDS tm_mad.(tm_mad_system) hostname:remote_system_dir/disk.0 <fe:SOURCE|SOURCE> vmid dsid
         xfr << "MVDS "
             << tm_mad << " "
             << host << ":" << vm->get_system_dir() << "/disk." << disk_id << " "
@@ -1148,6 +1159,12 @@ void TransferManager::epilog_transfer_command(
             vv_rc  = disk->vector_value("DATASTORE_ID", ds_id_i);
         }
 
+        string tsys = disk->vector_value("TM_MAD_SYSTEM");
+        if (!tsys.empty())
+        {
+            tm_mad = tm_mad + "." + tsys;
+        }
+
         if ( !tm_mad.empty() && vv_rc == 0)
         {
             //DELETE tm_mad hostname:remote_system_dir/disk.i vmid ds_id
@@ -1487,7 +1504,13 @@ int TransferManager::epilog_delete_commands(VirtualMachine *vm,
             }
         }
 
-        //DELETE tm_mad host:remote_system_dir/disk.i vmid dsid(image)
+        string tsys = (*disk)->vector_value("TM_MAD_SYSTEM");
+        if (!tsys.empty())
+        {
+            tm_mad = tm_mad + "." + tsys;
+        }
+
+        //DELETE tm_mad(.tm_mad_system) host:remote_system_dir/disk.i vmid dsid(image)
         // *local* DELETE tm_mad fe:system_dir/disk.i vmid dsid(image)
         // *prev*  DELETE tm_mad prev_host:remote_system_dir/disk.i vmid ds_id(image)
         xfr << "DELETE "
@@ -2154,6 +2177,12 @@ void TransferManager::resize_command(VirtualMachine * vm,
         ds_id  = disk->vector_value("DATASTORE_ID");
     }
 
+    string tsys = disk->vector_value("TM_MAD_SYSTEM");
+    if (!tsys.empty())
+    {
+        tm_mad = tm_mad + "." + tsys;
+    }
+
     //RESIZE tm_mad host:remote_system_dir/disk.i size vmid dsid
     xfr << "RESIZE "
         << tm_mad << " "
diff --git a/src/tm_mad/ceph/clone b/src/tm_mad/ceph/clone
index 888059eb2ad..6d1fc72ed15 100755
--- a/src/tm_mad/ceph/clone
+++ b/src/tm_mad/ceph/clone
@@ -74,15 +74,13 @@ done < <(onevm show -x $VM_ID| $XPATH  \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_KEY \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_CONF \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SIZE \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/ORIGINAL_SIZE \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/TYPE )
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/ORIGINAL_SIZE )
 
 CEPH_USER="${XPATH_ELEMENTS[j++]}"
 CEPH_KEY="${XPATH_ELEMENTS[j++]}"
 CEPH_CONF="${XPATH_ELEMENTS[j++]}"
 SIZE="${XPATH_ELEMENTS[j++]}"
 ORIGINAL_SIZE="${XPATH_ELEMENTS[j++]}"
-TYPE="${XPATH_ELEMENTS[j++]}"
 
 #-------------------------------------------------------------------------------
 # Get Datastore information
@@ -117,49 +115,26 @@ if [ -n "$EC_POOL_NAME" ]; then
     EC_POOL_OPT="--data-pool ${EC_POOL_NAME}"
 fi
 
-if [ "${TYPE}" = 'FILE' ]; then
-    ssh_make_path $DST_HOST $DST_DIR 'ssh'
+CLONE_CMD=$(cat <<EOF
+    RBD="${RBD}"
 
-    CLONE_CMD=$(cat <<EOF
-        RBD="${RBD}"
+    $RBD info $RBD_DST >/dev/null 2>&1 && exit 0
 
-        rbd_make_snap $SRC_PATH
+    rbd_make_snap $SRC_PATH
 
-        set -e -o pipefail
+    set -e -o pipefail
 
-        if [ "\$(rbd_format $SRC_PATH)" = "2" ]; then
-            $RBD export "$SRC_PATH@snap" $DST_PATH
-        else
-            $RBD export $SRC_PATH $DST_PATH
-        fi
+    if [ "\$(rbd_format $SRC_PATH)" = "2" ]; then
+        $RBD ${EC_POOL_OPT} clone "$SRC_PATH@snap" $RBD_DST
+    else
+        $RBD copy $SRC_PATH $RBD_DST
+    fi
 
-        if [ -n "$ORIGINAL_SIZE" -a "$SIZE" -gt "$ORIGINAL_SIZE" ]; then
-            qemu-img resize ${DST_PATH} ${SIZE}M
-        fi
+    if [ -n "$ORIGINAL_SIZE" -a "$SIZE" -gt "$ORIGINAL_SIZE" ]; then
+        $RBD resize $RBD_DST --size $SIZE
+    fi
 EOF
 )
-else
-    CLONE_CMD=$(cat <<EOF
-        RBD="${RBD}"
-
-        $RBD info $RBD_DST >/dev/null 2>&1 && exit 0
-
-        rbd_make_snap $SRC_PATH
-
-        set -e -o pipefail
-
-        if [ "\$(rbd_format $SRC_PATH)" = "2" ]; then
-            $RBD ${EC_POOL_OPT} clone "$SRC_PATH@snap" $RBD_DST
-        else
-            $RBD copy $SRC_PATH $RBD_DST
-        fi
-
-        if [ -n "$ORIGINAL_SIZE" -a "$SIZE" -gt "$ORIGINAL_SIZE" ]; then
-            $RBD resize $RBD_DST --size $SIZE
-        fi
-EOF
-)
-fi
 
 ssh_exec_and_log_stdin "$DST_HOST" "$CLONE_CMD" "$CEPH_UTILS" \
                  "Error cloning $SRC_PATH to $RBD_DST in $DST_HOST"
diff --git a/src/tm_mad/ceph/clone.ssh b/src/tm_mad/ceph/clone.ssh
new file mode 100644
index 00000000000..1517d91192a
--- /dev/null
+++ b/src/tm_mad/ceph/clone.ssh
@@ -0,0 +1,124 @@
+#!/bin/bash
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
+# not use this file except in compliance with the License. You may obtain    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+# clone.ssh fe:SOURCE host:remote_system_ds/disk.i size
+#   - fe is the front-end hostname
+#   - SOURCE is the path of the disk image in the form DS_BASE_PATH/disk
+#   - host is the target host to deploy the VM
+#   - remote_system_ds is the path for the system datastore in the host
+
+SRC=$1
+DST=$2
+VM_ID=$3
+DS_ID=$4
+
+#--------------------------------------------------------------------------------
+
+if [ -z "${ONE_LOCATION}" ]; then
+    TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
+    LIB_LOCATION=/usr/lib/one
+else
+    TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
+    LIB_LOCATION=$ONE_LOCATION/lib
+fi
+
+DRIVER_PATH=$(dirname $0)
+
+source $TMCOMMON
+source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
+
+CEPH_UTILS=${DRIVER_PATH}/../../datastore/ceph/ceph_utils.sh
+
+#-------------------------------------------------------------------------------
+# Compute the destination image name
+#-------------------------------------------------------------------------------
+
+DST_HOST=`arg_host $DST`
+
+SRC_PATH=`arg_path $SRC`
+DST_PATH=`arg_path $DST`
+
+DST_DIR=`dirname $DST_PATH`
+
+DISK_ID=$(echo $DST|awk -F. '{print $NF}')
+RBD_DST="${SRC_PATH}-${VM_ID}-${DISK_ID}"
+
+#-------------------------------------------------------------------------------
+# Get Image information
+#-------------------------------------------------------------------------------
+
+XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
+
+unset i j XPATH_ELEMENTS
+
+while IFS= read -r -d '' element; do
+        XPATH_ELEMENTS[i++]="$element"
+done < <(onevm show -x $VM_ID| $XPATH  \
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_USER \
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_KEY \
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_CONF \
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SIZE \
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/ORIGINAL_SIZE)
+
+CEPH_USER="${XPATH_ELEMENTS[j++]}"
+CEPH_KEY="${XPATH_ELEMENTS[j++]}"
+CEPH_CONF="${XPATH_ELEMENTS[j++]}"
+SIZE="${XPATH_ELEMENTS[j++]}"
+ORIGINAL_SIZE="${XPATH_ELEMENTS[j++]}"
+
+#-------------------------------------------------------------------------------
+# Create @snap and export it
+#-------------------------------------------------------------------------------
+
+if [ -n "$CEPH_USER" ]; then
+    RBD="$RBD --id ${CEPH_USER}"
+fi
+
+if [ -n "$CEPH_KEY" ]; then
+    RBD="$RBD --keyfile ${CEPH_KEY}"
+fi
+
+if [ -n "$CEPH_CONF" ]; then
+    RBD="$RBD --conf ${CEPH_CONF}"
+fi
+
+
+ssh_make_path $DST_HOST $DST_DIR 'ssh'
+
+CLONE_CMD=$(cat <<EOF
+    RBD="${RBD}"
+
+    rbd_make_snap $SRC_PATH
+
+    set -e -o pipefail
+
+    if [ "\$(rbd_format $SRC_PATH)" = "2" ]; then
+        $RBD export "$SRC_PATH@snap" $DST_PATH
+    else
+        $RBD export $SRC_PATH $DST_PATH
+    fi
+
+    if [ -n "$ORIGINAL_SIZE" -a "$SIZE" -gt "$ORIGINAL_SIZE" ]; then
+        qemu-img resize ${DST_PATH} ${SIZE}M
+    fi
+EOF
+)
+
+ssh_exec_and_log_stdin "$DST_HOST" "$CLONE_CMD" "$CEPH_UTILS" \
+                 "Error cloning $SRC_PATH to $RBD_DST in $DST_HOST"
+exit 0
diff --git a/src/tm_mad/ceph/delete b/src/tm_mad/ceph/delete
index f0937e9dd6f..fa2033ea9a7 100755
--- a/src/tm_mad/ceph/delete
+++ b/src/tm_mad/ceph/delete
@@ -115,8 +115,7 @@ done < <(onevm show -x $VM_ID | $XPATH \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_USER \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_KEY \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_CONF \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/POOL_NAME \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/TYPE )
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/POOL_NAME)
 
 SRC="${XPATH_ELEMENTS[j++]}"
 CLONE="${XPATH_ELEMENTS[j++]}"
@@ -124,7 +123,6 @@ CEPH_USER="${XPATH_ELEMENTS[j++]}"
 CEPH_KEY="${XPATH_ELEMENTS[j++]}"
 CEPH_CONF="${XPATH_ELEMENTS[j++]}"
 POOL_NAME="${XPATH_ELEMENTS[j++]:-$POOL_NAME}"
-TYPE="${XPATH_ELEMENTS[j++]}"
 
 # No need to delete no cloned images
 if [ "$CLONE" = "NO" ]; then
@@ -159,24 +157,20 @@ fi
 
 log "Deleting $DST_PATH"
 
-if [ "${TYPE}" = 'FILE' ]; then
-    exit 0
-else
-    DELETE_CMD=$(cat <<EOF
-        RBD="${RBD}"
+DELETE_CMD=$(cat <<EOF
+    RBD="${RBD}"
 
-        if [ "\$(rbd_format $RBD_SRC)" = "2" ]; then
-            rbd_rm_r \$(rbd_top_parent $RBD_SRC)
+    if [ "\$(rbd_format $RBD_SRC)" = "2" ]; then
+        rbd_rm_r \$(rbd_top_parent $RBD_SRC)
 
-            if [ -n "$RBD_SNAP" ]; then
-                rbd_rm_snap $SRC $RBD_SNAP
-            fi
-        else
-            $RBD rm $RBD_SRC
+        if [ -n "$RBD_SNAP" ]; then
+            rbd_rm_snap $SRC $RBD_SNAP
         fi
+    else
+        $RBD rm $RBD_SRC
+    fi
 EOF
 )
-fi
 
 ssh_exec_and_log_stdin "$DST_HOST" "$DELETE_CMD" "$CEPH_UTILS" \
                  "Error deleting $RBD_SRC in $DST_HOST"
diff --git a/src/tm_mad/ceph/delete.ssh b/src/tm_mad/ceph/delete.ssh
new file mode 100755
index 00000000000..ee8a3f1a46b
--- /dev/null
+++ b/src/tm_mad/ceph/delete.ssh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
+# not use this file except in compliance with the License. You may obtain    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+# Nothing to do
+exit 0
diff --git a/src/tm_mad/ceph/ln b/src/tm_mad/ceph/ln
index 8fdf18952d4..73cf09bb9e2 100755
--- a/src/tm_mad/ceph/ln
+++ b/src/tm_mad/ceph/ln
@@ -56,9 +56,6 @@ DISK_ID=$(echo $DST|awk -F. '{print $NF}')
 #-------------------------------------------------------------------------------
 
 SRC_PATH=`arg_path $SRC`
-DST_PATH=`arg_path $DST`
-
-DST_DIR=`dirname $DST_PATH`
 
 XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
 
@@ -69,13 +66,11 @@ while IFS= read -r -d '' element; do
 done < <(onevm show -x $VM_ID| $XPATH  \
                      /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_USER \
                      /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_KEY \
-                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_CONF \
-                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/TYPE )
+                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_CONF)
 
 CEPH_USER="${XPATH_ELEMENTS[j++]}"
 CEPH_KEY="${XPATH_ELEMENTS[j++]}"
 CEPH_CONF="${XPATH_ELEMENTS[j++]}"
-TYPE="${XPATH_ELEMENTS[j++]}"
 
 #-------------------------------------------------------------------------------
 # Remove any @snap in image (non persistent -> persistnet)
@@ -93,27 +88,12 @@ if [ -n "$CEPH_CONF" ]; then
     RBD="$RBD --conf ${CEPH_CONF}"
 fi
 
-if [ "${TYPE}" = 'FILE' ]; then
-    ssh_make_path $DST_HOST $DST_DIR 'ssh'
-
-    LN_CMD=$(cat <<EOF
-        RBD="${RBD}"
-
-        rbd_rm_snap $SRC_PATH
+LN_CMD=$(cat <<EOF
+    RBD="${RBD}"
 
-        set -e -o pipefail
-
-        $RBD export $SRC_PATH $DST_PATH
+    rbd_rm_snap $SRC_PATH
 EOF
 )
-else
-    LN_CMD=$(cat <<EOF
-        RBD="${RBD}"
-
-        rbd_rm_snap $SRC_PATH
-EOF
-)
-fi
 
 ssh_exec_and_log_stdin "$DST_HOST" "$LN_CMD" "$CEPH_UTILS" \
                  "Error cloning $SRC_PATH to $RBD_DST in $DST_HOST"
diff --git a/src/tm_mad/ceph/ln.ssh b/src/tm_mad/ceph/ln.ssh
new file mode 100755
index 00000000000..4e219a34ea7
--- /dev/null
+++ b/src/tm_mad/ceph/ln.ssh
@@ -0,0 +1,109 @@
+#!/bin/bash
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
+# not use this file except in compliance with the License. You may obtain    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+# clone fe:SOURCE host:remote_system_ds/disk.i size
+#   - fe is the front-end hostname
+#   - SOURCE is the path of the disk image in the form DS_BASE_PATH/disk
+#   - host is the target host to deploy the VM
+#   - remote_system_ds is the path for the system datastore in the host
+
+SRC=$1
+DST=$2
+VM_ID=$3
+DS_ID=$4
+
+#--------------------------------------------------------------------------------
+
+if [ -z "${ONE_LOCATION}" ]; then
+    TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
+    LIB_LOCATION=/usr/lib/one
+else
+    TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
+    LIB_LOCATION=$ONE_LOCATION/lib
+fi
+
+DRIVER_PATH=$(dirname $0)
+
+source $TMCOMMON
+source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
+
+CEPH_UTILS=${DRIVER_PATH}/../../datastore/ceph/ceph_utils.sh
+
+#-------------------------------------------------------------------------------
+# Process destination
+#-------------------------------------------------------------------------------
+
+DST_HOST=`arg_host $DST`
+DISK_ID=$(echo $DST|awk -F. '{print $NF}')
+
+#-------------------------------------------------------------------------------
+# Get Image information & destination image
+#-------------------------------------------------------------------------------
+
+SRC_PATH=`arg_path $SRC`
+DST_PATH=`arg_path $DST`
+
+DST_DIR=`dirname $DST_PATH`
+
+XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
+
+unset i j XPATH_ELEMENTS
+
+while IFS= read -r -d '' element; do
+        XPATH_ELEMENTS[i++]="$element"
+done < <(onevm show -x $VM_ID| $XPATH  \
+                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_USER \
+                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_KEY \
+                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_CONF)
+
+CEPH_USER="${XPATH_ELEMENTS[j++]}"
+CEPH_KEY="${XPATH_ELEMENTS[j++]}"
+CEPH_CONF="${XPATH_ELEMENTS[j++]}"
+
+#-------------------------------------------------------------------------------
+# Remove any @snap in image (non persistent -> persistnet)
+#-------------------------------------------------------------------------------
+
+if [ -n "$CEPH_USER" ]; then
+    RBD="$RBD --id ${CEPH_USER}"
+fi
+
+if [ -n "$CEPH_KEY" ]; then
+    RBD="$RBD --keyfile ${CEPH_KEY}"
+fi
+
+if [ -n "$CEPH_CONF" ]; then
+    RBD="$RBD --conf ${CEPH_CONF}"
+fi
+
+ssh_make_path $DST_HOST $DST_DIR 'ssh'
+
+LN_CMD=$(cat <<EOF
+    RBD="${RBD}"
+
+    rbd_rm_snap $SRC_PATH
+
+    set -e -o pipefail
+
+    $RBD export $SRC_PATH $DST_PATH
+EOF
+)
+
+ssh_exec_and_log_stdin "$DST_HOST" "$LN_CMD" "$CEPH_UTILS" \
+                 "Error cloning $SRC_PATH to $RBD_DST in $DST_HOST"
+exit 0
diff --git a/src/tm_mad/ceph/mvds b/src/tm_mad/ceph/mvds
index 6bbf52cd1f2..dcc1e60d2ce 100755
--- a/src/tm_mad/ceph/mvds
+++ b/src/tm_mad/ceph/mvds
@@ -23,107 +23,5 @@
 #   - remote_system_ds is the path for the system datastore in the host
 #   - vmid is the id of the VM
 #   - dsid is the target datastore (0 is the system datastore)
-
-SRC=$1
-DST=$2
-VMID=$3
-DSID=$4
-
-#--------------------------------------------------------------------------------
-
-if [ -z "${ONE_LOCATION}" ]; then
-    TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
-    LIB_LOCATION=/usr/lib/one
-else
-    TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
-    LIB_LOCATION=$ONE_LOCATION/lib
-fi
-
-DRIVER_PATH=$(dirname $0)
-
-source $TMCOMMON
-source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
-
-CEPH_UTILS=${DRIVER_PATH}/../../datastore/ceph/ceph_utils.sh
-
-#-------------------------------------------------------------------------------
-# Set dst path and dir
-#-------------------------------------------------------------------------------
-
-SRC_PATH=`arg_path $SRC`
-SRC_HOST=`arg_host $SRC`
-RBD_SRC=`arg_path $SRC`
-
-#-------------------------------------------------------------------------------
-# Get Image information
-#-------------------------------------------------------------------------------
-
-DISK_ID=$(echo "$RBD_SRC" | $AWK -F. '{print $NF}')
-
-XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
-
-unset i j XPATH_ELEMENTS
-
-while IFS= read -r -d '' element; do
-    XPATH_ELEMENTS[i++]="$element"
-done < <(onevm show -x $VMID| $XPATH \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_USER \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_KEY \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_CONF \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/TYPE \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SIZE \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/ORIGINAL_SIZE )
-
-RBD_SRC="${XPATH_ELEMENTS[j++]}"
-CLONE="${XPATH_ELEMENTS[j++]}"
-CEPH_USER="${XPATH_ELEMENTS[j++]}"
-CEPH_KEY="${XPATH_ELEMENTS[j++]}"
-CEPH_CONF="${XPATH_ELEMENTS[j++]}"
-TYPE="${XPATH_ELEMENTS[j++]}"
-SIZE="${XPATH_ELEMENTS[j++]}"
-ORIGINAL_SIZE="${XPATH_ELEMENTS[j++]}"
-
-#-------------------------------------------------------------------------------
-# Copy Image back to the datastore
-#-------------------------------------------------------------------------------
-
-QEMU_OPTS=''
-
-if [ -n "$CEPH_USER" ]; then
-    RBD="$RBD --id ${CEPH_USER}"
-    QEMU_OPTS="${QEMU_OPTS}:id=${CEPH_USER}"
-fi
-
-if [ -n "$CEPH_KEY" ]; then
-    RBD="$RBD --keyfile ${CEPH_KEY}"
-    QEMU_OPTS="${QEMU_OPTS}:keyfile=${CEPH_KEY}"
-fi
-
-if [ -n "$CEPH_CONF" ]; then
-    RBD="$RBD --conf ${CEPH_CONF}"
-    QEMU_OPTS="${QEMU_OPTS}:conf=${CEPH_CONF}"
-fi
-
-if [ "${TYPE}" = 'FILE' ]; then
-    MVDS_CMD=$(cat <<EOF
-        RBD="${RBD}"
-
-        set -e -o pipefail
-
-        if [ -n "$ORIGINAL_SIZE" -a "$SIZE" -gt "$ORIGINAL_SIZE" ]; then
-            $RBD resize $RBD_SRC --size $SIZE
-        fi
-
-        ${QEMU_IMG} convert -n \
-            -f raw "${SRC_PATH}" \
-            -O rbd "rbd:${RBD_SRC}${QEMU_OPTS}"
-EOF
-)
-else
-    exit 0
-fi
-
-ssh_exec_and_log_stdin "$SRC_HOST" "$MVDS_CMD" "$CEPH_UTILS" \
-                 "Error copying $RBD_SRC to $DST in $SRC_HOST" #??
+# Nothing to do
+exit 0
diff --git a/src/tm_mad/ceph/mvds.ssh b/src/tm_mad/ceph/mvds.ssh
new file mode 100755
index 00000000000..9b0c06f3e12
--- /dev/null
+++ b/src/tm_mad/ceph/mvds.ssh
@@ -0,0 +1,121 @@
+#!/bin/bash
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
+# not use this file except in compliance with the License. You may obtain    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+# mvds host:remote_system_ds/disk.i fe:SOURCE vmid dsid
+#   - fe is the front-end hostname
+#   - SOURCE is the path of the disk image in the form DS_BASE_PATH/disk
+#   - host is the target host to deploy the VM
+#   - remote_system_ds is the path for the system datastore in the host
+#   - vmid is the id of the VM
+#   - dsid is the target datastore (0 is the system datastore)
+
+SRC=$1
+DST=$2
+VMID=$3
+DSID=$4
+
+#--------------------------------------------------------------------------------
+
+if [ -z "${ONE_LOCATION}" ]; then
+    TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
+    LIB_LOCATION=/usr/lib/one
+else
+    TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
+    LIB_LOCATION=$ONE_LOCATION/lib
+fi
+
+DRIVER_PATH=$(dirname $0)
+
+source $TMCOMMON
+source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
+
+CEPH_UTILS=${DRIVER_PATH}/../../datastore/ceph/ceph_utils.sh
+
+#-------------------------------------------------------------------------------
+# Set dst path and dir
+#-------------------------------------------------------------------------------
+
+SRC_PATH=`arg_path $SRC`
+SRC_HOST=`arg_host $SRC`
+RBD_SRC=`arg_path $SRC`
+
+#-------------------------------------------------------------------------------
+# Get Image information
+#-------------------------------------------------------------------------------
+
+DISK_ID=$(echo "$RBD_SRC" | $AWK -F. '{print $NF}')
+
+XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
+
+unset i j XPATH_ELEMENTS
+
+while IFS= read -r -d '' element; do
+    XPATH_ELEMENTS[i++]="$element"
+done < <(onevm show -x $VMID| $XPATH \
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_USER \
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_KEY \
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_CONF \
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SIZE \
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/ORIGINAL_SIZE )
+
+RBD_SRC="${XPATH_ELEMENTS[j++]}"
+CEPH_USER="${XPATH_ELEMENTS[j++]}"
+CEPH_KEY="${XPATH_ELEMENTS[j++]}"
+CEPH_CONF="${XPATH_ELEMENTS[j++]}"
+SIZE="${XPATH_ELEMENTS[j++]}"
+ORIGINAL_SIZE="${XPATH_ELEMENTS[j++]}"
+
+#-------------------------------------------------------------------------------
+# Copy Image back to the datastore
+#-------------------------------------------------------------------------------
+
+QEMU_OPTS=''
+
+if [ -n "$CEPH_USER" ]; then
+    RBD="$RBD --id ${CEPH_USER}"
+    QEMU_OPTS="${QEMU_OPTS}:id=${CEPH_USER}"
+fi
+
+if [ -n "$CEPH_KEY" ]; then
+    RBD="$RBD --keyfile ${CEPH_KEY}"
+    QEMU_OPTS="${QEMU_OPTS}:keyfile=${CEPH_KEY}"
+fi
+
+if [ -n "$CEPH_CONF" ]; then
+    RBD="$RBD --conf ${CEPH_CONF}"
+    QEMU_OPTS="${QEMU_OPTS}:conf=${CEPH_CONF}"
+fi
+
+MVDS_CMD=$(cat <<EOF
+    RBD="${RBD}"
+
+    set -e -o pipefail
+
+    if [ -n "$ORIGINAL_SIZE" -a "$SIZE" -gt "$ORIGINAL_SIZE" ]; then
+        $RBD resize $RBD_SRC --size $SIZE
+    fi
+
+    ${QEMU_IMG} convert -n \
+        -f raw "${SRC_PATH}" \
+        -O rbd "rbd:${RBD_SRC}${QEMU_OPTS}"
+EOF
+)
+
+ssh_exec_and_log_stdin "$SRC_HOST" "$MVDS_CMD" "$CEPH_UTILS" \
+                 "Error copying $RBD_SRC to $DST in $SRC_HOST" #??
diff --git a/src/tm_mad/ceph/resize b/src/tm_mad/ceph/resize
index 7ec5135cb50..9088a1b976b 100755
--- a/src/tm_mad/ceph/resize
+++ b/src/tm_mad/ceph/resize
@@ -64,8 +64,7 @@ done < <(onevm show -x $VM_ID| $XPATH \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_KEY \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_CONF \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/PERSISTENT \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/POOL_NAME \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/TYPE )
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/POOL_NAME)
 
 RBD_SRC="${XPATH_ELEMENTS[j++]}"
 CEPH_USER="${XPATH_ELEMENTS[j++]}"
@@ -73,7 +72,6 @@ CEPH_KEY="${XPATH_ELEMENTS[j++]}"
 CEPH_CONF="${XPATH_ELEMENTS[j++]}"
 PERSISTENT="${XPATH_ELEMENTS[j++]}"
 POOL_NAME="${XPATH_ELEMENTS[j++]:-$POOL_NAME}"
-TYPE="${XPATH_ELEMENTS[j++]}"
 
 if [ -n "${RBD_SRC}" ]; then
     if [ "${PERSISTENT}" = 'YES' ]; then
@@ -109,17 +107,10 @@ if [ `lcm_state $VM_ID` -eq 62 ]; then
     exit 0
 fi
 
-if [ "${TYPE}" = 'FILE' ]; then
-    RESIZE_CMD=$(cat <<EOF
-        ${QEMU_IMG} resize "${SRC_PATH}" "${SIZE}M"
+RESIZE_CMD=$(cat <<EOF
+    $RBD resize --size ${SIZE} $RBD_DST
 EOF
 )
-else
-    RESIZE_CMD=$(cat <<EOF
-        $RBD resize --size ${SIZE} $RBD_DST
-EOF
-)
-fi
 
 ssh_exec_and_log_stdin "$SRC_HOST" "$RESIZE_CMD" "$CEPH_UTILS" \
                  "Error resizing disk $RBD_DST"
diff --git a/src/tm_mad/ceph/resize.ssh b/src/tm_mad/ceph/resize.ssh
new file mode 100755
index 00000000000..4bdeb556798
--- /dev/null
+++ b/src/tm_mad/ceph/resize.ssh
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
+# not use this file except in compliance with the License. You may obtain    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+# resize image size vmid
+
+SRC=$1
+SIZE=$2
+VM_ID=$3
+
+#--------------------------------------------------------------------------------
+
+if [ -z "${ONE_LOCATION}" ]; then
+    TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
+    LIB_LOCATION=/usr/lib/one
+else
+    TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
+    LIB_LOCATION=$ONE_LOCATION/lib
+fi
+
+DRIVER_PATH=$(dirname $0)
+
+source $TMCOMMON
+
+#-------------------------------------------------------------------------------
+# Set dst path and dir
+#-------------------------------------------------------------------------------
+
+SRC_HOST=`arg_host $SRC`
+SRC_PATH=`arg_path $SRC`
+
+#-------------------------------------------------------------------------------
+# Resize disk
+#-------------------------------------------------------------------------------
+
+# for running VMs, leave disk resize on kvm/resize_disk
+if [ `lcm_state $VM_ID` -eq 62 ]; then
+    log "Not resizing disk ${SRC_PATH} for running virt. machine directly"
+    exit 0
+fi
+
+RESIZE_CMD=$(cat <<EOF
+    ${QEMU_IMG} resize "${SRC_PATH}" "${SIZE}M"
+EOF
+)
+
+ssh_exec_and_log "$SRC_HOST" "$RESIZE_CMD" "Error resizing disk $SRC_PATH"
+
+exit 0
diff --git a/src/tm_mad/one_tm.rb b/src/tm_mad/one_tm.rb
index 0c7f3700b97..e71d5684207 100755
--- a/src/tm_mad/one_tm.rb
+++ b/src/tm_mad/one_tm.rb
@@ -106,6 +106,21 @@ def do_transfer_action(id, command)
         end
 
         path = File.join(@local_scripts_path, tm, cmd)
+
+        if !File.exists?(path)
+            md  = cmd.match(/(.*)\.(.*)/)
+            if md && md[1]
+                path_shortened = File.join(@local_scripts_path, tm, md[1])
+                if !File.exists?(path_shortened)
+                    return RESULT[:failure],
+                        "Driver path '#{path}' nor '#{path_shortened}' does not exists"
+                end
+                path = path_shortened
+            else
+                return RESULT[:failure], "Driver path '#{path}' does not exists"
+            end
+        end
+
         path << " " << args
         rc = LocalCommand.run(path, log_method(id))
 
diff --git a/src/vm/VirtualMachineDisk.cc b/src/vm/VirtualMachineDisk.cc
index 1374e298cb7..30b230d5a61 100644
--- a/src/vm/VirtualMachineDisk.cc
+++ b/src/vm/VirtualMachineDisk.cc
@@ -140,7 +140,7 @@ int VirtualMachineDisk::get_image_id(int &id, int uid)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-string VirtualMachineDisk::get_tm_mad_system()
+string VirtualMachineDisk::get_tm_mad_system() const
 {
     std::string tm_mad_system;