diff --git a/scripts/install b/scripts/install
index b088eca..28564cf 100644
--- a/scripts/install
+++ b/scripts/install
@@ -104,7 +104,7 @@ CLONECOMMANDS
 cd $final_path/live
 sudo su - $app <<SWITCHCOMMANDS
 pushd ~/live
-git checkout $(git tag | tail -n 1)
+git checkout $(git tag -l | sort -V | tail -n 1)
 SWITCHCOMMANDS
 
 # Be king rewind (/var/cache/yunohost/from_file/scripts)
diff --git a/scripts/upgrade b/scripts/upgrade
index 5c64116..371593e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -52,7 +52,7 @@ PULLCOMMANDS
 cd $final_path/live
 sudo su - $app <<SWITCHCOMMANDS
 pushd ~/live
-git checkout $(git tag | tail -n 1)
+git checkout $(git tag -l | sort -V | tail -n 1)
 SWITCHCOMMANDS
 
 # upgrade Node.js v4 to v6