diff --git a/conf/homeserver.yaml b/conf/homeserver.yaml
index b193acf..9e1bf4e 100644
--- a/conf/homeserver.yaml
+++ b/conf/homeserver.yaml
@@ -956,7 +956,7 @@ log_config: "/etc/matrix-__APP__/log.yaml"
 
 # Directory where uploaded images and attachments are stored.
 #
-media_store_path: "/home/yunohost.app/matrix-__APP__/media"
+media_store_path: "__DATA_DIR__/media"
 
 # Media storage providers allow media to be stored in different
 # locations.
@@ -970,7 +970,7 @@ media_storage_providers:
    # Whether to wait for successful storage for local uploads
    store_synchronous: false
    config:
-      directory: "/home/yunohost.app/matrix-__APP__/media_storage"
+      directory: "__DATA_DIR__/media_storage"
 
 # The largest allowed upload size in bytes
 #
diff --git a/manifest.toml b/manifest.toml
index 9496ec4..681d045 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -80,6 +80,7 @@ ram.runtime = "50M"
     dir = "/opt/yunohost/matrix-__APP__"
 
     [resources.data_dir]
+    subdirs = ["media", "media_storage"]
     
     [resources.permissions]
     main.url = "/"