diff --git a/scripts/install b/scripts/install
index fbdf40a..84b09dd 100644
--- a/scripts/install
+++ b/scripts/install
@@ -90,7 +90,7 @@ fi
 #=================================================
 ynh_script_progression --message="Creating a data directory..."
 
-datadir=/home/yunohost.app/$app
+datadir=/home/yunohost.transmission
 ynh_app_setting_set --app=$app --key=datadir --value=$datadir
 
 mkdir -p $datadir/{progress,completed,watched}
@@ -166,7 +166,7 @@ ynh_replace_string "<div id=\"toolbar-inspector\" title=\"Toggle Inspector\"></d
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..."
 
-yunohost service add transmission-daemon --description="BitTorrent Client" --log="/var/log/syslog" --needs_exposed_ports="$peer_port"
+yunohost service add transmission-daemon --description="BitTorrent Client" --log=systemd --needs_exposed_ports="$peer_port"
 
 #=================================================
 # START SYSTEMD SERVICE
diff --git a/scripts/restore b/scripts/restore
index 008b603..256544f 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -118,7 +118,7 @@ ynh_multimedia_addfolder --source_dir="$datadir/watched" --dest_dir="share/Torre
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..."
 
-yunohost service add transmission-daemon --description="BitTorrent Client" --log="/var/log/syslog" --needs_exposed_ports="$peer_port"
+yunohost service add transmission-daemon --description="BitTorrent Client" --log=systemd --needs_exposed_ports="$peer_port"
 
 #=================================================
 # START SYSTEMD SERVICE
diff --git a/scripts/upgrade b/scripts/upgrade
index 1dcb65c..20dffbd 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -74,13 +74,8 @@ ynh_exec_warn_less yunohost firewall allow UDP $peer_port
 
 # If datadir doesn't exist, create it
 if [ -z "$datadir" ]; then
-	datadir=/home/yunohost.app/$app
+	datadir=/home/yunohost.transmission
 	ynh_app_setting_set --app=$app --key=datadir --value=$datadir
-	mkdir -p $datadir
-	mv /home/yunohost.transmission/progress $datadir/progress
-	mv /home/yunohost.transmission/completed $datadir/completed
-	mv /home/yunohost.transmission/watched $datadir/watched
-	ynh_secure_remove --file="/home/yunohost.transmission/"
 fi
 
 #=================================================
@@ -173,14 +168,14 @@ ynh_replace_string "<div id=\"toolbar-inspector\" title=\"Toggle Inspector\"></d
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..."
 
-yunohost service add transmission-daemon --description="BitTorrent Client" --log="/var/log/syslog" --needs_exposed_ports="$peer_port"
+yunohost service add transmission-daemon --description="BitTorrent Client" --log=systemd --needs_exposed_ports="$peer_port"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=2
 
-ynh_systemd_action --service_name=transmission-daemon --action=start
+ynh_systemd_action --service_name=transmission-daemon --action="start"
 
 #=================================================
 # RELOAD NGINX