diff --git a/conf/msg_remove b/conf/msg_remove
index 25d23f0..aa4db93 100644
--- a/conf/msg_remove
+++ b/conf/msg_remove
@@ -5,11 +5,11 @@ The domain https://__DOMAIN____PATH__ is free for other apps to be installed on
 You should close the PeerTube Live TCP port __PORT_RTMP__ available from internet (For example, closing the port on your ISP box if it's not automatically done).
 
 But a futher action is required from your side to completely remove the __APP__ data folder. If you have backup and plan to restore this app in the future DON'T RUN THIS COMMAND. 
-And if you are going to migrate to othe server you will have to move __DATA_DIR__ to your new server.
+And if you are going to migrate to othe server you will have to move __DATA_DIR__storage/ to your new server.
 
 
 You need to run this command to remove the data (warning all your videos will be removed):
 
-rm -R __DATA_DIR__ -f
+rm -R __DATA_DIR__storage/ -f
 
 If you facing any problem or want to improve this app, please open a new issue here: https://github.com/YunoHost-Apps/peertube_ynh
diff --git a/conf/nginx.conf b/conf/nginx.conf
index d74a70d..4043fab 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -154,7 +154,7 @@ location ~ ^/static/(thumbnails|avatars)/ {
 
   rewrite ^/static/(.*)$ /$1 break;
 
-  root __DATA_DIR__;
+  root __DATA_DIR__storage/;
 
   try_files $uri @api;
 }
@@ -216,7 +216,7 @@ location ~ ^/static/(webseed|redundancy|streaming-playlists)/ {
   rewrite ^/static/webseed/(.*)$ /videos/$1 break;
   rewrite ^/static/(.*)$         /$1        break;
 
-  root __DATA_DIR__;
+  root __DATA_DIR__storage/;
 
   try_files $uri @api;
 }
diff --git a/conf/production.yaml b/conf/production.yaml
index 8306eae..af883d6 100644
--- a/conf/production.yaml
+++ b/conf/production.yaml
@@ -113,20 +113,20 @@ defaults:
 
 # From the project root directory
 storage:
-  tmp: '__DATA_DIR__/tmp/' # Use to download data (imports etc), store uploaded files before processing...
-  bin: '__DATA_DIR__/bin/'
-  avatars: '__DATA_DIR__/avatars/'
-  videos: '__DATA_DIR__/videos/'
-  streaming_playlists: '__DATA_DIR__/streaming-playlists/'
-  redundancy: '__DATA_DIR__/redundancy/'
+  tmp: '__DATA_DIR__/storage/tmp/' # Use to download data (imports etc), store uploaded files before processing...
+  bin: '__DATA_DIR__/storage/bin/'
+  avatars: '__DATA_DIR__/storage/avatars/'
+  videos: '__DATA_DIR__/storage/videos/'
+  streaming_playlists: '__DATA_DIR__/storage/streaming-playlists/'
+  redundancy: '__DATA_DIR__/storage/redundancy/'
   logs: '/var/log/__APP__/'
-  previews: '__DATA_DIR__/previews/'
-  thumbnails: '__DATA_DIR__/thumbnails/'
-  torrents: '__DATA_DIR__/torrents/'
-  captions: '__DATA_DIR__/captions/'
-  cache: '__DATA_DIR__/cache/'
-  plugins: '__DATA_DIR__/plugins/'
-  well_known: '__DATA_DIR__/well-known/'
+  previews: '__DATA_DIR__/storage/previews/'
+  thumbnails: '__DATA_DIR__/storage/thumbnails/'
+  torrents: '__DATA_DIR__/storage/torrents/'
+  captions: '__DATA_DIR__/storage/captions/'
+  cache: '__DATA_DIR__/storage/cache/'
+  plugins: '__DATA_DIR__/storage/plugins/'
+  well_known: '__DATA_DIR__/storage/well-known/'
   # Overridable client files in client/dist/assets/images:
   # - logo.svg
   # - favicon.png
@@ -137,7 +137,7 @@ storage:
   # Could contain for example assets/images/favicon.png
   # If the file exists, peertube will serve it
   # If not, peertube will fallback to the default file
-  client_overrides: '__DATA_DIR__/client-overrides/'
+  client_overrides: '__DATA_DIR__/storage/client-overrides/'
 
 static_files:
   # Require and check user authentication when accessing private files (internal/private video files)