diff --git a/manifest.toml b/manifest.toml
index 018783e..225e3ec 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -41,13 +41,13 @@ ram.runtime = "50M"
 [resources]
 
  [resources.sources]
-     [resources.sources.main]
-     amd64.url = "https://github.com/boypt/simple-torrent/releases/download/1.3.9/cloud-torrent_linux_amd64_static.gz"
-     amd64.sha256 = "d2f535e4cd0449b357a563cfce79c1f6afcac9b7b3af94e758defc44faa52ebf"
-     arm64.url = "https://github.com/boypt/simple-torrent/releases/download/1.3.9/cloud-torrent_linux_arm64_static.gz"
-     arm64.sha256 = "6f48f8b59bc8d834c6ede1d27ecc1a598b8a0be1dab00622caa6fd047e51eed6"
-     i386.url = "https://github.com/boypt/simple-torrent/releases/download/1.3.9/cloud-torrent_linux_386_static.gz"
-     i386.sha256 = "583898eb907c21dbbcb6f33934eae3dc1d6ec2620fdc7689c70a3479049af52b"
+    [resources.sources.main]
+    amd64.url = "https://github.com/boypt/simple-torrent/releases/download/1.3.9/cloud-torrent_linux_amd64_static.gz"
+    amd64.sha256 = "d2f535e4cd0449b357a563cfce79c1f6afcac9b7b3af94e758defc44faa52ebf"
+    arm64.url = "https://github.com/boypt/simple-torrent/releases/download/1.3.9/cloud-torrent_linux_arm64_static.gz"
+    arm64.sha256 = "6f48f8b59bc8d834c6ede1d27ecc1a598b8a0be1dab00622caa6fd047e51eed6"
+    i386.url = "https://github.com/boypt/simple-torrent/releases/download/1.3.9/cloud-torrent_linux_386_static.gz"
+    i386.sha256 = "583898eb907c21dbbcb6f33934eae3dc1d6ec2620fdc7689c70a3479049af52b"
     extract   = false
     in_subdir = false
 
@@ -56,6 +56,7 @@ ram.runtime = "50M"
     [resources.install_dir]
 
     [resources.data_dir]
+    subdirs = ["torrents", "downloads"]
 
     [resources.ports]
     main.default = 3000
diff --git a/scripts/install b/scripts/install
index 3107450..e171818 100644
--- a/scripts/install
+++ b/scripts/install
@@ -38,18 +38,6 @@ ynh_add_systemd_config
 
 yunohost service add $app --description="Self-hosted remote torrent client" --needs_exposed_ports="$port_peer" --log="/var/log/$app/$app.log"
 
-#=================================================
-# CREATE DATA DIRECTORY
-#=================================================
-ynh_script_progression --message="Creating a data directory..." --weight=1
-
-mkdir -p $data_dir/{torrents,downloads}
-
-# Set permissions to app files
-chmod 755 $data_dir/{torrents,downloads}
-chmod -R o-rwx $data_dir
-chown -R $app:www-data $data_dir
-
 #=================================================
 # MODIFY A CONFIG FILE
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index fbd58c9..5b57423 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -38,7 +38,7 @@ then
 	pushd "$install_dir"
 	    gzip --decompress main --to-stdout > main_dezipped
 	    mv main_dezipped $app
-        popd
+    popd
 fi
 
 chmod -R o-rwx "$install_dir"
@@ -64,15 +64,6 @@ yunohost service add $app --description="Self-hosted remote torrent client" --ne
 
 # ynh_add_config --template="../conf/config.default.yml" --destination="$install_dir/config.yml"
 
-#=================================================
-# CREATE DIRECTORIES
-#=================================================
-
-mkdir -p /home/yunohost.app/$app/{torrents,downloads}
-
-chown -R $app:www-data /home/yunohost.app/$app
-chmod 755 /home/yunohost.app/$app/{torrents,downloads}
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================