diff --git a/ct/2fauth.sh b/ct/2fauth.sh
index f16c854fb..416f86914 100644
--- a/ct/2fauth.sh
+++ b/ct/2fauth.sh
@@ -29,7 +29,7 @@ function update_script() {
     exit
   fi
   RELEASE=$(curl -fsSL https://api.github.com/repos/Bubka/2FAuth/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-  if [[ "${RELEASE}" != "$(cat /opt/2fauth_version.txt)" ]] || [[ ! -f /opt/2fauth_version.txt ]]; then
+  if [[ "${RELEASE}" != "$(cat ~/.2fauth 2>/dev/null || cat /opt/2fauth_version.txt 2>/dev/null)" ]]; then
     msg_info "Updating $APP to ${RELEASE}"
     $STD apt-get update
     $STD apt-get -y upgrade
@@ -45,10 +45,10 @@ function update_script() {
       $STD apt-get install -y \
         lsb-release \
         gnupg2
-      PHP_VERSION="8.3" PHP_MODULE="common,ctype,fileinfo,fpm,mysql,cli" install_php
+      PHP_VERSION="8.3" PHP_MODULE="common,ctype,fileinfo,fpm,mysql,cli" setup_php
       sed -i 's/php8.2/php8.3/g' /etc/nginx/conf.d/2fauth.conf
     fi
-    fetch_and_deploy_gh_release "Bubka/2FAuth"
+    fetch_and_deploy_gh_release "2fauth" "Bubka/2FAuth"
     mv "/opt/2fauth-backup/.env" "/opt/2fauth/.env"
     mv "/opt/2fauth-backup/storage" "/opt/2fauth/storage"
     cd "/opt/2fauth" || return
diff --git a/ct/actualbudget.sh b/ct/actualbudget.sh
index 6cd6188c6..8e1fe7b0d 100644
--- a/ct/actualbudget.sh
+++ b/ct/actualbudget.sh
@@ -29,7 +29,7 @@ function update_script() {
     exit
   fi
   NODE_VERSION="22"
-  install_node_and_modules
+  setup_nodejs
   RELEASE=$(curl -fsSL https://api.github.com/repos/actualbudget/actual/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
   if [[ -f /opt/actualbudget-data/config.json ]]; then
     if [[ ! -f /opt/actualbudget_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/actualbudget_version.txt)" ]]; then
diff --git a/ct/configarr.sh b/ct/configarr.sh
index 2921f249c..c6268d07a 100644
--- a/ct/configarr.sh
+++ b/ct/configarr.sh
@@ -28,7 +28,7 @@ function update_script() {
     exit
   fi
   RELEASE=$(curl -fsSL https://api.github.com/repos/raydak-labs/configarr/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-  if [[ "${RELEASE}" != "$(cat /opt/configarr_version.txt)" ]] || [[ ! -f /opt/configarr_version.txt ]]; then
+  if [[ "${RELEASE}" != "$(cat ~/.configarr 2>/dev/null || cat /opt/configarr_version.txt 2>/dev/null)" ]]; then
     msg_info "Stopping $APP"
     systemctl stop configarr-task.timer
     msg_ok "Stopped $APP"
@@ -37,7 +37,7 @@ function update_script() {
     mkdir -p /opt/backup/
     mv /opt/configarr/{config.yml,secrets.yml,.env} "/opt/backup/"
     rm -rf /opt/configarr
-    fetch_and_deploy_gh_release "raydak-labs/configarr"
+    fetch_and_deploy_gh_release "configarr" "raydak-labs/configarr"
     mv /opt/backup/* /opt/configarr/
     cd /opt/configarr
     $STD pnpm install
diff --git a/ct/fumadocs.sh b/ct/fumadocs.sh
index 244f2f2db..a4da269a8 100644
--- a/ct/fumadocs.sh
+++ b/ct/fumadocs.sh
@@ -34,7 +34,7 @@ function update_script() {
     exit 1
   fi
 
-  NODE_VERSION="22" NODE_MODULE="pnpm@latest" install_node_and_modules
+  NODE_VERSION="22" NODE_MODULE="pnpm@latest" setup_nodejs
   PROJECT_NAME=$(</opt/fumadocs/.projectname)
   PROJECT_DIR="/opt/fumadocs/${PROJECT_NAME}"
   SERVICE_NAME="fumadocs_${PROJECT_NAME}.service"
diff --git a/ct/gitea-mirror.sh b/ct/gitea-mirror.sh
index 6ea7bd885..008830a5a 100644
--- a/ct/gitea-mirror.sh
+++ b/ct/gitea-mirror.sh
@@ -29,7 +29,7 @@ function update_script() {
     exit
   fi
   RELEASE=$(curl -fsSL https://api.github.com/repos/arunavo4/gitea-mirror/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
+  if [[ "${RELEASE}" != "$(cat ~/.${APP} 2>/dev/null || cat /opt/${APP}_version.txt 2>/dev/null)" ]]; then
 
     msg_info "Stopping Services"
     systemctl stop gitea-mirror
@@ -48,15 +48,15 @@ function update_script() {
     msg_ok "Installed Bun"
 
     rm -rf /opt/gitea-mirror
-    fetch_and_deploy_gh_release "arunavo4/gitea-mirror"
-    
-    msg_info "Updating and rebuilding ${APP} to v${RELEASE}"  
+    fetch_and_deploy_gh_release "gitea-mirror" "arunavo4/gitea-mirror"
+
+    msg_info "Updating and rebuilding ${APP} to v${RELEASE}"
     cd /opt/gitea-mirror
     $STD bun run setup
     $STD bun run build
     APP_VERSION=$(grep -o '"version": *"[^"]*"' package.json | cut -d'"' -f4)
     sudo sed -i.bak "s|^Environment=npm_package_version=.*|Environment=npm_package_version=${APP_VERSION}|" /etc/systemd/system/gitea-mirror.service
-    msg_ok "Updated and rebuilt ${APP} to v${RELEASE}"  
+    msg_ok "Updated and rebuilt ${APP} to v${RELEASE}"
 
     msg_info "Restoring Data"
     cp /opt/gitea-mirror-backup/data/* /opt/gitea-mirror/data
diff --git a/ct/homarr.sh b/ct/homarr.sh
index dd448cfe9..686c36313 100644
--- a/ct/homarr.sh
+++ b/ct/homarr.sh
@@ -81,7 +81,7 @@ EOF
     systemctl daemon-reload
   fi
   RELEASE=$(curl -fsSL https://api.github.com/repos/homarr-labs/homarr/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
+  if [[ "${RELEASE}" != "$(cat ~/.${APP} 2>/dev/null || cat /opt/${APP}_version.txt 2>/dev/null)" ]]; then
 
     msg_info "Stopping Services (Patience)"
     systemctl stop homarr
@@ -100,10 +100,10 @@ EOF
     $STD command -v jq || $STD apt-get update && $STD apt-get install -y jq
     NODE_VERSION=$(curl -s https://raw.githubusercontent.com/homarr-labs/homarr/dev/package.json | jq -r '.engines.node | split(">=")[1] | split(".")[0]')
     NODE_MODULE="pnpm@$(curl -s https://raw.githubusercontent.com/homarr-labs/homarr/dev/package.json | jq -r '.packageManager | split("@")[1]')"
-    install_node_and_modules
-    
+    setup_nodejs
+
     rm -rf /opt/homarr
-    fetch_and_deploy_gh_release "homarr-labs/homarr"
+    fetch_and_deploy_gh_release "homarr" "homarr-labs/homarr"
 
     msg_info "Updating and rebuilding ${APP} to v${RELEASE} (Patience)"
     rm /opt/run_homarr.sh
diff --git a/ct/jellyseerr.sh b/ct/jellyseerr.sh
index d0afda87c..97d92a32b 100644
--- a/ct/jellyseerr.sh
+++ b/ct/jellyseerr.sh
@@ -53,10 +53,10 @@ function update_script() {
 
     if [ -z "$pnpm_current" ]; then
         msg_error "pnpm not found. Installing version $pnpm_desired..."
-        NODE_VERSION="22" NODE_MODULE="pnpm@$pnpm_desired" install_node_and_modules
+        NODE_VERSION="22" NODE_MODULE="pnpm@$pnpm_desired" setup_nodejs
     elif ! node -e "const semver = require('semver'); process.exit(semver.satisfies('$pnpm_current', '$pnpm_desired') ? 0 : 1)"; then
         msg_error "Updating pnpm from version $pnpm_current to $pnpm_desired..."
-        NODE_VERSION="22" NODE_MODULE="pnpm@$pnpm_desired" install_node_and_modules
+        NODE_VERSION="22" NODE_MODULE="pnpm@$pnpm_desired" setup_nodejs
     else
         msg_ok "pnpm is already installed and satisfies version $pnpm_desired."
     fi
diff --git a/ct/linkwarden.sh b/ct/linkwarden.sh
index 477209413..a072cf361 100644
--- a/ct/linkwarden.sh
+++ b/ct/linkwarden.sh
@@ -28,17 +28,17 @@ function update_script() {
   fi
   RELEASE=$(curl -fsSL https://api.github.com/repos/linkwarden/linkwarden/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
   if [[ "${RELEASE}" != "$(cat /opt/linkwarden_version.txt)" ]] || [[ ! -f /opt/linkwarden_version.txt ]]; then
-    NODE_VERSION="22" NODE_MODULE="yarn@latest" install_node_and_modules
+    NODE_VERSION="22" NODE_MODULE="yarn@latest" setup_nodejs
     msg_info "Stopping ${APP}"
     systemctl stop linkwarden
     msg_ok "Stopped ${APP}"
 
-    RUST_CRATES="monolith" install_rust_and_crates
+    RUST_CRATES="monolith" setup_rust
 
     msg_info "Updating ${APP} to ${RELEASE}"
     mv /opt/linkwarden/.env /opt/.env
     rm -rf /opt/linkwarden
-    fetch_and_deploy_gh_release "linkwarden/linkwarden"
+    fetch_and_deploy_gh_release "linkwarden" "linkwarden/linkwarden"
     cd /opt/linkwarden
     $STD yarn
     $STD npx playwright install-deps
diff --git a/ct/matterbridge.sh b/ct/matterbridge.sh
index 82bd704b5..39b029388 100644
--- a/ct/matterbridge.sh
+++ b/ct/matterbridge.sh
@@ -20,19 +20,17 @@ color
 catch_errors
 
 function update_script() {
-    header_info
-    check_container_storage
-    check_container_resources
-    if [[ ! -d /root/Matterbridge ]]; then
-        msg_error "No ${APP} Installation Found!"
-        exit
-    fi
-    $STD apt-get update
-    $STD apt-get upgrade -y
-    NODE_VERSION="22"
-    NODE_MODULE="matterbridge"
-    install_node_and_modules
+  header_info
+  check_container_storage
+  check_container_resources
+  if [[ ! -d /root/Matterbridge ]]; then
+    msg_error "No ${APP} Installation Found!"
     exit
+  fi
+  $STD apt-get update
+  $STD apt-get upgrade -y
+  NODE_VERSION="22" NODE_MODULE="matterbridge" setup_nodejs
+  exit
 }
 
 start
diff --git a/ct/seelf.sh b/ct/seelf.sh
index d36de48b9..350e1a687 100644
--- a/ct/seelf.sh
+++ b/ct/seelf.sh
@@ -28,7 +28,7 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  if fetch_and_deploy_gh_release "YuukanOO/seelf"; then
+  if fetch_and_deploy_gh_release "seelf" "YuukanOO/seelf"; then
     msg_ok "$APP already at the latest version. No update required."
   else
     msg_info "Stopping $APP"
diff --git a/ct/streamlink-webui.sh b/ct/streamlink-webui.sh
index 362f64ba0..d5adc55fe 100644
--- a/ct/streamlink-webui.sh
+++ b/ct/streamlink-webui.sh
@@ -30,9 +30,9 @@ function update_script() {
   fi
 
   RELEASE=$(curl -fsSL https://api.github.com/repos/CrazyWolf13/streamlink-webui/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-  if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}_version.txt ]]; then
+  if [[ "${RELEASE}" != "$(cat ~/.${APP} 2>/dev/null || cat /opt/${APP}_version.txt 2>/dev/null)" ]]; then
     msg_info "Starting Update"
-    
+
     msg_info "Stopping $APP"
     systemctl stop ${APP}
     msg_ok "Stopped $APP"
@@ -40,9 +40,9 @@ function update_script() {
     rm -rf /opt/${APP}
     NODE_VERSION="22"
     NODE_MODULE="npm,yarn"
-    install_node_and_modules
+    setup_nodejs
     setup_uv
-    fetch_and_deploy_gh_release "CrazyWolf13/streamlink-webui"
+    fetch_and_deploy_gh_release "streamlink-webui" "CrazyWolf13/streamlink-webui"
 
     msg_info "Updating $APP to v${RELEASE}"
     $STD uv venv /opt/"${APP}"/backend/src/.venv
diff --git a/ct/suwayomiserver.sh b/ct/suwayomiserver.sh
index 6a2dbe762..ce64e1da8 100644
--- a/ct/suwayomiserver.sh
+++ b/ct/suwayomiserver.sh
@@ -31,7 +31,7 @@ function update_script() {
   if dpkg -l | grep -q "openjdk-17-jre"; then
     $STD apt-get remove -y openjdk-17-jre
   fi
-  JAVA_VERSION=21 install_java
+  JAVA_VERSION=21 setup_java
   RELEASE=$(curl -fsSL https://api.github.com/repos/Suwayomi/Suwayomi-Server/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
   if [[ "${RELEASE}" != "$(cat /opt/suwayomi-server_version.txt)" ]] || [[ ! -f /opt/suwayomi-server_version.txt ]]; then
     msg_info "Updating $APP"
diff --git a/install/2fauth-install.sh b/install/2fauth-install.sh
index 291d52ca1..d5102d017 100644
--- a/install/2fauth-install.sh
+++ b/install/2fauth-install.sh
@@ -19,9 +19,9 @@ $STD apt-get install -y \
   nginx
 msg_ok "Installed Dependencies"
 
-PHP_VERSION="8.3" PHP_MODULE="common,ctype,fileinfo,fpm,mysql,cli" install_php
-install_composer
-install_mariadb
+PHP_VERSION="8.3" PHP_MODULE="common,ctype,fileinfo,fpm,mysql,cli" setup_php
+setup_composer
+setup_mariadb
 
 msg_info "Setting up Database"
 DB_NAME=2fauth_db
@@ -38,7 +38,7 @@ $STD mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUS
 } >>~/2FAuth.creds
 msg_ok "Set up Database"
 
-fetch_and_deploy_gh_release "Bubka/2FAuth"
+fetch_and_deploy_gh_release "2fauth" "Bubka/2FAuth"
 
 msg_info "Setup 2FAuth"
 cd /opt/2fauth
diff --git a/install/actualbudget-install.sh b/install/actualbudget-install.sh
index 51843f6c7..59b2d3870 100644
--- a/install/actualbudget-install.sh
+++ b/install/actualbudget-install.sh
@@ -22,7 +22,7 @@ msg_info "Installing Actual Budget"
 cd /opt
 RELEASE=$(curl -fsSL https://api.github.com/repos/actualbudget/actual/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
 NODE_VERSION="22"
-install_node_and_modules
+setup_nodejs
 mkdir -p /opt/actualbudget-data/{server-files,upload,migrate,user-files,migrations,config}
 chown -R root:root /opt/actualbudget-data
 chmod -R 755 /opt/actualbudget-data
diff --git a/install/adventurelog-install.sh b/install/adventurelog-install.sh
index a56cd6949..cdd7f7f07 100644
--- a/install/adventurelog-install.sh
+++ b/install/adventurelog-install.sh
@@ -23,8 +23,8 @@ $STD apt-get install -y \
   python3-pip
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="pnpm@latest" install_node_and_modules
-PG_VERSION="16" PG_MODULES="postgis" install_postgresql
+NODE_VERSION="22" NODE_MODULE="pnpm@latest" setup_nodejs
+PG_VERSION="16" PG_MODULES="postgis" setup_postgresql
 
 msg_info "Set up PostgreSQL Database"
 DB_NAME="adventurelog_db"
diff --git a/install/apache-guacamole-install.sh b/install/apache-guacamole-install.sh
index fc2c99de3..6b8529bfc 100644
--- a/install/apache-guacamole-install.sh
+++ b/install/apache-guacamole-install.sh
@@ -38,7 +38,7 @@ $STD apt-get install -y \
   default-jdk
 msg_ok "Installed Dependencies"
 
-install_mariadb
+setup_mariadb
 
 msg_info "Setup Apache Tomcat"
 RELEASE=$(curl -fsSL https://dlcdn.apache.org/tomcat/tomcat-9/ | grep -oP '(?<=href=")v[^"/]+(?=/")' | sed 's/^v//' | sort -V | tail -n1)
diff --git a/install/archivebox-install.sh b/install/archivebox-install.sh
index d1700cab2..c09ded01e 100644
--- a/install/archivebox-install.sh
+++ b/install/archivebox-install.sh
@@ -33,7 +33,7 @@ $STD apt-get install -y \
   python3-regex
 msg_ok "Installed Python Dependencies"
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Installing Playwright"
 $STD pip install playwright
diff --git a/install/baikal-install.sh b/install/baikal-install.sh
index 0176c4f48..93d68fabc 100644
--- a/install/baikal-install.sh
+++ b/install/baikal-install.sh
@@ -20,7 +20,7 @@ $STD apt-get install -y \
   php-{pgsql,dom}
 msg_ok "Installed Dependencies"
 
-PG_VERSION="16" install_postgresql
+PG_VERSION="16" setup_postgresql
 
 msg_info "Setting up PostgreSQL Database"
 DB_NAME=baikal
diff --git a/install/bitmagnet-install.sh b/install/bitmagnet-install.sh
index 7ccdb8c67..69ecde640 100644
--- a/install/bitmagnet-install.sh
+++ b/install/bitmagnet-install.sh
@@ -20,8 +20,8 @@ $STD apt-get install -y \
   musl-dev
 msg_ok "Installed Dependencies"
 
-PG_VERSION="16" install_postgresql
-install_go
+PG_VERSION="16" setup_postgresql
+setup_go
 RELEASE=$(curl -fsSL https://api.github.com/repos/bitmagnet-io/bitmagnet/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
 
 msg_info "Installing bitmagnet v${RELEASE}"
diff --git a/install/bookstack-install.sh b/install/bookstack-install.sh
index 3f145ceee..0b3ebbd50 100644
--- a/install/bookstack-install.sh
+++ b/install/bookstack-install.sh
@@ -22,7 +22,7 @@ $STD apt-get install -y \
   make
 msg_ok "Installed Dependencies"
 
-install_mariadb
+setup_mariadb
 
 msg_info "Setting up Database"
 DB_NAME=bookstack
diff --git a/install/bytestash-install.sh b/install/bytestash-install.sh
index 535ae685b..03689e994 100644
--- a/install/bytestash-install.sh
+++ b/install/bytestash-install.sh
@@ -13,7 +13,7 @@ setting_up_container
 network_check
 update_os
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Installing ByteStash"
 JWT_SECRET=$(openssl rand -base64 32 | tr -d '/+=')
diff --git a/install/caddy-install.sh b/install/caddy-install.sh
index 83298772f..c4f94a9ea 100644
--- a/install/caddy-install.sh
+++ b/install/caddy-install.sh
@@ -29,7 +29,7 @@ msg_ok "Installed Caddy"
 
 read -r -p "${TAB3}Would you like to install xCaddy Addon? <y/N> " prompt
 if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
-  install_go
+  setup_go
   msg_info "Setup xCaddy"
   $STD apt-get install -y git
   cd /opt
diff --git a/install/changedetection-install.sh b/install/changedetection-install.sh
index 976b6159d..243775115 100644
--- a/install/changedetection-install.sh
+++ b/install/changedetection-install.sh
@@ -51,7 +51,7 @@ $STD apt-get install -y \
 rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
 msg_ok "Setup Python3"
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Installing Change Detection"
 mkdir /opt/changedetection
diff --git a/install/cloudflare-ddns-install.sh b/install/cloudflare-ddns-install.sh
index 26e1b4c65..d3ee19d22 100644
--- a/install/cloudflare-ddns-install.sh
+++ b/install/cloudflare-ddns-install.sh
@@ -13,7 +13,7 @@ setting_up_container
 network_check
 update_os
 
-install_go
+setup_go
 
 msg_info "Configure Application"
 var_cf_api_token="default"
diff --git a/install/configarr-install.sh b/install/configarr-install.sh
index c04693806..7ec4411a7 100644
--- a/install/configarr-install.sh
+++ b/install/configarr-install.sh
@@ -18,8 +18,8 @@ $STD apt-get install -y \
   git
 msg_ok "Installed Dependencies"
 
-NODE_MODULE="pnpm@latest" install_node_and_modules
-fetch_and_deploy_gh_release "raydak-labs/configarr"
+NODE_MODULE="pnpm@latest" setup_nodejs
+fetch_and_deploy_gh_release "configarr" "raydak-labs/configarr"
 
 msg_info "Setup ${APPLICATION}"
 cat <<EOF >/opt/configarr/.env
diff --git a/install/cronicle-install.sh b/install/cronicle-install.sh
index 5cb697f9d..9caee26ee 100644
--- a/install/cronicle-install.sh
+++ b/install/cronicle-install.sh
@@ -13,7 +13,7 @@ setting_up_container
 network_check
 update_os
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Installing Cronicle Primary Server"
 LATEST=$(curl -fsSL https://api.github.com/repos/jhuckaby/Cronicle/releases/latest | grep '"tag_name":' | cut -d'"' -f4)
diff --git a/install/cross-seed-install.sh b/install/cross-seed-install.sh
index a4dd77f0c..f100c0847 100644
--- a/install/cross-seed-install.sh
+++ b/install/cross-seed-install.sh
@@ -13,7 +13,7 @@ setting_up_container
 network_check
 update_os
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Setup Cross-Seed"
 $STD npm install cross-seed@latest -g
diff --git a/install/cryptpad-install.sh b/install/cryptpad-install.sh
index 74b7f8074..044c8f3ee 100644
--- a/install/cryptpad-install.sh
+++ b/install/cryptpad-install.sh
@@ -18,7 +18,7 @@ $STD apt-get install -y \
   git
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 read -p "${TAB3}Install OnlyOffice components instead of CKEditor? (Y/N): " onlyoffice
 
diff --git a/install/dashy-install.sh b/install/dashy-install.sh
index 1d6b779e9..3bda31cfb 100644
--- a/install/dashy-install.sh
+++ b/install/dashy-install.sh
@@ -13,7 +13,7 @@ setting_up_container
 network_check
 update_os
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 RELEASE=$(curl -fsSL https://api.github.com/repos/Lissy93/dashy/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
 msg_info "Installing Dashy ${RELEASE} (Patience)"
diff --git a/install/docmost-install.sh b/install/docmost-install.sh
index a6a74fd5e..e1b3a1368 100644
--- a/install/docmost-install.sh
+++ b/install/docmost-install.sh
@@ -20,8 +20,8 @@ $STD apt-get install -y \
   make
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="pnpm@$(curl -s https://raw.githubusercontent.com/docmost/docmost/main/package.json | jq -r '.packageManager | split("@")[1]')" install_node_and_modules
-PG_VERSION="16" install_postgresql
+NODE_VERSION="22" NODE_MODULE="pnpm@$(curl -s https://raw.githubusercontent.com/docmost/docmost/main/package.json | jq -r '.packageManager | split("@")[1]')" setup_nodejs
+PG_VERSION="16" setup_postgresql
 
 msg_info "Setting up PostgreSQL"
 DB_NAME="docmost_db"
diff --git a/install/documenso-install.sh b/install/documenso-install.sh
index 861f3f40e..a481928f0 100644
--- a/install/documenso-install.sh
+++ b/install/documenso-install.sh
@@ -28,8 +28,8 @@ $STD apt-get install -y \
   python3-bcrypt
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="turbo@1.9.3" install_node_and_modules
-PG_VERSION="16" install_postgresql
+NODE_VERSION="22" NODE_MODULE="turbo@1.9.3" setup_nodejs
+PG_VERSION="16" setup_postgresql
 
 msg_info "Setting up PostgreSQL"
 DB_NAME="documenso_db"
diff --git a/install/dolibarr-install.sh b/install/dolibarr-install.sh
index 0c98f5e74..52c54c5b9 100644
--- a/install/dolibarr-install.sh
+++ b/install/dolibarr-install.sh
@@ -19,7 +19,7 @@ $STD apt-get install -y \
   debconf-utils
 msg_ok "Installed Dependencies"
 
-install_mariadb
+setup_mariadb
 
 msg_info "Setting up Database"
 ROOT_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)
diff --git a/install/elementsynapse-install.sh b/install/elementsynapse-install.sh
index f9c654f1e..ec8d56b53 100644
--- a/install/elementsynapse-install.sh
+++ b/install/elementsynapse-install.sh
@@ -20,7 +20,7 @@ $STD apt-get install -y \
   debconf-utils
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="yarn@latest" install_node_and_modules
+NODE_VERSION="22" NODE_MODULE="yarn@latest" setup_nodejs
 
 read -p "${TAB3}Please enter the name for your server: " servername
 
@@ -57,8 +57,8 @@ cd /opt/synapse-admin
 $STD yarn global add serve
 $STD yarn install --ignore-engines
 $STD yarn build
-mv ./dist ../ && \
-  rm -rf * && \
+mv ./dist ../ &&
+  rm -rf * &&
   mv ../dist ./
 msg_ok "Installed Element Synapse"
 
diff --git a/install/excalidraw-install.sh b/install/excalidraw-install.sh
index f5a35e591..885a39c91 100644
--- a/install/excalidraw-install.sh
+++ b/install/excalidraw-install.sh
@@ -18,7 +18,7 @@ $STD apt-get install -y \
   xdg-utils
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="yarn@latest" install_node_and_modules
+NODE_VERSION="22" NODE_MODULE="yarn@latest" setup_nodejs
 
 msg_info "Setup Excalidraw"
 temp_file=$(mktemp)
diff --git a/install/firefly-install.sh b/install/firefly-install.sh
index 82082d76b..1c8e57041 100644
--- a/install/firefly-install.sh
+++ b/install/firefly-install.sh
@@ -24,7 +24,7 @@ $STD apt-get install -y \
   composer
 msg_ok "Installed Dependencies"
 
-install_mariadb
+setup_mariadb
 
 msg_info "Setting up database"
 DB_NAME=firefly
diff --git a/install/flowiseai-install.sh b/install/flowiseai-install.sh
index 55e364da4..585157d95 100644
--- a/install/flowiseai-install.sh
+++ b/install/flowiseai-install.sh
@@ -13,7 +13,7 @@ setting_up_container
 network_check
 update_os
 
-NODE_VERSION="20" install_node_and_modules
+NODE_VERSION="20" setup_nodejs
 
 msg_info "Installing FlowiseAI (Patience)"
 $STD npm install -g flowise \
diff --git a/install/freshrss-install.sh b/install/freshrss-install.sh
index dc2894f61..25251d13c 100644
--- a/install/freshrss-install.sh
+++ b/install/freshrss-install.sh
@@ -20,7 +20,7 @@ $STD apt-get install -y \
   libapache2-mod-php
 msg_ok "Installed Dependencies"
 
-PG_VERSION="16" install_postgresql
+PG_VERSION="16" setup_postgresql
 
 msg_info "Setting up PostgreSQL"
 DB_NAME=freshrss
diff --git a/install/frigate-install.sh b/install/frigate-install.sh
index 14458c553..a81b1588c 100644
--- a/install/frigate-install.sh
+++ b/install/frigate-install.sh
@@ -23,7 +23,7 @@ $STD apt-get install -y {python3,python3-dev,python3-setuptools,python3-distutil
 $STD pip install --upgrade pip
 msg_ok "Setup Python3"
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Installing go2rtc"
 mkdir -p /usr/local/go2rtc/bin
diff --git a/install/fumadocs-install.sh b/install/fumadocs-install.sh
index 84c894786..beef80e3e 100644
--- a/install/fumadocs-install.sh
+++ b/install/fumadocs-install.sh
@@ -17,7 +17,7 @@ $STD apt-get install -y \
   ca-certificates
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="pnpm@latest" install_node_and_modules
+NODE_VERSION="22" NODE_MODULE="pnpm@latest" setup_nodejs
 
 msg_info "Installing Fumadocs"
 mkdir -p /opt/fumadocs
diff --git a/install/gatus-install.sh b/install/gatus-install.sh
index 8a2fc7a5c..3b5cd563b 100644
--- a/install/gatus-install.sh
+++ b/install/gatus-install.sh
@@ -19,7 +19,7 @@ $STD apt-get install -y \
   libcap2-bin
 msg_ok "Installed Dependencies"
 
-install_go
+setup_go
 
 RELEASE=$(curl -s https://api.github.com/repos/TwiN/gatus/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
 msg_info "Setting up gatus v${RELEASE}"
diff --git a/install/ghost-install.sh b/install/ghost-install.sh
index 14604051d..cee4f3d58 100644
--- a/install/ghost-install.sh
+++ b/install/ghost-install.sh
@@ -19,7 +19,7 @@ $STD apt-get install -y \
   ca-certificates
 msg_ok "Installed Dependencies"
 
-install_mariadb
+setup_mariadb
 
 msg_info "Configuring Database"
 DB_NAME=ghost
@@ -37,7 +37,7 @@ $STD mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUS
 } >>~/ghost.creds
 msg_ok "Configured MySQL"
 
-NODE_VERSION="20" install_node_and_modules
+NODE_VERSION="20" setup_nodejs
 
 msg_info "Installing Ghost CLI"
 $STD npm install ghost-cli@latest -g
diff --git a/install/gitea-mirror-install.sh b/install/gitea-mirror-install.sh
index 2a44477b9..d1f3dd78f 100644
--- a/install/gitea-mirror-install.sh
+++ b/install/gitea-mirror-install.sh
@@ -28,7 +28,7 @@ ln -sf /opt/bun/bin/bun /usr/local/bin/bun
 ln -sf /opt/bun/bin/bun /usr/local/bin/bunx
 msg_ok "Installed Bun"
 
-fetch_and_deploy_gh_release "arunavo4/gitea-mirror"
+fetch_and_deploy_gh_release "gitea-mirror" "arunavo4/gitea-mirror"
 
 msg_info "Installing gitea-mirror"
 cd /opt/gitea-mirror
diff --git a/install/glpi-install.sh b/install/glpi-install.sh
index 2e9563b6a..25b0d7d7e 100644
--- a/install/glpi-install.sh
+++ b/install/glpi-install.sh
@@ -22,7 +22,7 @@ $STD apt-get install -y \
   libapache2-mod-php
 msg_ok "Installed Dependencies"
 
-install_mariadb
+setup_mariadb
 
 msg_info "Setting up database"
 DB_NAME=glpi_db
diff --git a/install/gomft-install.sh b/install/gomft-install.sh
index 5b5692d89..2d84ef014 100644
--- a/install/gomft-install.sh
+++ b/install/gomft-install.sh
@@ -22,8 +22,8 @@ $STD apt-get install -y \
   build-essential
 msg_ok "Installed Dependencies"
 
-install_go
-NODE_VERSION="22" install_node_and_modules
+setup_go
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Setup ${APPLICATION} (Patience)"
 temp_file=$(mktemp)
diff --git a/install/graylog-install.sh b/install/graylog-install.sh
index 21bec8777..397d8ebab 100644
--- a/install/graylog-install.sh
+++ b/install/graylog-install.sh
@@ -13,7 +13,7 @@ setting_up_container
 network_check
 update_os
 
-MONGO_VERSION="7.0" install_mongodb
+MONGO_VERSION="7.0" setup_mongodb
 
 msg_info "Setup Graylog Data Node"
 PASSWORD_SECRET=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c16)
diff --git a/install/grist-install.sh b/install/grist-install.sh
index 9649accf4..c69814c70 100644
--- a/install/grist-install.sh
+++ b/install/grist-install.sh
@@ -20,7 +20,7 @@ $STD apt-get install -y \
   python3.11-venv
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="yarn@latest" install_node_and_modules
+NODE_VERSION="22" NODE_MODULE="yarn@latest" setup_nodejs
 
 msg_info "Installing Grist"
 RELEASE=$(curl -fsSL https://api.github.com/repos/gristlabs/grist-core/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
diff --git a/install/habitica-install.sh b/install/habitica-install.sh
index 83ebdccfd..17443d621 100644
--- a/install/habitica-install.sh
+++ b/install/habitica-install.sh
@@ -22,7 +22,7 @@ curl -fsSL "http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1
 $STD dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="20" install_node_and_modules
+NODE_VERSION="20" setup_nodejs
 
 msg_info "Setup ${APPLICATION}"
 temp_file=$(mktemp)
diff --git a/install/homarr-install.sh b/install/homarr-install.sh
index 1116534bd..0ff212da9 100644
--- a/install/homarr-install.sh
+++ b/install/homarr-install.sh
@@ -28,8 +28,8 @@ msg_ok "Installed Dependencies"
 
 NODE_VERSION=$(curl -s https://raw.githubusercontent.com/homarr-labs/homarr/dev/package.json | jq -r '.engines.node | split(">=")[1] | split(".")[0]')
 NODE_MODULE="pnpm@$(curl -s https://raw.githubusercontent.com/homarr-labs/homarr/dev/package.json | jq -r '.packageManager | split("@")[1]')"
-install_node_and_modules
-fetch_and_deploy_gh_release "homarr-labs/homarr"
+setup_nodejs
+fetch_and_deploy_gh_release "homarr" "homarr-labs/homarr"
 
 msg_info "Installing Homarr (Patience)"
 cd /opt
diff --git a/install/homepage-install.sh b/install/homepage-install.sh
index 7726b5ea1..303648aa3 100644
--- a/install/homepage-install.sh
+++ b/install/homepage-install.sh
@@ -17,7 +17,7 @@ msg_info "Installing Dependencies"
 $STD apt-get install -y jq
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="pnpm@latest" install_node_and_modules
+NODE_VERSION="22" NODE_MODULE="pnpm@latest" setup_nodejs
 
 LOCAL_IP=$(hostname -I | awk '{print $1}')
 RELEASE=$(curl -fsSL https://api.github.com/repos/gethomepage/homepage/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
diff --git a/install/immich-install.sh b/install/immich-install.sh
index be7312767..367e68472 100644
--- a/install/immich-install.sh
+++ b/install/immich-install.sh
@@ -84,8 +84,8 @@ ln -s /usr/lib/jellyfin-ffmpeg/ffmpeg /usr/bin/ffmpeg
 ln -s /usr/lib/jellyfin-ffmpeg/ffprobe /usr/bin/ffprobe
 msg_ok "Dependencies Installed"
 
-NODE_VERSION="22" install_node_and_modules
-PG_VERSION="16" install_postgresql
+NODE_VERSION="22" setup_nodejs
+PG_VERSION="16" setup_postgresql
 
 read -r -p "${TAB3}Install OpenVINO dependencies for Intel HW-accelerated machine-learning? " prompt
 if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
diff --git a/install/iobroker-install.sh b/install/iobroker-install.sh
index c4494b7a4..340836ec3 100644
--- a/install/iobroker-install.sh
+++ b/install/iobroker-install.sh
@@ -17,7 +17,7 @@ msg_info "Installing Dependencies"
 $STD apt-get install -y ca-certificates
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Installing ioBroker (Patience)"
 $STD bash <(curl -fsSL https://iobroker.net/install.sh)
diff --git a/install/jellyseerr-install.sh b/install/jellyseerr-install.sh
index 5ceba13a9..1ea42d507 100644
--- a/install/jellyseerr-install.sh
+++ b/install/jellyseerr-install.sh
@@ -19,14 +19,12 @@ $STD apt-get install -y \
     build-essential
 msg_ok "Installed Dependencies"
 
-
-
 git clone -q https://github.com/Fallenbagel/jellyseerr.git /opt/jellyseerr
 cd /opt/jellyseerr
 $STD git checkout main
 
 pnpm_desired=$(grep -Po '"pnpm":\s*"\K[^"]+' /opt/jellyseerr/package.json)
-NODE_VERSION="22" NODE_MODULE="pnpm@$pnpm_desired" install_node_and_modules
+NODE_VERSION="22" NODE_MODULE="pnpm@$pnpm_desired" setup_nodejs
 
 msg_info "Installing Jellyseerr (Patience)"
 export CYPRESS_INSTALL_BINARY=0
diff --git a/install/karakeep-install.sh b/install/karakeep-install.sh
index f94956757..674333f9e 100644
--- a/install/karakeep-install.sh
+++ b/install/karakeep-install.sh
@@ -48,7 +48,7 @@ sed -i \
   /etc/meilisearch.toml
 msg_ok "Installed Meilisearch"
 
-NODE_VERSION="22" NODE_MODULE="yarn@latest" install_node_and_modules
+NODE_VERSION="22" NODE_MODULE="yarn@latest" setup_nodejs
 $STD npm install -g corepack@0.31.0
 
 msg_info "Installing karakeep"
diff --git a/install/kimai-install.sh b/install/kimai-install.sh
index 1df625cba..d4462f4c0 100644
--- a/install/kimai-install.sh
+++ b/install/kimai-install.sh
@@ -23,7 +23,7 @@ $STD apt-get install -y \
   lsb-release
 msg_ok "Installed Dependencies"
 
-install_mysql
+setup_mysql
 
 msg_info "Adding PHP8.4 Repository"
 $STD curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
diff --git a/install/koillection-install.sh b/install/koillection-install.sh
index 177dca51d..ca2bddd38 100644
--- a/install/koillection-install.sh
+++ b/install/koillection-install.sh
@@ -19,8 +19,8 @@ $STD apt-get install -y \
   lsb-release
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="yarn@latest" install_node_and_modules
-PG_VERSION="16" install_postgresql
+NODE_VERSION="22" NODE_MODULE="yarn@latest" setup_nodejs
+PG_VERSION="16" setup_postgresql
 
 msg_info "Setup PHP8.4 Repository"
 $STD curl -fsSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
diff --git a/install/libretranslate-install.sh b/install/libretranslate-install.sh
index 2b83b1bdf..d6f8dc04f 100644
--- a/install/libretranslate-install.sh
+++ b/install/libretranslate-install.sh
@@ -29,7 +29,7 @@ $STD apt-get install -y \
 msg_ok "Setup Python3"
 
 setup_uv
-fetch_and_deploy_gh_release "LibreTranslate/LibreTranslate"
+fetch_and_deploy_gh_release "LibreTranslate" "LibreTranslate/LibreTranslate"
 
 msg_info "Setup LibreTranslate (Patience)"
 cd /opt/libretranslate
diff --git a/install/linkwarden-install.sh b/install/linkwarden-install.sh
index 42821232f..241c57f4f 100644
--- a/install/linkwarden-install.sh
+++ b/install/linkwarden-install.sh
@@ -19,9 +19,9 @@ $STD apt-get install -y \
   build-essential
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="yarn@latest" install_node_and_modules
-PG_VERSION="16" install_postgresql
-RUST_CRATES="monolith" install_rust_and_crates
+NODE_VERSION="22" NODE_MODULE="yarn@latest" setup_nodejs
+PG_VERSION="16" setup_postgresql
+RUST_CRATES="monolith" setup_rust
 
 msg_info "Setting up PostgreSQL DB"
 DB_NAME=linkwardendb
@@ -48,7 +48,7 @@ if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
 fi
 
 msg_info "Installing Linkwarden (Patience)"
-fetch_and_deploy_gh_release "linkwarden/linkwarden"
+fetch_and_deploy_gh_release "linkwarden" "linkwarden/linkwarden"
 cd /opt/linkwarden
 $STD yarn
 $STD npx playwright install-deps
diff --git a/install/mafl-install.sh b/install/mafl-install.sh
index b07e56c71..574949dbb 100644
--- a/install/mafl-install.sh
+++ b/install/mafl-install.sh
@@ -20,7 +20,7 @@ $STD apt-get install -y gcc
 $STD apt-get install -y ca-certificates
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="yarn@latest" install_node_and_modules
+NODE_VERSION="22" NODE_MODULE="yarn@latest" setup_nodejs
 
 RELEASE=$(curl -fsSL https://api.github.com/repos/hywax/mafl/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
 msg_info "Installing Mafl v${RELEASE}"
diff --git a/install/magicmirror-install.sh b/install/magicmirror-install.sh
index f58109361..d4f21a008 100644
--- a/install/magicmirror-install.sh
+++ b/install/magicmirror-install.sh
@@ -13,7 +13,7 @@ setting_up_container
 network_check
 update_os
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Setup MagicMirror"
 temp_file=$(mktemp)
diff --git a/install/managemydamnlife-install.sh b/install/managemydamnlife-install.sh
index 41f9f48f3..1c1b1ccc0 100644
--- a/install/managemydamnlife-install.sh
+++ b/install/managemydamnlife-install.sh
@@ -13,8 +13,8 @@ setting_up_container
 network_check
 update_os
 
-NODE_VERSION="20" install_node_and_modules
-MYSQL_VERSION="8.0" install_mysql
+NODE_VERSION="20" setup_nodejs
+MYSQL_VERSION="8.0" setup_mysql
 
 msg_info "Setting up Database"
 DB_NAME="mmdl"
diff --git a/install/mariadb-install.sh b/install/mariadb-install.sh
index 8dd25864f..9a4777cd3 100644
--- a/install/mariadb-install.sh
+++ b/install/mariadb-install.sh
@@ -13,7 +13,7 @@ setting_up_container
 network_check
 update_os
 
-install_mariadb
+setup_mariadb
 
 msg_info "Setup MariaDB"
 sed -i 's/^# *\(port *=.*\)/\1/' /etc/mysql/my.cnf
diff --git a/install/matterbridge-install.sh b/install/matterbridge-install.sh
index fb1aa9124..f1ec5a102 100644
--- a/install/matterbridge-install.sh
+++ b/install/matterbridge-install.sh
@@ -17,7 +17,7 @@ msg_info "Install Matterbridge"
 mkdir -p /root/Matterbridge
 NODE_VERSION="22"
 NODE_MODULE="matterbridge"
-install_node_and_modules
+setup_nodejs
 msg_ok "Installed Matterbridge"
 
 msg_info "Creating Service"
diff --git a/install/mattermost-install.sh b/install/mattermost-install.sh
index 0a2481055..6007e8735 100644
--- a/install/mattermost-install.sh
+++ b/install/mattermost-install.sh
@@ -13,7 +13,7 @@ setting_up_container
 network_check
 update_os
 
-PG_VERSION="16" install_postgresql
+PG_VERSION="16" setup_postgresql
 
 msg_info "Setting up PostgreSQL"
 DB_NAME=mattermost
diff --git a/install/meilisearch-install.sh b/install/meilisearch-install.sh
index ff76d4f27..ecfc071d9 100644
--- a/install/meilisearch-install.sh
+++ b/install/meilisearch-install.sh
@@ -35,7 +35,7 @@ msg_ok "Setup ${APPLICATION}"
 
 read -r -p "${TAB3}Do you want add meilisearch-ui? [y/n]: " prompt
 if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
-  NODE_VERSION="22" NODE_MODULE="pnpm@latest" install_node_and_modules
+  NODE_VERSION="22" NODE_MODULE="pnpm@latest" setup_nodejs
 
   msg_info "Setup ${APPLICATION}-ui"
   tmp_file=$(mktemp)
diff --git a/install/memos-install.sh b/install/memos-install.sh
index 34c896d96..12d6573f2 100644
--- a/install/memos-install.sh
+++ b/install/memos-install.sh
@@ -21,8 +21,8 @@ $STD apt-get install -y \
   tzdata
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="pnpm@latest" install_node_and_modules
-install_go
+NODE_VERSION="22" NODE_MODULE="pnpm@latest" setup_nodejs
+setup_go
 
 msg_info "Installing Memos (Patience)"
 mkdir -p /opt/memos_data
diff --git a/install/meshcentral-install.sh b/install/meshcentral-install.sh
index 8ddc72c5a..9da47f812 100644
--- a/install/meshcentral-install.sh
+++ b/install/meshcentral-install.sh
@@ -17,7 +17,7 @@ msg_info "Installing Dependencies"
 $STD apt-get install -y ca-certificates
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Installing MeshCentral"
 mkdir /opt/meshcentral
diff --git a/install/metube-install.sh b/install/metube-install.sh
index 34910d449..ea55e5ecb 100644
--- a/install/metube-install.sh
+++ b/install/metube-install.sh
@@ -36,7 +36,7 @@ $STD apt-get install -y \
   python3-venv
 msg_ok "Setup Python3"
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Installing MeTube"
 $STD git clone https://github.com/alexta69/metube /opt/metube
diff --git a/install/monica-install.sh b/install/monica-install.sh
index 823150342..1f9ab9154 100644
--- a/install/monica-install.sh
+++ b/install/monica-install.sh
@@ -21,8 +21,8 @@ $STD apt-get install -y \
   composer
 msg_ok "Installed Dependencies"
 
-install_mariadb
-NODE_VERSION="20" NODE_MODULE="yarn@latest" install_node_and_modules
+setup_mariadb
+NODE_VERSION="20" NODE_MODULE="yarn@latest" setup_nodejs
 
 msg_info "Setting up MariaDB"
 DB_NAME=monica
diff --git a/install/myspeed-install.sh b/install/myspeed-install.sh
index 4bd6424a9..17bccfa64 100644
--- a/install/myspeed-install.sh
+++ b/install/myspeed-install.sh
@@ -19,7 +19,7 @@ $STD apt-get install -y \
   ca-certificates
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Installing MySpeed"
 RELEASE=$(curl -fsSL https://github.com/gnmyt/myspeed/releases/latest | grep "title>Release" | cut -d " " -f 5)
diff --git a/install/n8n-install.sh b/install/n8n-install.sh
index d36516a76..7496a8595 100644
--- a/install/n8n-install.sh
+++ b/install/n8n-install.sh
@@ -18,7 +18,7 @@ $STD apt-get install -y \
   ca-certificates
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Installing n8n (Patience)"
 $STD npm install --global patch-package
diff --git a/install/netbox-install.sh b/install/netbox-install.sh
index 6a3499c4c..1c9799774 100644
--- a/install/netbox-install.sh
+++ b/install/netbox-install.sh
@@ -26,7 +26,7 @@ $STD apt-get install -y \
   zlib1g-dev
 msg_ok "Installed Dependencies"
 
-PG_VERSION="16" install_postgresql
+PG_VERSION="16" setup_postgresql
 
 msg_info "Installing Python"
 $STD apt-get install -y \
diff --git a/install/node-red-install.sh b/install/node-red-install.sh
index 6588f1b78..3b5331a3b 100644
--- a/install/node-red-install.sh
+++ b/install/node-red-install.sh
@@ -19,7 +19,7 @@ $STD apt-get install -y \
   ca-certificates
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Installing Node-Red"
 $STD npm install -g --unsafe-perm node-red
diff --git a/install/nodebb-install.sh b/install/nodebb-install.sh
index d4f1093ae..92c54c30d 100644
--- a/install/nodebb-install.sh
+++ b/install/nodebb-install.sh
@@ -21,8 +21,8 @@ $STD apt-get install -y \
   ca-certificates
 msg_ok "Installed Dependencies"
 
-install_mongodb
-NODE_VERSION="22" install_node_and_modules
+setup_mongodb
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Configure MongoDB"
 MONGO_ADMIN_USER="admin"
diff --git a/install/openwebui-install.sh b/install/openwebui-install.sh
index 5f2908a7d..af2b36113 100644
--- a/install/openwebui-install.sh
+++ b/install/openwebui-install.sh
@@ -26,7 +26,7 @@ $STD apt-get install -y --no-install-recommends \
   python3-pip
 msg_ok "Setup Python3"
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Installing Open WebUI (Patience)"
 $STD git clone https://github.com/open-webui/open-webui.git /opt/open-webui
diff --git a/install/outline-install.sh b/install/outline-install.sh
index d733179f4..5715804b7 100644
--- a/install/outline-install.sh
+++ b/install/outline-install.sh
@@ -20,8 +20,8 @@ $STD apt-get install -y \
   redis
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="20" NODE_MODULE="yarn@latest" install_node_and_modules
-PG_VERSION="16" install_postgresql
+NODE_VERSION="20" NODE_MODULE="yarn@latest" setup_nodejs
+PG_VERSION="16" setup_postgresql
 
 msg_info "Set up PostgreSQL Database"
 DB_NAME="outline"
diff --git a/install/overseerr-install.sh b/install/overseerr-install.sh
index f2701c4f2..64679b3a7 100644
--- a/install/overseerr-install.sh
+++ b/install/overseerr-install.sh
@@ -19,7 +19,7 @@ $STD apt-get install -y \
   ca-certificates
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="yarn@latest" install_node_and_modules
+NODE_VERSION="22" NODE_MODULE="yarn@latest" setup_nodejs
 
 msg_info "Installing Overseerr (Patience)"
 git clone -q https://github.com/sct/overseerr.git /opt/overseerr
diff --git a/install/pairdrop-install.sh b/install/pairdrop-install.sh
index 8c7724134..751311dd2 100644
--- a/install/pairdrop-install.sh
+++ b/install/pairdrop-install.sh
@@ -18,7 +18,7 @@ $STD apt-get install -y \
   git
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Installing PairDrop"
 git clone -q https://github.com/schlagmichdoch/PairDrop.git /opt/pairdrop
diff --git a/install/paperless-ai-install.sh b/install/paperless-ai-install.sh
index f4972ef46..cb8fc4024 100644
--- a/install/paperless-ai-install.sh
+++ b/install/paperless-ai-install.sh
@@ -23,7 +23,7 @@ $STD apt-get install -y \
   python3-pip
 msg_ok "Installed Python3"
 
-install_node_and_modules
+setup_nodejs
 
 msg_info "Setup Paperless-AI"
 cd /opt
diff --git a/install/paperless-gpt-install.sh b/install/paperless-gpt-install.sh
index 43b994229..a4e02062b 100644
--- a/install/paperless-gpt-install.sh
+++ b/install/paperless-gpt-install.sh
@@ -23,8 +23,8 @@ $STD apt-get install -y \
   musl-tools
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" install_node_and_modules
-install_go
+NODE_VERSION="22" setup_nodejs
+setup_go
 
 msg_info "Setup Paperless-GPT"
 temp_file=$(mktemp)
diff --git a/install/paperless-ngx-install.sh b/install/paperless-ngx-install.sh
index 541aa4b2a..676d662da 100644
--- a/install/paperless-ngx-install.sh
+++ b/install/paperless-ngx-install.sh
@@ -35,7 +35,7 @@ $STD apt-get install -y \
   libleptonica-dev
 msg_ok "Installed Dependencies"
 
-PG_VERSION="16" install_postgresql
+PG_VERSION="16" setup_postgresql
 
 msg_info "Setup Python3"
 $STD apt-get install -y \
diff --git a/install/part-db-install.sh b/install/part-db-install.sh
index 3fde07809..dae56a5b5 100644
--- a/install/part-db-install.sh
+++ b/install/part-db-install.sh
@@ -24,8 +24,8 @@ $STD apt-get install -y \
   composer
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="yarn@latest" install_node_and_modules
-PG_VERSION="16" install_postgresql
+NODE_VERSION="22" NODE_MODULE="yarn@latest" setup_nodejs
+PG_VERSION="16" setup_postgresql
 
 msg_info "Setting up PHP"
 PHPVER=$(php -r 'echo PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION . "\n";')
diff --git a/install/paymenter-install.sh b/install/paymenter-install.sh
index c36585341..7c6345870 100644
--- a/install/paymenter-install.sh
+++ b/install/paymenter-install.sh
@@ -23,7 +23,7 @@ $STD apt-get install -y \
   redis-server
 msg_ok "Installed Dependencies"
 
-install_mariadb
+setup_mariadb
 
 msg_info "Adding PHP Repository"
 $STD curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
diff --git a/install/peanut-install.sh b/install/peanut-install.sh
index f2f806467..20af7871e 100644
--- a/install/peanut-install.sh
+++ b/install/peanut-install.sh
@@ -14,7 +14,7 @@ setting_up_container
 network_check
 update_os
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Installing NUT"
 $STD apt-get install -y nut-client
diff --git a/install/pelican-panel-install.sh b/install/pelican-panel-install.sh
index c78013f25..f82db19f7 100644
--- a/install/pelican-panel-install.sh
+++ b/install/pelican-panel-install.sh
@@ -20,7 +20,7 @@ $STD apt-get install -y \
   composer
 msg_ok "Installed Dependencies"
 
-install_mariadb
+setup_mariadb
 
 msg_info "Adding PHP8.4 Repository"
 $STD curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
diff --git a/install/pf2etools-install.sh b/install/pf2etools-install.sh
index ed1e7bbab..4b2f58e86 100644
--- a/install/pf2etools-install.sh
+++ b/install/pf2etools-install.sh
@@ -20,7 +20,7 @@ $STD apt-get install -y \
   git
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Setup Pf2eTools"
 cd /opt
diff --git a/install/phpipam-install.sh b/install/phpipam-install.sh
index df903dea3..115a52649 100644
--- a/install/phpipam-install.sh
+++ b/install/phpipam-install.sh
@@ -21,7 +21,7 @@ $STD apt-get install -y \
   php-pear
 msg_ok "Installed Dependencies"
 
-install_mariadb
+setup_mariadb
 
 msg_info "Setting up MariaDB"
 DB_NAME=phpipam
diff --git a/install/pingvin-install.sh b/install/pingvin-install.sh
index 778788176..216bf2720 100644
--- a/install/pingvin-install.sh
+++ b/install/pingvin-install.sh
@@ -19,7 +19,7 @@ $STD apt-get install -y \
   git
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="pm2" install_node_and_modules
+NODE_VERSION="22" NODE_MODULE="pm2" setup_nodejs
 
 msg_info "Installing Pingvin Share (Patience)"
 cd /opt
diff --git a/install/plant-it-install.sh b/install/plant-it-install.sh
index 99a012b25..73ebf1440 100644
--- a/install/plant-it-install.sh
+++ b/install/plant-it-install.sh
@@ -15,11 +15,11 @@ update_os
 
 msg_info "Installing Dependencies"
 $STD apt-get install -y \
-  redis \
-  nginx
+    redis \
+    nginx
 msg_ok "Installed Dependencies"
 
-install_mariadb
+setup_mariadb
 
 msg_info "Setting up Adoptium Repository"
 mkdir -p /etc/apt/keyrings
@@ -41,10 +41,10 @@ $STD mariadb -u root -e "CREATE DATABASE $DB_NAME;"
 $STD mariadb -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
 $STD mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;"
 {
-  echo "Plant-it Credentials"
-  echo "Plant-it Database User: $DB_USER"
-  echo "Plant-it Database Password: $DB_PASS"
-  echo "Plant-it Database Name: $DB_NAME"
+    echo "Plant-it Credentials"
+    echo "Plant-it Database User: $DB_USER"
+    echo "Plant-it Database Password: $DB_PASS"
+    echo "Plant-it Database Name: $DB_NAME"
 } >>~/plant-it.creds
 msg_ok "Set up MariaDB"
 
diff --git a/install/postgresql-install.sh b/install/postgresql-install.sh
index e12462536..332bf7557 100644
--- a/install/postgresql-install.sh
+++ b/install/postgresql-install.sh
@@ -13,7 +13,7 @@ setting_up_container
 network_check
 update_os
 
-PG_VERSION="17" install_postgresql
+PG_VERSION="17" setup_postgresql
 
 cat <<EOF >/etc/postgresql/17/main/pg_hba.conf
 # PostgreSQL Client Authentication Configuration File
diff --git a/install/projectsend-install.sh b/install/projectsend-install.sh
index 54624323b..4703f460c 100644
--- a/install/projectsend-install.sh
+++ b/install/projectsend-install.sh
@@ -20,7 +20,7 @@ $STD apt-get install -y \
   php8.2-{pdo,mysql,mbstring,gettext,fileinfo,gd,xml,zip}
 msg_ok "Installed Dependencies"
 
-install_mariadb
+setup_mariadb
 
 msg_info "Setting up MariaDB"
 DB_NAME=projectsend
diff --git a/install/ps5-mqtt-install.sh b/install/ps5-mqtt-install.sh
index 6aa49e2ac..5447fa0ad 100644
--- a/install/ps5-mqtt-install.sh
+++ b/install/ps5-mqtt-install.sh
@@ -19,7 +19,7 @@ $STD apt-get install -y \
   ca-certificates
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="playactor" install_node_and_modules
+NODE_VERSION="22" NODE_MODULE="playactor" setup_nodejs
 
 msg_info "Installing PS5-MQTT"
 RELEASE=$(curl -fsSL https://api.github.com/repos/FunkeyFlo/ps5-mqtt/releases/latest | jq -r '.tag_name')
diff --git a/install/pterodactyl-panel-install.sh b/install/pterodactyl-panel-install.sh
index a0c0608ef..419fd67d9 100644
--- a/install/pterodactyl-panel-install.sh
+++ b/install/pterodactyl-panel-install.sh
@@ -21,7 +21,7 @@ $STD apt-get install -y \
   composer
 msg_ok "Installed Dependencies"
 
-install_mariadb
+setup_mariadb
 
 msg_info "Adding PHP8.4 Repository"
 $STD curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
diff --git a/install/pulse-install.sh b/install/pulse-install.sh
index 5fe6b016c..e9e65273e 100644
--- a/install/pulse-install.sh
+++ b/install/pulse-install.sh
@@ -28,7 +28,7 @@ else
   exit 1
 fi
 
-NODE_VERSION="20" install_node_and_modules
+NODE_VERSION="20" setup_nodejs
 
 msg_info "Setup Pulse"
 RELEASE=$(curl -fsSL https://api.github.com/repos/rcourtman/Pulse/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
@@ -41,7 +41,6 @@ chown pulse:pulse /opt/pulse/.env
 echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
 msg_ok "Installed Pulse"
 
-
 msg_info "Setting permissions for /opt/pulse..."
 chown -R pulse:pulse "/opt/pulse"
 find "/opt/pulse" -type d -exec chmod 755 {} \;
diff --git a/install/reactive-resume-install.sh b/install/reactive-resume-install.sh
index 7c9f06ac3..f961c0915 100644
--- a/install/reactive-resume-install.sh
+++ b/install/reactive-resume-install.sh
@@ -19,8 +19,8 @@ curl -fsSL https://dl.min.io/server/minio/release/linux-amd64/minio.deb -o minio
 $STD dpkg -i minio.deb
 msg_ok "Installed Dependencies"
 
-PG_VERSION="16" PG_MODULES="common" install_postgresql
-NODE_VERSION="22" NODE_MODULE="pnpm@latest" install_node_and_modules
+PG_VERSION="16" PG_MODULES="common" setup_postgresql
+NODE_VERSION="22" NODE_MODULE="pnpm@latest" setup_nodejs
 
 msg_info "Setting up Database"
 DB_USER="rxresume"
diff --git a/install/revealjs-install.sh b/install/revealjs-install.sh
index 3db939c3b..eb1665608 100644
--- a/install/revealjs-install.sh
+++ b/install/revealjs-install.sh
@@ -13,7 +13,7 @@ setting_up_container
 network_check
 update_os
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Setup ${APPLICATION}"
 temp_file=$(mktemp)
diff --git a/install/seelf-install.sh b/install/seelf-install.sh
index 24bf5740c..174aa18ce 100644
--- a/install/seelf-install.sh
+++ b/install/seelf-install.sh
@@ -19,9 +19,9 @@ $STD apt-get install -y \
   gcc
 msg_ok "Installed Dependencies"
 
-install_go
-NODE_VERSION="22" install_node_and_modules
-fetch_and_deploy_gh_release "YuukanOO/seelf"
+setup_go
+NODE_VERSION="22" setup_nodejs
+fetch_and_deploy_gh_release "seelf" "YuukanOO/seelf"
 
 msg_info "Setting up seelf. Patience"
 cd /opt/seelf
diff --git a/install/sftpgo-install.sh b/install/sftpgo-install.sh
index 2d0859fcb..91df27d3f 100644
--- a/install/sftpgo-install.sh
+++ b/install/sftpgo-install.sh
@@ -17,7 +17,7 @@ msg_info "Installing Dependencies"
 $STD apt-get install -y sqlite3
 msg_ok "Installed Dependencies"
 
-install_go
+setup_go
 
 msg_info "Installing SFTPGo"
 curl -fsSL https://ftp.osuosl.org/pub/sftpgo/apt/gpg.key | gpg --dearmor -o /usr/share/keyrings/sftpgo-archive-keyring.gpg
diff --git a/install/shinobi-install.sh b/install/shinobi-install.sh
index 54dcc6b45..03c2b31c9 100644
--- a/install/shinobi-install.sh
+++ b/install/shinobi-install.sh
@@ -19,8 +19,8 @@ $STD apt-get install -y gcc g++ cmake
 $STD apt-get install -y ca-certificates
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" install_node_and_modules
-install_mariadb
+NODE_VERSION="22" setup_nodejs
+setup_mariadb
 
 msg_info "Installing FFMPEG"
 $STD apt-get install -y ffmpeg
diff --git a/install/snipeit-install.sh b/install/snipeit-install.sh
index 372375a07..98abcdacb 100644
--- a/install/snipeit-install.sh
+++ b/install/snipeit-install.sh
@@ -21,7 +21,7 @@ $STD apt-get install -y \
   php8.2-{bcmath,common,ctype,curl,fileinfo,fpm,gd,iconv,intl,mbstring,mysql,soap,xml,xsl,zip,cli}
 msg_ok "Installed Dependencies"
 
-install_mariadb
+setup_mariadb
 
 msg_info "Setting up database"
 DB_NAME=snipeit_db
diff --git a/install/streamlink-webui-install.sh b/install/streamlink-webui-install.sh
index 2ab9fe6a2..3c61e36ad 100644
--- a/install/streamlink-webui-install.sh
+++ b/install/streamlink-webui-install.sh
@@ -16,9 +16,9 @@ update_os
 
 NODE_VERSION="22"
 NODE_MODULE="npm@latest,yarn@latest"
-install_node_and_modules
+setup_nodejs
 setup_uv
-fetch_and_deploy_gh_release "CrazyWolf13/streamlink-webui"
+fetch_and_deploy_gh_release "streamlink-webui" "CrazyWolf13/streamlink-webui"
 
 msg_info "Setup ${APPLICATION}"
 mkdir -p "/opt/${APPLICATION}-download"
diff --git a/install/suwayomiserver-install.sh b/install/suwayomiserver-install.sh
index 18d12aa43..ffe7485c1 100644
--- a/install/suwayomiserver-install.sh
+++ b/install/suwayomiserver-install.sh
@@ -17,7 +17,7 @@ msg_info "Installing Dependencies"
 $STD apt-get install -y libc++-dev
 msg_ok "Installed Dependencies"
 
-JAVA_VERSION=21 install_java
+JAVA_VERSION=21 setup_java
 
 msg_info "Settting up Suwayomi-Server"
 temp_file=$(mktemp)
diff --git a/install/tandoor-install.sh b/install/tandoor-install.sh
index 3673e3013..b50f966fc 100644
--- a/install/tandoor-install.sh
+++ b/install/tandoor-install.sh
@@ -42,7 +42,7 @@ $STD apt-get install -y \
 rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
 msg_ok "Setup Python3"
 
-NODE_VERSION="20" NODE_MODULE="yarn@latest" install_node_and_modules
+NODE_VERSION="20" NODE_MODULE="yarn@latest" setup_nodejs
 
 msg_info "Installing Tandoor (Patience)"
 $STD git clone https://github.com/TandoorRecipes/recipes -b master /opt/tandoor
diff --git a/install/tasmocompiler-install.sh b/install/tasmocompiler-install.sh
index 1ba241f0b..128ea9b0f 100644
--- a/install/tasmocompiler-install.sh
+++ b/install/tasmocompiler-install.sh
@@ -22,7 +22,7 @@ msg_info "Setup Python3"
 $STD apt-get install -y python3-venv
 msg_ok "Setup Python3"
 
-NODE_VERSION="22" NODE_MODULE="yarn@latest" install_node_and_modules
+NODE_VERSION="22" NODE_MODULE="yarn@latest" setup_nodejs
 
 msg_info "Setup Platformio"
 curl -fsSL -o get-platformio.py https://raw.githubusercontent.com/platformio/platformio-core-installer/master/get-platformio.py
diff --git a/install/the-lounge-install.sh b/install/the-lounge-install.sh
index 28d7f0862..6758a30e8 100644
--- a/install/the-lounge-install.sh
+++ b/install/the-lounge-install.sh
@@ -18,7 +18,7 @@ $STD apt-get install -y \
   build-essential
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="yarn@latest,node-gyp" install_node_and_modules
+NODE_VERSION="22" NODE_MODULE="yarn@latest,node-gyp" setup_nodejs
 
 msg_info "Installing The Lounge"
 cd /opt
diff --git a/install/tianji-install.sh b/install/tianji-install.sh
index 5f7742855..658b1a320 100644
--- a/install/tianji-install.sh
+++ b/install/tianji-install.sh
@@ -26,8 +26,8 @@ $STD apt-get install -y \
   jq
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="pnpm@$(curl -s https://raw.githubusercontent.com/msgbyte/tianji/master/package.json | jq -r '.packageManager | split("@")[1]')" install_node_and_modules
-PG_VERSION="16" install_postgresql
+NODE_VERSION="22" NODE_MODULE="pnpm@$(curl -s https://raw.githubusercontent.com/msgbyte/tianji/master/package.json | jq -r '.packageManager | split("@")[1]')" setup_nodejs
+PG_VERSION="16" setup_postgresql
 
 msg_info "Setting up PostgreSQL"
 DB_NAME=tianji_db
diff --git a/install/umami-install.sh b/install/umami-install.sh
index e9fa625f0..d4e9e29ac 100644
--- a/install/umami-install.sh
+++ b/install/umami-install.sh
@@ -17,8 +17,8 @@ msg_info "Installing Dependencies"
 $STD apt-get install -y git
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="yarn@latest" install_node_and_modules
-PG_VERSION="16" install_postgresql
+NODE_VERSION="22" NODE_MODULE="yarn@latest" setup_nodejs
+PG_VERSION="16" setup_postgresql
 
 msg_info "Setting up postgresql"
 DB_NAME=umamidb
diff --git a/install/uptimekuma-install.sh b/install/uptimekuma-install.sh
index 91da064b5..3eb9b2b1c 100644
--- a/install/uptimekuma-install.sh
+++ b/install/uptimekuma-install.sh
@@ -18,7 +18,7 @@ $STD apt-get install -y git
 $STD apt-get install -y ca-certificates
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" install_node_and_modules
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Installing Uptime Kuma"
 $STD git clone https://github.com/louislam/uptime-kuma.git
diff --git a/install/watcharr-install.sh b/install/watcharr-install.sh
index ae8219211..7e2b4c15d 100644
--- a/install/watcharr-install.sh
+++ b/install/watcharr-install.sh
@@ -18,8 +18,8 @@ $STD apt-get install -y \
   gcc
 msg_ok "Installed Dependencies"
 
-install_go
-NODE_VERSION="22" install_node_and_modules
+setup_go
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Setup Watcharr"
 temp_file=$(mktemp)
diff --git a/install/wavelog-install.sh b/install/wavelog-install.sh
index f2a86514d..b1c54150d 100644
--- a/install/wavelog-install.sh
+++ b/install/wavelog-install.sh
@@ -19,7 +19,7 @@ $STD apt-get install -y \
   php8.2-{curl,mbstring,mysql,xml,zip,gd}
 msg_ok "Installed Dependencies"
 
-install_mariadb
+setup_mariadb
 
 msg_info "Setting up Database"
 DB_NAME=wavelog
diff --git a/install/web-check-install.sh b/install/web-check-install.sh
index 6ad50f6cf..807ab31f2 100644
--- a/install/web-check-install.sh
+++ b/install/web-check-install.sh
@@ -35,7 +35,7 @@ $STD apt-get -y install --no-install-recommends \
   x11-apps
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="yarn@latest" install_node_and_modules
+NODE_VERSION="22" NODE_MODULE="yarn@latest" setup_nodejs
 
 msg_info "Setup Python3"
 $STD apt-get install -y python3
diff --git a/install/wger-install.sh b/install/wger-install.sh
index 69eccaabd..0134b0c3d 100644
--- a/install/wger-install.sh
+++ b/install/wger-install.sh
@@ -15,9 +15,9 @@ update_os
 
 msg_info "Installing Dependencies"
 $STD apt-get install -y \
-  git \
-  apache2 \
-  libapache2-mod-wsgi-py3
+    git \
+    apache2 \
+    libapache2-mod-wsgi-py3
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Python"
@@ -25,7 +25,7 @@ $STD apt-get install -y python3-pip
 rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
 msg_ok "Installed Python"
 
-NODE_VERSION="22" NODE_MODULE="yarn@latest,sass" install_node_and_modules
+NODE_VERSION="22" NODE_MODULE="yarn@latest,sass" setup_nodejs
 
 msg_info "Setting up wger"
 $STD adduser wger --disabled-password --gecos ""
diff --git a/install/wikijs-install.sh b/install/wikijs-install.sh
index 0b944b1de..5bbfae492 100644
--- a/install/wikijs-install.sh
+++ b/install/wikijs-install.sh
@@ -18,8 +18,8 @@ $STD apt-get install -y \
   git
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="20" NODE_MODULE="yarn@latest,node-gyp" install_node_and_modules
-PG_VERSION="17" install_postgresql
+NODE_VERSION="20" NODE_MODULE="yarn@latest,node-gyp" setup_nodejs
+PG_VERSION="17" setup_postgresql
 
 msg_info "Set up PostgreSQL"
 DB_NAME="wiki"
diff --git a/install/wordpress-install.sh b/install/wordpress-install.sh
index a52a3fec8..5cac5e956 100644
--- a/install/wordpress-install.sh
+++ b/install/wordpress-install.sh
@@ -20,7 +20,7 @@ $STD apt-get install -y \
   libapache2-mod-php
 msg_ok "Installed Dependencies"
 
-install_mariadb
+setup_mariadb
 
 msg_info "Setting up Database"
 DB_NAME=wordpress_db
diff --git a/install/zigbee2mqtt-install.sh b/install/zigbee2mqtt-install.sh
index f2f3070f5..0e6ca49ff 100644
--- a/install/zigbee2mqtt-install.sh
+++ b/install/zigbee2mqtt-install.sh
@@ -22,7 +22,7 @@ $STD apt-get install -y \
   ca-certificates
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="22" NODE_MODULE="pnpm@latest" install_node_and_modules
+NODE_VERSION="22" NODE_MODULE="pnpm@latest" setup_nodejs
 
 msg_info "Setting up Zigbee2MQTT"
 cd /opt
diff --git a/install/zipline-install.sh b/install/zipline-install.sh
index c23f685a6..c453d6712 100644
--- a/install/zipline-install.sh
+++ b/install/zipline-install.sh
@@ -14,8 +14,8 @@ setting_up_container
 network_check
 update_os
 
-NODE_VERSION="22" NODE_MODULE="pnpm@latest" install_node_and_modules
-PG_VERSION="16" install_postgresql
+NODE_VERSION="22" NODE_MODULE="pnpm@latest" setup_nodejs
+PG_VERSION="16" setup_postgresql
 
 msg_info "Setting up PostgreSQL"
 DB_NAME=ziplinedb
diff --git a/install/zitadel-install.sh b/install/zitadel-install.sh
index a97c68f86..ac26c7207 100644
--- a/install/zitadel-install.sh
+++ b/install/zitadel-install.sh
@@ -17,7 +17,7 @@ msg_info "Installing Dependencies (Patience)"
 $STD apt-get install -y ca-certificates
 msg_ok "Installed Dependecies"
 
-PG_VERSION="17" PG_MODULES="common" install_postgresql
+PG_VERSION="17" PG_MODULES="common" setup_postgresql
 
 msg_info "Installing Postgresql"
 DB_NAME="zitadel"