diff --git a/scripts/install b/scripts/install
index 3d5172f..d9430a9 100644
--- a/scripts/install
+++ b/scripts/install
@@ -102,10 +102,9 @@ CLONECOMMANDS
 
 # Switch branch to tagged release
 cd $final_path/live
-version=$(curl -s https://api.github.com/repos/tootsuite/mastodon/releases/latest | grep tag_name | cut -d\" -f4)
 sudo su - $app <<SWITCHCOMMANDS
 pushd ~/live
-git checkout $version
+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 8e33ce8..6ab3a13 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -50,10 +50,9 @@ PULLCOMMANDS
 
 # Switch branch to tagged release
 cd $final_path/live
-version=$(curl -s https://api.github.com/repos/tootsuite/mastodon/releases/latest | grep tag_name | cut -d\" -f4)
 sudo su - $app <<SWITCHCOMMANDS
 pushd ~/live
-git checkout $version
+git checkout $(git tag -l | sort -V | tail -n 1)
 SWITCHCOMMANDS
 
 # upgrade Node.js v4 to v6