diff --git a/conf/.env.production b/conf/.env.production
index 89703b3..b02f964 100644
--- a/conf/.env.production
+++ b/conf/.env.production
@@ -15,7 +15,7 @@ DEFAULT_LANGUAGE="English"
 ## Leave unset to allow all hosts
 ALLOWED_HOSTS="localhost,127.0.0.1,[::1]"
 
-MEDIA_ROOT=images/
+MEDIA_ROOT=__DATADIR__/images/
 
 # Database configuration
 PGPORT=5432
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 8ad14a9..570608a 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -8,7 +8,7 @@ location __PATH__/ {
 }
 
 location /images/ {
-  alias __FINALPATH__/images/;
+  alias __DATADIR__/images/;
 }
 
 location /static/ {
diff --git a/scripts/install b/scripts/install
index 03b297e..745c2ff 100755
--- a/scripts/install
+++ b/scripts/install
@@ -106,6 +106,21 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
+#=================================================
+# CREATE DATA DIRECTORY
+#=================================================
+ynh_script_progression --message="Creating a data directory..." --weight=1
+
+datadir=/home/yunohost.app/$app
+ynh_app_setting_set --app=$app --key=datadir --value=$datadir
+
+mkdir -p $datadir
+mkdir -p $datadir/images
+
+chmod 750 "$datadir"
+chmod -R o-rwx "$datadir"
+chown -R $app:www-data "$datadir"
+
 #=================================================
 # CONFIGURE THEN INSTALL SCRIPT AND DEPENDENCIES
 #=================================================
@@ -144,20 +159,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=1
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# CREATE DATA DIRECTORY
-#=================================================
-ynh_script_progression --message="Creating a data directory..." --weight=1
-
-datadir=/home/yunohost.app/$app
-ynh_app_setting_set --app=$app --key=datadir --value=$datadir
-
-mkdir -p $datadir
-
-chmod 750 "$datadir"
-chmod -R o-rwx "$datadir"
-chown -R $app:www-data "$datadir"
-
 #=================================================
 # SETUP SYSTEMD
 #=================================================