diff --git a/ct/tracearr.sh b/ct/tracearr.sh
index 050477041..d744db71b 100644
--- a/ct/tracearr.sh
+++ b/ct/tracearr.sh
@@ -33,8 +33,12 @@ function update_script() {
     systemctl stop tracearr postgresql redis
     msg_ok "Stopped Services"
 
-    PNPM_VERSION="$(curl -fsSL "https://raw.githubusercontent.com/connorgallopo/Tracearr/refs/heads/main/package.json" | jq -r '.packageManager | split("@")[1]')"
-    NODE_VERSION="22" NODE_MODULE="pnpm@${PNPM_VERSION}" setup_nodejs
+    msg_info "Updating pnpm"
+    PNPM_VERSION="$(curl -fsSL "https://raw.githubusercontent.com/connorgallopo/Tracearr/refs/heads/main/package.json" | jq -r '.packageManager | split("@")[1]' | cut -d'+' -f1)"
+    export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
+    $STD corepack prepare pnpm@${PNPM_VERSION} --activate
+    msg_ok "Updated pnpm"
+
     CLEAN_INSTALL=1 fetch_and_deploy_gh_release "tracearr" "connorgallopo/Tracearr" "tarball" "latest" "/opt/tracearr.build"
 
     msg_info "Building Tracearr"
diff --git a/install/tracearr-install.sh b/install/tracearr-install.sh
index 995b9dd04..6b03d51d0 100644
--- a/install/tracearr-install.sh
+++ b/install/tracearr-install.sh
@@ -17,10 +17,16 @@ msg_info "Installing Dependencies"
 $STD apt install -y redis-server
 msg_ok "Installed Dependencies"
 
-PNPM_VERSION="$(curl -fsSL "https://raw.githubusercontent.com/connorgallopo/Tracearr/refs/heads/main/package.json" | jq -r '.packageManager | split("@")[1]')"
-NODE_VERSION="22" NODE_MODULE="pnpm@${PNPM_VERSION}" setup_nodejs
+NODE_VERSION="22" setup_nodejs
 PG_VERSION="18" setup_postgresql
 
+msg_info "Installing pnpm"
+PNPM_VERSION="$(curl -fsSL "https://raw.githubusercontent.com/connorgallopo/Tracearr/refs/heads/main/package.json" | jq -r '.packageManager | split("@")[1]' | cut -d'+' -f1)"
+export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
+$STD corepack enable pnpm
+$STD corepack prepare pnpm@${PNPM_VERSION} --activate
+msg_ok "Installed pnpm"
+
 msg_info "Installing TimescaleDB"
 setup_deb822_repo \
   "timescaledb" \