diff --git a/src/infra_version.js b/src/infra_version.js
index 57f972749..3c67b79ac 100644
--- a/src/infra_version.js
+++ b/src/infra_version.js
@@ -22,6 +22,6 @@ exports = module.exports = {
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:3.1.1@sha256:7b3a28f777ba0a664fd8defa6748190c63ad364ade58c61d23183bef87c9b4a8' },
         'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:3.6.0@sha256:67541d29f1ce3ace245b4acdaac28acde3cc15f4f83b98e9b7315930aeb5084c' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:3.1.0@sha256:30ec3a01964a1e01396acf265183997c3e17fb07eac1a82b979292cc7719ff4b' },
-        'sftp': { repo: 'cloudron/sftp', tag: 'cloudron/sftp:3.5.0@sha256:4f157c06f18535ad2dfd379769c99f169adb8690e69a89a4ad3a39e9586fb49d' }
+        'sftp': { repo: 'cloudron/sftp', tag: 'cloudron/sftp:3.5.1@sha256:958c6d71a59870fc6ebb2703ab0999f6b44e7e52bb0821a9e6aa4c0fdf61e257' }
     }
 };
diff --git a/src/ldap.js b/src/ldap.js
index 1d07c9abc..d99a1741b 100644
--- a/src/ldap.js
+++ b/src/ldap.js
@@ -566,7 +566,7 @@ async function userSearchSftp(req, res, next) {
     const obj = {
         dn: ldap.parseDN(`cn=${username}@${appFqdn},ou=sftp,dc=cloudron`).toString(),
         attributes: {
-            homeDirectory: app.dataDir ? `/mnt/${app.id}` : `/mnt/appsdata/${app.id}/data`,
+            homeDirectory: app.dataDir ? `/mnt/app-${app.id}` : `/mnt/appsdata/${app.id}/data`, // see also sftp.js
             objectclass: ['user'],
             objectcategory: 'person',
             cn: user.id,
diff --git a/src/routes/filemanager.js b/src/routes/filemanager.js
index e82eedc1d..fb8a73c0c 100644
--- a/src/routes/filemanager.js
+++ b/src/routes/filemanager.js
@@ -33,7 +33,7 @@ function proxy(kind) {
 
         req.url = url.format({ pathname: `/files/${id}/${encodeURIComponent(req.params[0])}`, query: parsedUrl.query }); // params[0] already contains leading '/'
 
-        const proxyOptions = url.parse(`https://${result.ip}:3000`);
+        const proxyOptions = url.parse(`http://${result.ip}:3000`);
         proxyOptions.rejectUnauthorized = false;
         const fileManagerProxy = middleware.proxy(proxyOptions);
 
diff --git a/src/sftp.js b/src/sftp.js
index ef8ce0d9b..3c03b06ab 100644
--- a/src/sftp.js
+++ b/src/sftp.js
@@ -64,7 +64,7 @@ async function start(existingInfra) {
     for (const app of allApps) {
         if (!app.manifest.addons['localstorage'] || !app.dataDir) continue;
 
-        const hostDir = apps.getDataDir(app, app.dataDir), mountDir = `/mnt/${app.id}`;
+        const hostDir = apps.getDataDir(app, app.dataDir), mountDir = `/mnt/app-${app.id}`; // see also sftp:userSearchSftp
         if (!safe.fs.existsSync(hostDir)) { // this can fail if external mount does not have permissions for yellowtent user
             // do not create host path when cloudron is restoring. this will then create dir with root perms making restore logic fail
             debug(`Ignoring app data dir ${hostDir} for ${app.id} since it does not exist`);
@@ -85,7 +85,7 @@ async function start(existingInfra) {
             continue;
         }
 
-        dataDirs.push({ hostDir: volume.hostPath, mountDir: `/mnt/${volume.id}` });
+        dataDirs.push({ hostDir: volume.hostPath, mountDir: `/mnt/volume-${volume.id}` });
     }
 
     // mail data dir