diff --git a/scripts/install b/scripts/install
index e747241..a4faed3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -95,11 +95,10 @@ 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)
+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 $(git tag | tail -n 1)
+git checkout $version
 SWITCHCOMMANDS
 
 # Be king rewind (/var/cache/yunohost/from_file/scripts)
diff --git a/scripts/upgrade b/scripts/upgrade
index 5be8dbe..a741c4d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -50,11 +50,10 @@ 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)
+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 $(git tag | tail -n 1)
+git checkout $version
 SWITCHCOMMANDS
 
 # upgrade Node.js v4 to v6