diff --git a/scripts/install b/scripts/install
index 24b7d83..ad0e1cc 100755
--- a/scripts/install
+++ b/scripts/install
@@ -24,20 +24,7 @@ chown -R $app:$app "$install_dir"
 #=================================================
 ynh_script_progression --message="Building Minetest..."
 
-# Install the game
-if [ $game = "capturetheflag" ]; then
-	# Download Capture The Flag
-	ynh_setup_source --dest_dir=$install_dir/games/capturetheflag --source_id=capturetheflag
-elif [ $game = "mineclonia" ]; then
-	# Download Mineclonia
-	ynh_setup_source --dest_dir=$install_dir/games/mineclonia --source_id=mineclonia
-elif [ $game = "mineclone2" ]; then
-	# Download Mineclone2
-	ynh_setup_source --dest_dir=$install_dir/games/mineclone2 --source_id=mineclone2
-else
-	# Download Minetest Game
-	ynh_setup_source --dest_dir=$install_dir/games/minetest_game --source_id=minetest_game
-fi
+ynh_setup_source --dest_dir=$install_dir/games/$game --source_id=$game
 
 # Install IrrlichtMt
 ynh_setup_source --dest_dir=$install_dir/lib/irrlichtmt --source_id=irrlichtmt
diff --git a/scripts/upgrade b/scripts/upgrade
index 52215f3..e728913 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -9,12 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# CHECK VERSION
-#=================================================
-
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -22,7 +16,7 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="stop"
+ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
@@ -38,14 +32,10 @@ fi
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=1
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-	ynh_script_progression --message="Upgrading source files..." --weight=1
-
-	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir" --full_replace=1
-fi
+# Download, check integrity, uncompress and patch the source from app.src
+ynh_setup_source --dest_dir="$install_dir" --full_replace=1
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:$app "$install_dir"
@@ -58,19 +48,7 @@ chown -R $app:$app "$install_dir"
 ynh_script_progression --message="Building Minetest..."
 
 # Install the game
-if [ $game = "capturetheflag" ]; then
-	# Download Capture The Flag
-	ynh_setup_source --dest_dir=$install_dir/games/capturetheflag --source_id=capturetheflag
-elif [ $game = "mineclonia" ]; then
-	# Download Mineclonia
-	ynh_setup_source --dest_dir=$install_dir/games/mineclonia --source_id=mineclonia
-elif [ $game = "mineclone2" ]; then
-	# Download Mineclone2
-	ynh_setup_source --dest_dir=$install_dir/games/mineclone2 --source_id=mineclone2
-else
-	# Download Minetest Game
-	ynh_setup_source --dest_dir=$install_dir/games/minetest_game --source_id=minetest_game
-fi
+ynh_setup_source --dest_dir=$install_dir/games/$game --source_id=$game
 
 # Install IrrlichtMt
 ynh_setup_source --dest_dir=$install_dir/lib/irrlichtmt --source_id=irrlichtmt