diff --git a/scripts/upgrade b/scripts/upgrade
index 07b3ee7..d1f985e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -37,12 +37,20 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
 # Stop Mastodon Services
 sudo systemctl stop mastodon-*.service
 
-# Update Mastodon
-sudo su - $app <<COMMANDS
+# Download Mastodon
+sudo su - $app <<PULLCOMMANDS
 pushd ~/live
 git fetch
 git pull https://github.com/tootsuite/mastodon.git master
-git checkout $(git tag | tail -n 1)
+PULLCOMMANDS
+
+# Switch branch to tagged release
+pushd /opt/mastodon/live
+sudo git checkout $(git tag | tail -n 1)
+
+# Apply Mastodon upgrade
+sudo su - $app <<COMMANDS
+pushd ~/live
 bin/bundle install
 yarn install --pure-lockfile
 RAILS_ENV=production bundle exec rails assets:clean