diff --git a/src/infra_version.js b/src/infra_version.js
index f4feaf321..9bda57c74 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:2.3.0@sha256:0e31ec817e235b1814c04af97b1e7cf0053384aca2569570ce92bef0d95e94d2' },
         'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:2.9.4@sha256:0e169b97a0584a76197d2bbc039d8698bf93f815588b3b43c251bd83dd545465' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:2.3.0@sha256:b7bc1ca4f4d0603a01369a689129aa273a938ce195fe43d00d42f4f2d5212f50' },
-        'sftp': { repo: 'cloudron/sftp', tag: 'cloudron/sftp:2.0.1@sha256:1770cb4c6ba2d324f6ff0d7fd8daeb737064386fc86b8cef425ef48334a67b91' }
+        'sftp': { repo: 'cloudron/sftp', tag: 'cloudron/sftp:2.0.2@sha256:cbd604eaa970c99ba5c4c2e7984929668e05de824172f880e8c576b2fb7c976d' }
     }
 };
diff --git a/src/sftp.js b/src/sftp.js
index f2e11ad69..acb849479 100644
--- a/src/sftp.js
+++ b/src/sftp.js
@@ -48,9 +48,8 @@ function rebuild(options, callback) {
             }
 
             dataDirs.push({
-                hostDir: app.dataDir || path.join(paths.APPS_DATA_DIR, app.id, 'data'),
-                // FIXME data/ prefix can be dropped if sftp addon code is changed
-                mountDir: `/app/data/${app.id}/data`
+                hostDir: apps.getDataDir(app, app.dataDir),
+                mountDir: `/app/data/${app.id}`
             });
         });