diff --git a/src/translation/de.json b/src/translation/de.json
index 9b2c2f03a..8172a5d9e 100644
--- a/src/translation/de.json
+++ b/src/translation/de.json
@@ -1513,7 +1513,6 @@
             "username": "Username",
             "password": "Passwort",
             "diskPath": "Festplattenpfad",
-            "noopWarning": "Cloudron konfiguriert den Server nicht um diesen Datenträger einzubinden",
             "mountTypeInfo": "Cloudron konfiguriert den Server um diesen Datenträger einzubinden",
             "port": "Port",
             "user": "User",
diff --git a/src/translation/en.json b/src/translation/en.json
index 8d02c0a62..cbc8b2148 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -1513,11 +1513,11 @@
             "username": "Username",
             "password": "Password",
             "diskPath": "Disk Path",
-            "noopWarning": "Cloudron will not configure the server to mount this volume",
             "mountTypeInfo": "Cloudron will configure the server to automatically mount this volume",
             "port": "Port",
             "user": "User",
-            "privateKey": "Private SSH Key"
+            "privateKey": "Private SSH Key",
+            "mountpointWarning": "Cloudron will not configure the server to automatically mount this volume"
         },
         "removeVolumeDialog": {
             "title": "Really remove {{ volume }} ?",
@@ -1532,7 +1532,8 @@
         },
         "tooltipEdit": "Edit Volume",
         "mountStatus": "Mount Status",
-        "type": "Type"
+        "type": "Type",
+        "localDirectory": "Local Directory"
     },
     "storage": {
         "mounts": {
diff --git a/src/translation/nl.json b/src/translation/nl.json
index 9cff6be4a..6565b723c 100644
--- a/src/translation/nl.json
+++ b/src/translation/nl.json
@@ -1462,7 +1462,6 @@
             "username": "Gebruikersnaam",
             "password": "Wachtwoord",
             "diskPath": "Schijf pad",
-            "noopWarning": "Cloudron zal de server niet configureren om dit Volume te mounten",
             "port": "Poort",
             "user": "Gebruiker",
             "privateKey": "Private SSH sleutel",
diff --git a/src/views/volumes.html b/src/views/volumes.html
index 6db75a2c8..cc345c027 100644
--- a/src/views/volumes.html
+++ b/src/views/volumes.html
@@ -19,16 +19,21 @@
             <div class="form-group">
               <label class="control-label" for="mountType">{{ 'volumes.mountType' | tr }}</label>
               <select class="form-control" id="mountType" ng-model="volumeAdd.mountType" ng-options="a.value as a.name for a in mountTypes"></select>
-              <p class="small text-info" ng-show="volumeAdd.mountType === 'noop'" ng-bind-html="'volumes.addVolumeDialog.noopWarning' | tr"></p>
-              <p class="small text-info" ng-hide="volumeAdd.mountType === 'noop'" ng-bind-html="'volumes.addVolumeDialog.mountTypeInfo' | tr"></p>
+              <p class="small text-warning" ng-show="volumeAdd.mountType === 'mountpoint'" ng-bind-html="'volumes.addVolumeDialog.mountpointWarning' | tr"></p>
+              <p class="small text-info" ng-hide="volumeAdd.mountType === 'mountpoint' || volumeAdd.mountType === 'filesystem'" ng-bind-html="'volumes.addVolumeDialog.mountTypeInfo' | tr"></p>
             </div>
 
-            <div class="form-group" ng-show="volumeAdd.mountType === 'noop'">
+            <div class="form-group" ng-show="volumeAdd.mountType === 'filesystem'">
+              <label class="control-label">{{ 'volumes.localDirectory' | tr }}</label>
+              <input type="text" class="form-control" ng-model="volumeAdd.hostPath" name="hostPath" ng-disabled="volumeAdd.busy" placeholder="/srv/shared" autofocus>
+            </div>
+
+            <div class="form-group" ng-show="volumeAdd.mountType === 'mountpoint'">
               <label class="control-label">{{ 'volumes.hostPath' | tr }}</label>
               <input type="text" class="form-control" ng-model="volumeAdd.hostPath" name="hostPath" ng-disabled="volumeAdd.busy" placeholder="/mnt/data" autofocus>
             </div>
 
-            <div uib-collapse="volumeAdd.mountType === 'noop'">
+            <div uib-collapse="volumeAdd.mountType === 'mountpoint' || volumeAdd.mountType === 'filesystem'">
               <div class="form-group" ng-show="volumeAdd.mountType === 'ext4'">
                 <label class="control-label" for="volumeAddHost">{{ 'volumes.addVolumeDialog.diskPath' | tr }}</label>
                 <input type="text" class="form-control" ng-model="volumeAdd.diskPath" id="volumeAddDiskPath" name="diskPath" ng-disabled="volumeAdd.busy" placeholder="/dev/disk/by-uuid/uuid">
@@ -140,8 +145,8 @@
                 {{ volume.mountType }}
               </td>
               <td class="text-left elide-table-cell hidden-xs hidden-sm">
-                <span ng-show="volume.mountType !== 'noop'">{{ volume.mountOptions.host || volume.mountOptions.diskPath || volume.hostPath }}{{ volume.mountOptions.remoteDir }}</span>
-                <span ng-show="volume.mountType === 'noop'">{{ volume.hostPath }}</span>
+                <span ng-show="volume.mountType !== 'mountpoint' && volume.mountType !== 'filesystem'">{{ volume.mountOptions.host || volume.mountOptions.diskPath || volume.hostPath }}{{ volume.mountOptions.remoteDir }}</span>
+                <span ng-show="volume.mountType === 'mountpoint' || volume.mountType === 'filesystem'">{{ volume.hostPath }}</span>
               </td>
               <td class="text-right no-wrap" style="vertical-align: bottom">
                 <a class="btn btn-xs btn-default" ng-href="{{ '/filemanager.html?volumeId=' + volume.id }}" target="_blank" uib-tooltip="{{ 'volumes.openFileManagerActionTooltip' | tr }}"><i class="fas fa-folder"></i></a>
diff --git a/src/views/volumes.js b/src/views/volumes.js
index 5b3ea1fa6..57b2b0815 100644
--- a/src/views/volumes.js
+++ b/src/views/volumes.js
@@ -16,9 +16,10 @@ angular.module('Application').controller('VolumesController', ['$scope', '$locat
     $scope.mountTypes = [
         { name: 'CIFS', value: 'cifs' },
         { name: 'EXT4', value: 'ext4' },
+        { name: 'Filesystem', value: 'filesystem' },
+        { name: 'Filesystem (Mountpoint)', value: 'mountpoint' },
         { name: 'NFS', value: 'nfs' },
         { name: 'SSHFS', value: 'sshfs' },
-        { name: 'No-op', value: 'noop' }
     ];
 
     function refreshVolumes(callback) {
@@ -61,7 +62,7 @@ angular.module('Application').controller('VolumesController', ['$scope', '$locat
         name: '',
         hostPath: '',
 
-        mountType: 'noop',
+        mountType: 'mountpoint',
         host: '',
         remoteDir: '',
         username: '',
@@ -76,7 +77,7 @@ angular.module('Application').controller('VolumesController', ['$scope', '$locat
             $scope.volumeAdd.busy = false;
             $scope.volumeAdd.name = '';
             $scope.volumeAdd.hostPath = '';
-            $scope.volumeAdd.mountType = 'noop';
+            $scope.volumeAdd.mountType = 'mountpoint';
             $scope.volumeAdd.host = '';
             $scope.volumeAdd.remoteDir = '';
             $scope.volumeAdd.username = '';
@@ -129,8 +130,8 @@ angular.module('Application').controller('VolumesController', ['$scope', '$locat
             }
 
             var hostPath;
-            if ($scope.volumeAdd.mountType === 'noop') {
-                hostPath = $scope.volumeAdd.hostPath; // settable by user
+            if ($scope.volumeAdd.mountType === 'mountpoint' || $scope.volumeAdd.mountType === 'filesystem') {
+                hostPath = $scope.volumeAdd.hostPath;
             } else {
                 hostPath = null;
             }