diff --git a/install.sh b/install.sh
index 7046061288..017a064159 100755
--- a/install.sh
+++ b/install.sh
@@ -322,7 +322,6 @@ LIB_DIRS="$LIB_LOCATION/ruby \
 VAR_DIRS="$VAR_LOCATION/remotes \
           $VAR_LOCATION/remotes/etc \
           $VAR_LOCATION/remotes/etc/tm/fs_lvm \
-          $VAR_LOCATION/remotes/etc/tm/fs_lvm_ssh \
           $VAR_LOCATION/remotes/etc/tm/ssh \
           $VAR_LOCATION/remotes/etc/datastore/fs \
           $VAR_LOCATION/remotes/etc/datastore/ceph \
@@ -688,7 +687,6 @@ INSTALL_FILES=(
     TM_FS_LVM_FILES:$VAR_LOCATION/remotes/tm/fs_lvm
     TM_FS_LVM_ETC_FILES:$VAR_LOCATION/remotes/etc/tm/fs_lvm/fs_lvm.conf
     TM_FS_LVM_SSH_FILES:$VAR_LOCATION/remotes/tm/fs_lvm_ssh
-    TM_FS_LVM_SSH_ETC_FILES:$VAR_LOCATION/remotes/etc/tm/fs_lvm_ssh/fs_lvm_ssh.conf
     TM_QCOW2_FILES:$VAR_LOCATION/remotes/tm/qcow2
     TM_SSH_FILES:$VAR_LOCATION/remotes/tm/ssh
     TM_SSH_ETC_FILES:$VAR_LOCATION/remotes/etc/tm/ssh
@@ -1887,9 +1885,6 @@ TM_FS_LVM_SSH_FILES="src/tm_mad/fs_lvm_ssh/activate \
                      src/tm_mad/fs_lvm_ssh/delete \
                      src/tm_mad/fs_lvm_ssh/resize"
 
-TM_FS_LVM_SSH_ETC_FILES="src/tm_mad/fs_lvm_ssh/fs_lvm_ssh.conf"
-
-
 TM_QCOW2_FILES="src/tm_mad/qcow2/clone \
                  src/tm_mad/qcow2/clone.ssh \
                  src/tm_mad/qcow2/delete \
diff --git a/src/template/OpenNebulaTemplate.cc b/src/template/OpenNebulaTemplate.cc
index 4df1b56179..cc45b92314 100644
--- a/src/template/OpenNebulaTemplate.cc
+++ b/src/template/OpenNebulaTemplate.cc
@@ -62,8 +62,9 @@ void OpenNebulaTemplate::set_multiple_conf_default()
 #*******************************************************************************
 # dummy
 # lvm
-# shared
 # fs_lvm
+# fs_lvmm_ssh
+# shared
 # qcow2
 # ssh
 # vmfs
@@ -71,15 +72,21 @@ void OpenNebulaTemplate::set_multiple_conf_default()
 # dev
 #*******************************************************************************
 */
-    set_conf_tm("dummy",  "NONE",   "SYSTEM", "YES", "YES", "");
-    set_conf_tm("lvm",    "NONE",   "SELF",   "YES", "NO",  "");
-    set_conf_tm("shared", "NONE",   "SYSTEM", "YES", "YES", "");
+    set_conf_tm("dummy", "NONE", "SYSTEM", "YES", "YES", "");
+
+    set_conf_tm("lvm", "NONE",   "SELF",   "YES", "NO",  "");
     set_conf_tm("fs_lvm", "SYSTEM", "SYSTEM", "YES", "NO",  "raw");
-    set_conf_tm("qcow2",  "NONE",   "SYSTEM", "YES", "NO",  "qcow2");
-    set_conf_tm("ssh",    "SYSTEM", "SYSTEM", "NO",  "YES", "");
-    set_conf_tm("vmfs",   "NONE",   "SYSTEM", "YES", "NO",  "");
-    set_conf_tm("ceph",   "NONE",   "SELF",   "YES", "NO",  "raw");
-    set_conf_tm("dev",    "NONE",   "NONE",   "YES", "NO",  "");
+    set_conf_tm("fs_lvm_ssh", "SYSTEM", "SYSTEM", "YES", "NO",  "raw");
+
+    set_conf_tm("shared", "NONE", "SYSTEM", "YES", "YES", "");
+    set_conf_tm("qcow2", "NONE", "SYSTEM", "YES", "NO",  "qcow2");
+
+    set_conf_tm("ssh", "SYSTEM", "SYSTEM", "NO", "YES", "");
+    set_conf_tm("vmfs", "NONE", "SYSTEM", "YES", "NO",  "");
+
+    set_conf_tm("ceph", "NONE", "SELF", "YES", "NO", "raw");
+    set_conf_tm("dev", "NONE", "NONE", "YES", "NO",  "");
+
 
     register_multiple_conf_default("TM_MAD_CONF");
 /*
diff --git a/src/tm_mad/fs_lvm_ssh/fs_lvm_ssh.conf b/src/tm_mad/fs_lvm_ssh/fs_lvm_ssh.conf
deleted file mode 120000
index d3e9ed5398..0000000000
--- a/src/tm_mad/fs_lvm_ssh/fs_lvm_ssh.conf
+++ /dev/null
@@ -1 +0,0 @@
-../fs_lvm/fs_lvm.conf
\ No newline at end of file