diff --git a/scripts/install b/scripts/install
index 39cbaa5..0c71505 100644
--- a/scripts/install
+++ b/scripts/install
@@ -93,9 +93,12 @@ git clone https://github.com/rbenv/ruby-build.git $final_path/.rbenv/plugins/rub
 git clone https://github.com/tootsuite/mastodon.git $final_path/live
 CLONECOMMANDS
 
-# Switch to tagged release
+# Switch branch to tagged release
 cd $final_path/live
-sudo git checkout $(git tag | tail -n 1)
+sudo su - $app <<SWITCHCOMMANDS
+pushd ~/live
+git checkout $(git tag | tail -n 1)
+SWITCHCOMMANDS
 
 # Be king rewind (/var/cache/yunohost/from_file/scripts)
 popd
diff --git a/scripts/upgrade b/scripts/upgrade
index ea548b9..f070bbd 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -50,7 +50,10 @@ PULLCOMMANDS
 
 # Switch branch to tagged release
 cd $final_path/live
-sudo git checkout $(git tag | tail -n 1)
+sudo su - $app <<SWITCHCOMMANDS
+pushd ~/live
+git checkout $(git tag | tail -n 1)
+SWITCHCOMMANDS
 
 # Apply Mastodon upgrade
 sudo su - $app <<COMMANDS