diff --git a/mastersetup.bash b/mastersetup.bash
index ed1b60d..5bfe2d9 100644
--- a/mastersetup.bash
+++ b/mastersetup.bash
@@ -89,8 +89,8 @@ sudo -u "$SUDO_USER" bash -ci "$(wget -qO - 'https://shlink.makedeb.org/install'
 
 # Floorp
 echo "Installing Floorp..."
-curl -fsSL https://ppa.floorp.app/KEY.gpg | sudo apt-key add -
-sudo curl -sS --compressed -o /etc/apt/sources.list.d/Floorp.list 'https://ppa.floorp.app/Floorp.list'
+curl -fsSL https://ppa.floorp.app/KEY.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/floorp-keyring.gpg
+echo "deb [signed-by=/etc/apt/keyrings/floorp-keyring.gpg] https://ppa.floorp.app ./" | sudo tee /etc/apt/sources.list.d/Floorp.list
 sudo apt update
 sudo apt install floorp -y
 
@@ -130,13 +130,13 @@ sudo apt install /tmp/steam.deb -y
 
 # NVM and Node.js
 echo "Installing NVM and Node.js..."
-bash -i <(wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh)
-. ~/.nvm/nvm.sh
-nvm install --lts
+sudo -u "$SUDO_USER" bash -i <(wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh)
+sudo -u "$SUDO_USER" . ~/.nvm/nvm.sh
+sudo -u "$SUDO_USER" nvm install --lts
 
 # Bun
 echo "Installing Bun..."
-curl -fsSL https://bun.sh/install | bash || { echo "Bun install failed" >&2; exit 1; }
+sudo -u "$SUDO_USER" curl -fsSL https://bun.sh/install | bash || { echo "Bun install failed" >&2; exit 1; }
 
 # Joplin
 wget -O - https://raw.githubusercontent.com/laurent22/joplin/dev/Joplin_install_and_update.sh | bash