diff --git a/Dockerfile b/Dockerfile
index 6aaa96f..0701f7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -132,7 +132,7 @@ USER nextcloud
 
 WORKDIR /nextcloud
 
-VOLUME /nextcloud/data /nextcloud/config /nextcloud/apps2 /nextcloud/themes
+VOLUME /data /nextcloud/config /nextcloud/apps2 /nextcloud/themes
 
 EXPOSE 8888
 
diff --git a/rootfs/usr/local/bin/setup.sh b/rootfs/usr/local/bin/setup.sh
index ed53da5..30c58c3 100755
--- a/rootfs/usr/local/bin/setup.sh
+++ b/rootfs/usr/local/bin/setup.sh
@@ -8,7 +8,7 @@ instanceid=oc$(openssl rand -hex 6 | head -c 10)
 cat > $CONFIGFILE <<EOF;
 <?php
 \$CONFIG = array (
-  'datadirectory' => '/nextcloud/data',
+  'datadirectory' => '/data',
 
   "apps_paths" => array (
       0 => array (
@@ -36,7 +36,7 @@ cat > /nextcloud/config/autoconfig.php <<EOF;
 <?php
 \$AUTOCONFIG = array (
   # storage/database
-  'directory'     => '/nextcloud/data',
+  'directory'     => '/data',
   'dbtype'        => '${DB_TYPE:-sqlite3}',
   'dbname'        => '${DB_NAME:-nextcloud}',
   'dbuser'        => '${DB_USER:-nextcloud}',