diff --git a/ct/metube.sh b/ct/metube.sh
index 1d219630e..c1d08c652 100644
--- a/ct/metube.sh
+++ b/ct/metube.sh
@@ -40,6 +40,8 @@ function update_script() {
     fi
   fi
 
+  NODE_VERSION="24" NODE_MODULE="pnpm" setup_nodejs
+
   if check_for_gh_release "metube" "alexta69/metube"; then
     msg_info "Stopping Service"
     systemctl stop metube
@@ -56,8 +58,12 @@ function update_script() {
 
     msg_info "Building Frontend"
     cd /opt/metube/ui
-    $STD npm install
-    $STD node_modules/.bin/ng build
+    if command -v corepack >/dev/null 2>&1; then
+      $STD corepack enable
+      $STD corepack prepare pnpm --activate || true
+    fi
+    $STD pnpm install --frozen-lockfile
+    $STD pnpm run build
     msg_ok "Built Frontend"
 
     PYTHON_VERSION="3.13" setup_uv
diff --git a/install/metube-install.sh b/install/metube-install.sh
index bdbf32859..26396cf8a 100644
--- a/install/metube-install.sh
+++ b/install/metube-install.sh
@@ -23,7 +23,7 @@ $STD apt install -y \
 msg_ok "Installed Dependencies"
 
 PYTHON_VERSION="3.13" setup_uv
-NODE_VERSION="24" setup_nodejs
+NODE_VERSION="24" NODE_MODULE="pnpm" setup_nodejs
 
 msg_info "Installing Deno"
 export DENO_INSTALL="/usr/local"
@@ -37,8 +37,12 @@ fetch_and_deploy_gh_release "metube" "alexta69/metube" "tarball" "latest"
 
 msg_info "Installing MeTube"
 cd /opt/metube/ui
-$STD npm ci
-$STD node_modules/.bin/ng build --configuration production
+if command -v corepack >/dev/null 2>&1; then
+  $STD corepack enable
+  $STD corepack prepare pnpm --activate || true
+fi
+$STD pnpm install --frozen-lockfile
+$STD pnpm run build
 cd /opt/metube
 $STD uv sync
 mkdir -p /opt/metube_downloads /opt/metube_downloads/.metube /opt/metube_downloads/music /opt/metube_downloads/videos