diff --git a/conf/systemd.service b/conf/systemd.service
index 9ba2ce4..5c6b613 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -8,7 +8,7 @@ User=__APP__
 Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/sources/
 Environment=NODE_ENV=production
-Environment=NODE_CONFIG_DIR=__INSTALL_DIR__/config/
+Environment=NODE_CONFIG_DIR=__INSTALL_DIR__/sources/config/
 Environment="__YNH_NODE_LOAD_PATH__"
 ExecStart=__YNH_NPM__ start
 StandardOutput=syslog
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 88d2211..2a0dbe8 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -17,21 +17,21 @@ bool_to_str() {
 }
 
 dato_setup_config_files() {
-    mkdir -p "$install_dir/config/"
+    mkdir -p "$install_dir/sources/config/"
 
     # setup public dato config
-    ynh_add_config --template="public.js" --destination="$install_dir/config/public.js"
-    chmod 400 "$install_dir/config/public.js"
-    chown "$app:$app" "$install_dir/config/public.js"
+    ynh_add_config --template="public.js" --destination="$install_dir/sources/config/public.js"
+    chmod 400 "$install_dir/sources/config/public.js"
+    chown "$app:$app" "$install_dir/sources/config/public.js"
 
     # setup private dato config
     if [[ $autosynchronize == true ]]; then
-        ynh_add_config --template="private-autosync.js" --destination="$install_dir/config/private.js"
+        ynh_add_config --template="private-autosync.js" --destination="$install_dir/sources/config/private.js"
     else
-        ynh_add_config --template="private.js" --destination="$install_dir/config/private.js"
+        ynh_add_config --template="private.js" --destination="$install_dir/sources/config/private.js"
     fi
-    chmod 400 "$install_dir/config/private.js"
-    chown "$app:$app" "$install_dir/config/private.js"
+    chmod 400 "$install_dir/sources/config/private.js"
+    chown "$app:$app" "$install_dir/sources/config/private.js"
 }
 
 #=================================================
diff --git a/scripts/install b/scripts/install
index 00c8141..dd820dd 100755
--- a/scripts/install
+++ b/scripts/install
@@ -111,7 +111,7 @@ fi
 #=================================================
 
 mkdir -p "$install_dir/sources/dist"
-chown -R "$app:$app" "$install_dir/sources/dist" "$install_dir/config"
+chown -R "$app:$app" "$install_dir/sources/dist" "$install_dir/sources/config"
 
 #=================================================
 # SYSTEM CONFIGURATION
diff --git a/scripts/restore b/scripts/restore
index fc62449..86f1a29 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -27,7 +27,7 @@ chmod -R o-rwx "$install_dir"
 chown -R "$app:www-data" "$install_dir"
 
 mkdir -p "$install_dir/sources/dist"
-chown -R "$app:$app" "$install_dir/sources/dist" "$install_dir/sources/global" "$install_dir/config"
+chown -R "$app:$app" "$install_dir/sources/dist" "$install_dir/sources/global" "$install_dir/sources/config"
 
 #=================================================
 # RESTORE VARIOUS FILES
diff --git a/scripts/upgrade b/scripts/upgrade
index 4a34a6f..b86dfed 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -23,7 +23,6 @@ ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 if [ ! -d "$install_dir/sources" ]; then
     mkdir "$install_dir/sources"
     find . -mindepth 1 -maxdepth 1 ! -name "sources" -exec mv -t "$install_dir/sources" "{}" +
-    mv "$install_dir/sources/config" "$install_dir"
 fi
 
 #=================================================
@@ -39,13 +38,13 @@ ynh_install_nodejs --nodejs_version="$nodejs_version"
 ynh_script_progression --message="Upgrading source files..." --weight=3
 
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$install_dir/sources" --full_replace=1
+ynh_setup_source --dest_dir="$install_dir/sources" --full_replace=1 --keep="config"
 
 chmod -R o-rwx "$install_dir"
 chown -R "$app:www-data" "$install_dir"
 
 mkdir -p "$install_dir/sources/dist"
-chown -R "$app:$app" "$install_dir/sources/dist" "$install_dir/sources/global" "$install_dir/config"
+chown -R "$app:$app" "$install_dir/sources/dist" "$install_dir/sources/global" "$install_dir/sources/config"
 
 #=================================================
 # SPECIFIC UPGRADE