diff --git a/scripts/_common.sh b/scripts/_common.sh
index 6c1110e..11dd26b 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,12 +4,10 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="7.4"
-
 # dependencies used by the app
-pkg_dependencies="php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mysql"
+pkg_dependencies="php$YNH_DEFAULT_PHP_VERSION-tidy php$YNH_DEFAULT_PHP_VERSION-intl php$YNH_DEFAULT_PHP_VERSION-mbstring php$YNH_DEFAULT_PHP_VERSION-xml php$YNH_DEFAULT_PHP_VERSION-gd php$YNH_DEFAULT_PHP_VERSION-curl php$YNH_DEFAULT_PHP_VERSION-mysql"
 
-pgsql_pkg_dependencies="postgresql php${YNH_PHP_VERSION}-pgsql"
+pgsql_pkg_dependencies="postgresql php$YNH_DEFAULT_PHP_VERSION-pgsql"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/upgrade b/scripts/upgrade
index 29ae95b..60e5722 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -98,7 +98,7 @@ then
 	# Download, check integrity, uncompress and patch the source from app.src
 	mv "$final_path" "$final_path.old"
 
-	ynh_setup_source "$final_path"
+	ynh_setup_source --dest_dir="$final_path"
 	#ynh_secure_remove "$final_path"/tests
 
 	# when running automatic tests, there is no config.inc.php
@@ -108,7 +108,7 @@ then
 	fi
 
 	# delete temp directory
-	ynh_secure_remove "$final_path.old"
+	ynh_secure_remove --file="$final_path.old"
 fi
 
 chmod 750 "$final_path"