diff --git a/conf/systemd.service b/conf/systemd.service
index f66a0da..47d883d 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -24,7 +24,7 @@ SuccessExitStatus=0
 
 # Add environment variables
 Environment=CELLS_ENABLE_METRICS=false
-Environment=CELLS_WORKING_DIR=__INSTALL_DIR__
+# Environment=CELLS_WORKING_DIR=__INSTALL_DIR__
 Environment=CELLS_DATA_DIR=__DATA_DIR__
 
 [Install]
diff --git a/scripts/install b/scripts/install
index 469ea6f..8af695d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -32,7 +32,10 @@ ynh_add_config --template="../conf/install-conf.yml" --destination="$install_dir
 ynh_delete_file_checksum --file="$install_dir/install-conf.yml"
 
 pushd "$install_dir"
-    ynh_exec_as "$app" env CELLS_WORKING_DIR="$install_dir" ./cells configure --cli --yaml "./install-conf.yml"
+    # See https://pydio.com/fr/docs/cells/v4/working-directories
+    ynh_exec_as "$app" env \
+        CELLS_DATA_DIR="$data_dir" \
+        ./cells configure --cli --yaml "./install-conf.yml"
 popd
 ynh_secure_remove --file="$install_dir/install-conf.yml"