diff --git a/manifest.toml b/manifest.toml
index 7930c6c..2d5359d 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -46,7 +46,8 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen
 
 [resources]
     [resources.sources]
-        [resources.sources.main]
+        [resources.sources.minio]
+        extract = false
         in_subdir = false
         arm64.url = "https://dl.min.io/server/minio/release/linux-arm64/archive/minio.RELEASE.2023-05-04T21-44-30Z"
         arm64.sha256 = "4948d289e75a54596e6c78a738f95a1bbec5ec159895406917c340d51c4375c9"
@@ -54,13 +55,13 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen
         amd64.sha256 = "2dce77cec0e4536c5736dee064e478a59dc063fe2e40e3f5fed275252de5e8c7"
 
         [resources.sources.mc]
+        extract = false
         in_subdir = false
         arm64.url = "https://dl.min.io/client/mc/release/linux-arm64/archive/mc.RELEASE.2023-05-04T18-10-16Z"
         arm64.sha256 = "b2beb693e09528c25dbb566abf88bb0b94fd2477730c00a496bfceb0f8e9cd2b"
         amd64.url = "https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2023-05-04T18-10-16Z"
         amd64.sha256 = "cd26ea353811880704efe8eb1b3335461240c1d4f7e4f3efee1b4391697662e4"
 
-
     [resources.system_user]
 
     [resources.install_dir]
diff --git a/scripts/install b/scripts/install
index d90bb93..9650953 100755
--- a/scripts/install
+++ b/scripts/install
@@ -9,8 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-mc_path=$install_dir/mc
-
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
@@ -19,14 +17,14 @@ mc_path=$install_dir/mc
 ynh_script_progression --message="Setting up source files..." --weight=10
 
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$install_dir" 
-ynh_setup_source --dest_dir="$mc_path" --source_id="mc"
+ynh_setup_source --dest_dir="$install_dir/minio" --source_id="minio" 
+ynh_setup_source --dest_dir="$install_dir/mc" --source_id="mc"
 
 chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 chmod +x "$install_dir/minio"
-chmod +x "$mc_path/mc"
+chmod +x "$install_dir/mc"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -95,7 +93,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --l
 #=================================================
 ynh_script_progression --message="Configuring MinIO client..." --weight=1
 
-pushd $mc_path
+pushd $install_dir
 	ynh_exec_warn_less sudo -u $app ./mc --no-color alias set minio "http://127.0.0.1:$port" "$admin" "$password" --api S3v4
 popd
 
diff --git a/scripts/restore b/scripts/restore
index 34d234b..5f83d30 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -9,8 +9,6 @@
 # Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
- 
-mc_path="$install_dir/mc"
 
 #=================================================
 # STANDARD RESTORATION STEPS
@@ -32,7 +30,7 @@ chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 chmod +x "$install_dir/minio"
-chmod +x "$mc_path/mc"
+chmod +x "$install_dir/mc"
 
 #=================================================
 # RESTORE THE DATA DIRECTORY
diff --git a/scripts/upgrade b/scripts/upgrade
index 60630b2..6be3134 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -9,8 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-mc_path="$install_dir/mc"
-
 #=================================================
 # CHECK VERSION
 #=================================================
@@ -36,7 +34,7 @@ then
 			ynh_script_progression --message="No buckets to migrate"
 		else
 			ynh_script_progression --message="Moving $d..."
-			ynh_exec_warn_less sudo -u $app $mc_path/mc mirror --preserve "minio/$d" "$tmp/$d"
+			ynh_exec_warn_less sudo -u $app $install_dir/mc mirror --preserve "minio/$d" "$tmp/$d"
 		fi
 		done
 		if ynh_compare_current_package_version --comparison eq --version 2022.09.01~ynh1
@@ -79,15 +77,15 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=5
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir"  --keep=".env"
-	ynh_setup_source --dest_dir="$mc_path" --source_id="mc_$YNH_ARCH"
+	ynh_setup_source --dest_dir="$install_dir/minio"
+	ynh_setup_source --dest_dir="$install_dir/mc" --source_id="mc"
 fi
 
 chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 chmod +x "$install_dir/minio"
-chmod +x "$mc_path/mc"
+chmod +x "$install_dir/mc"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -144,7 +142,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --l
 #=================================================
 ynh_script_progression --message="Configuring MinIO client..." --weight=1
 
-pushd $mc_path
+pushd $install_dir
 	ynh_exec_warn_less sudo -u $app ./mc --no-color alias set minio "https://$domain" "$admin" "$password" --api S3v4
 popd
 
@@ -163,7 +161,7 @@ then
 			ynh_script_progression --message="No buckets to migrate"
 		else
 			ynh_script_progression --message="Migrating bucket $d"
-				pushd $mc_path
+				pushd $install_dir
 					ynh_exec_warn_less sudo -u $app ./mc mb minio/"$d"
 					ynh_exec_warn_less sudo -u $app ./mc mirror --preserve "$tmp/$d" "minio/$d"
 					# This is a hack, but it will make outline_ynh users' lifes much easier !