diff --git a/scripts/install b/scripts/install
index 1634c52..e747241 100644
--- a/scripts/install
+++ b/scripts/install
@@ -99,7 +99,7 @@ url=$(curl -s https://api.github.com/repos/tootsuite/mastodon/releases/latest |
 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..5be8dbe 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -54,7 +54,7 @@ url=$(curl -s https://api.github.com/repos/tootsuite/mastodon/releases/latest |
 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