diff --git a/scripts/install b/scripts/install
index 1634c52..ebe4569 100644
--- a/scripts/install
+++ b/scripts/install
@@ -95,11 +95,9 @@ CLONECOMMANDS
 
 # Switch branch to tagged release
 cd $final_path/live
-url=$(curl -s https://api.github.com/repos/tootsuite/mastodon/releases/latest | sort -r | head -1 | cut -d\" -f4)
-version=$(echo $url | cut -d/ -f8)
 sudo su - $app <<SWITCHCOMMANDS
 pushd ~/live
-git checkout $version
+git checkout $(git tag | tail -n 1)
 SWITCHCOMMANDS
 
 # Be king rewind (/var/cache/yunohost/from_file/scripts)
diff --git a/scripts/upgrade b/scripts/upgrade
index 529c124..979e005 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -50,11 +50,9 @@ PULLCOMMANDS
 
 # Switch branch to tagged release
 cd $final_path/live
-url=$(curl -s https://api.github.com/repos/tootsuite/mastodon/releases/latest | sort -r | head -1 | cut -d\" -f4)
-version=$(echo $url | cut -d/ -f8)
 sudo su - $app <<SWITCHCOMMANDS
 pushd ~/live
-git checkout $version
+git checkout $(git tag | tail -n 1)
 SWITCHCOMMANDS
 
 # upgrade Node.js v4 to v6