Calibre-Web: Remove from Frontend during Critical Security Issues

2025-07-30 17:57:36 +00:00 · 2025-07-26 10:09:15 +02:00
44 changed files with 485 additions and 869 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -10,41 +10,6 @@
 > [!CAUTION]
 Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit the project's popularity for potentially malicious purposes.

-## 2025-07-28
-
-### 🚀 Updated Scripts
-
-  - Refactor: HiveMQ [@tremor021](https://github.com/tremor021) ([#6313](https://github.com/community-scripts/ProxmoxVE/pull/6313))
-
-  - #### 🐞 Bug Fixes
-
-    - fix: SSH authorized keys not added in Alpine install script [@enihsyou](https://github.com/enihsyou) ([#6316](https://github.com/community-scripts/ProxmoxVE/pull/6316))
-    - fix: removing ",gw=" from GATE var when reading/writing from/to config. [@teohz](https://github.com/teohz) ([#6177](https://github.com/community-scripts/ProxmoxVE/pull/6177))
-    - add 'g++' to actualbudget-install.sh [@saivishnu725](https://github.com/saivishnu725) ([#6293](https://github.com/community-scripts/ProxmoxVE/pull/6293))
-
-  - #### ✨ New Features
-
-    - [core]: create_lxc: better handling, fix lock handling, improve template validation & storage selection UX [@MickLesk](https://github.com/MickLesk) ([#6296](https://github.com/community-scripts/ProxmoxVE/pull/6296))
-    - ProxmoxVE 9.0 Beta: add BETA Version as test in pve_check [@MickLesk](https://github.com/MickLesk) ([#6295](https://github.com/community-scripts/ProxmoxVE/pull/6295))
-    - karakeep: Run workers in prod without tsx [@vhsdream](https://github.com/vhsdream) ([#6285](https://github.com/community-scripts/ProxmoxVE/pull/6285))
-
-  - #### 🔧 Refactor
-
-    - Refactor: Navidrome [@tremor021](https://github.com/tremor021) ([#6300](https://github.com/community-scripts/ProxmoxVE/pull/6300))
-    - Refactor: Gotify [@tremor021](https://github.com/tremor021) ([#6301](https://github.com/community-scripts/ProxmoxVE/pull/6301))
-    - Refactor: Grafana [@tremor021](https://github.com/tremor021) ([#6306](https://github.com/community-scripts/ProxmoxVE/pull/6306))
-    - Refactor: Argus [@tremor021](https://github.com/tremor021) ([#6305](https://github.com/community-scripts/ProxmoxVE/pull/6305))
-    - n8n: refactor environmentfile [@CrazyWolf13](https://github.com/CrazyWolf13) ([#6297](https://github.com/community-scripts/ProxmoxVE/pull/6297))
-
-## 2025-07-27
-
-### 🚀 Updated Scripts
-
-  - #### 🐞 Bug Fixes
-
-    - karakeep: export DATA_DIR from user config in update [@vhsdream](https://github.com/vhsdream) ([#6283](https://github.com/community-scripts/ProxmoxVE/pull/6283))
-    - go2rtc: Fix release download handling [@tremor021](https://github.com/tremor021) ([#6280](https://github.com/community-scripts/ProxmoxVE/pull/6280))
-
 ## 2025-07-26

 ### 🚀 Updated Scripts
--- a/ct/argus.sh
+++ b/ct/argus.sh
@ -23,23 +23,20 @@ function update_script() {
  header_info
  check_container_storage
  check_container_resources
+
  if [[ ! -d /opt/argus ]]; then
    msg_error "No ${APP} Installation Found!"
    exit
  fi

  RELEASE=$(curl -fsSL https://api.github.com/repos/release-argus/Argus/releases/latest | jq -r .tag_name | sed 's/^v//')
-  if [[ "${RELEASE}" != "$(cat ~/.Argus 2>/dev/null)" ]] || [[ ! -f ~/.Argus ]]; then
-    msg_info "Stopping service"
-    systemctl stop argus
-    msg_ok "Service stopped"
-
-    fetch_and_deploy_gh_release "Argus" "release-argus/Argus" "singlefile" "latest" "/opt/argus" "Argus*linux-amd64"
-
-    msg_info "Starting service"
-    systemctl start argus
-    msg_ok "Service started"
-
+  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
+    msg_info "Updating $APP to ${RELEASE}"
+    rm -f /opt/argus/Argus
+    curl -fsSL "https://github.com/release-argus/Argus/releases/download/${RELEASE}/Argus-${RELEASE}.linux-amd64" -o /opt/argus/Argus
+    chmod +x /opt/argus/Argus
+    systemctl restart argus
+    echo "${RELEASE}" >/opt/${APP}_version.txt
    msg_ok "Updated ${APP} to ${RELEASE}"
  else
    msg_ok "${APP} is already up to date (${RELEASE})"
--- a/ct/gotify.sh
+++ b/ct/gotify.sh
@ -29,18 +29,23 @@ function update_script() {
  fi

  RELEASE=$(curl -fsSL https://api.github.com/repos/gotify/server/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-  if [[ "${RELEASE}" != "$(cat ~/.gotify 2>/dev/null)" ]] || [[ ! -f ~/.gotify ]]; then
+  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
    msg_info "Stopping ${APP}"
    systemctl stop gotify
    msg_ok "Stopped ${APP}"

-    fetch_and_deploy_gh_release "gotify" "gotify/server" "prebuild" "latest" "/opt/gotify" "gotify-linux-amd64.zip"
-    chmod +x /opt/gotify/gotify-linux-amd64
+    msg_info "Updating ${APP} to ${RELEASE}"
+    cd /opt/gotify
+    curl -fsSL "https://github.com/gotify/server/releases/download/v${RELEASE}/gotify-linux-amd64.zip" -o $(basename "https://github.com/gotify/server/releases/download/v${RELEASE}/gotify-linux-amd64.zip")
+    $STD unzip -o gotify-linux-amd64.zip
+    rm -rf gotify-linux-amd64.zip
+    chmod +x gotify-linux-amd64
+    echo "${RELEASE}" >/opt/${APP}_version.txt
+    msg_ok "Updated ${APP} to ${RELEASE}"

    msg_info "Starting ${APP}"
    systemctl start gotify
    msg_ok "Started ${APP}"
-
    msg_ok "Updated Successfully"
  else
    msg_ok "No update required. ${APP} is already at ${RELEASE}"
--- a/ct/grafana.sh
+++ b/ct/grafana.sh
@ -27,7 +27,6 @@ function update_script() {
      msg_error "No ${APP} Installation Found!"
      exit
   fi
-   
   msg_info "Updating ${APP}"
   $STD apt-get update
   $STD apt-get -y upgrade
@ -42,4 +41,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:3000${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:3000${CL}"
--- a/ct/karakeep.sh
+++ b/ct/karakeep.sh
@ -52,10 +52,6 @@ function update_script() {
  rm -rf /opt/karakeep
  msg_ok "Update prepared"

-  if grep -q "start:prod" /etc/systemd/system/karakeep-workers.service; then
-    sed -i 's|^ExecStart=.*$|ExecStart=/usr/bin/node dist/index.mjs|' /etc/systemd/system/karakeep-workers.service
-    systemctl daemon-reload
-  fi
  fetch_and_deploy_gh_release "karakeep" "karakeep-app/karakeep"
  if command -v corepack >/dev/null; then
    $STD corepack disable
@ -64,7 +60,6 @@ function update_script() {
  NODE_VERSION="22" NODE_MODULE="pnpm@${MODULE_VERSION}" setup_nodejs

  msg_info "Updating ${APP} to v${RELEASE}"
-  corepack enable
  export PUPPETEER_SKIP_DOWNLOAD="true"
  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD="true"
  export NEXT_TELEMETRY_DISABLED=1
@ -74,12 +69,10 @@ function update_script() {
  $STD pnpm build
  cd /opt/karakeep/apps/workers
  $STD pnpm install --frozen-lockfile
-  $STD pnpm build
  cd /opt/karakeep/apps/cli
  $STD pnpm install --frozen-lockfile
  $STD pnpm build
-  DATA_DIR="$(sed -n '/^DATA_DIR/p' /etc/karakeep/karakeep.env | awk -F= '{print $2}')"
-  export DATA_DIR="${DATA_DIR:-/opt/karakeep_data}"
+  export DATA_DIR=/opt/karakeep_data
  cd /opt/karakeep/packages/db
  $STD pnpm migrate
  $STD pnpm store prune
--- a/ct/n8n.sh
+++ b/ct/n8n.sh
@ -34,18 +34,6 @@ function update_script() {
      echo "Installed NPM..."
    fi
  fi
-  if [ ! -f /opt/n8n.env ]; then
-    sed -i 's|^Environment="N8N_SECURE_COOKIE=false"$|EnvironmentFile="/opt/n8n.env"|' /etc/systemd/system/n8n.service
-    HOST_IP=$(hostname -I | awk '{print $1}')
-    mkdir -p /opt
-    cat <<EOF >/opt/n8n.env
-N8N_SECURE_COOKIE=false
-N8N_PORT=5678
-N8N_PROTOCOL=http
-N8N_HOST=$HOST_IP
-EOF
-  fi
-
  msg_info "Updating ${APP} LXC"
  $STD npm update -g n8n
  systemctl restart n8n
@ -60,4 +48,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:5678${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:5678${CL}"
--- a/ct/navidrome.sh
+++ b/ct/navidrome.sh
@ -27,19 +27,27 @@ function update_script() {
        msg_error "No ${APP} Installation Found!"
        exit
    fi
-    
-    RELEASE=$(curl -fsSL https://api.github.com/repos/navidrome/navidrome/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-    if [[ "${RELEASE}" != "$(cat ~/.navidrome 2>/dev/null)" ]] || [[ ! -f ~/.navidrome ]]; then
+    RELEASE=$(curl -fsSL https://api.github.com/repos/navidrome/navidrome/releases/latest | grep "tag_name" | awk -F '"' '{print $4}')
+    if [[ ! -f /opt/${APP}_version.txt ]]; then touch /opt/${APP}_version.txt; fi
+    if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
        msg_info "Stopping Services"
        systemctl stop navidrome
        msg_ok "Services Stopped"

-        fetch_and_deploy_gh_release "navidrome" "navidrome/navidrome" "binary"
+        msg_info "Updating ${APP} to ${RELEASE}"
+        TMP_DEB=$(mktemp --suffix=.deb)
+        curl -fsSL -o "${TMP_DEB}" "https://github.com/navidrome/navidrome/releases/download/${RELEASE}/navidrome_${RELEASE#v}_linux_amd64.deb"
+        $STD apt-get install -y "${TMP_DEB}"
+        echo "${RELEASE}" >/opt/"${APP}_version.txt"
+        msg_ok "Updated Navidrome"

        msg_info "Starting Services"
        systemctl start navidrome
        msg_ok "Started Services"

+        msg_info "Cleaning Up"
+        rm -f "${TMP_DEB}"
+        msg_ok "Cleaned"
        msg_ok "Updated Successfully"
    else
        msg_ok "No update required. ${APP} is already at ${RELEASE}"
--- a/frontend/public/json/gotify.json
+++ b/frontend/public/json/gotify.json
@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 80,
  "documentation": "https://gotify.net/docs/index",
--- a/frontend/public/json/hivemq.json
+++ b/frontend/public/json/hivemq.json
@ -9,7 +9,7 @@
  "updateable": false,
  "privileged": false,
  "interface_port": 1883,
-  "documentation": "https://github.com/hivemq/hivemq-community-edition/wiki",
+  "documentation": null,
  "website": "https://www.hivemq.com/",
  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/hivemq.webp",
  "config_path": "/opt/hivemq/conf/config.xml",
--- a/frontend/public/json/n8n.json
+++ b/frontend/public/json/n8n.json
@ -12,7 +12,7 @@
  "documentation": "https://docs.n8n.io/",
  "website": "https://n8n.io/",
  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/n8n.webp",
-  "config_path": "/opt/n8n.env",
+  "config_path": "",
  "description": "n8n is a workflow automation tool that enables users to automate various tasks and processes by connecting various data sources, systems, and services. It provides a visual interface for building workflows, allowing users to easily define and automate complex sequences of actions, such as data processing, conditional branching, and API calls. n8n supports a wide range of integrations, making it a versatile tool for automating a variety of use cases, from simple data processing workflows to complex business processes. With its extendable architecture, n8n is designed to be easily customizable and can be adapted to meet the specific needs of different users and industries.",
  "install_methods": [
    {
@ -31,10 +31,5 @@
    "username": null,
    "password": null
  },
-  "notes": [
-    {
-      "text": "You may need to configure the `WEBHOOK_URL` in the config file when using a domain.",
-      "type": "info"
-    }
-  ]
+  "notes": []
 }
--- a/frontend/public/json/navidrome.json
+++ b/frontend/public/json/navidrome.json
@ -1,40 +1,40 @@
 {
-  "name": "Navidrome",
-  "slug": "navidrome",
-  "categories": [
-    13
-  ],
-  "date_created": "2024-05-02",
-  "type": "ct",
-  "updateable": true,
-  "privileged": false,
-  "interface_port": 4533,
-  "documentation": "https://www.navidrome.org/docs/",
-  "website": "https://www.navidrome.org/",
-  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/navidrome.webp",
-  "config_path": "/etc/navidrome/navidrome.toml",
-  "description": "Navidrome is a music server solution that makes your music collection accessible from anywhere. It provides a modern web-based user interface and compatibility with a range of third-party mobile apps for both iOS and Android devices. With Navidrome, users can access their music collection from anywhere, whether at home or on the go. The software supports a variety of music formats, making it easy for users to play their favorite songs and albums. Navidrome provides a simple and user-friendly interface for managing and organizing music collections, making it a valuable tool for music lovers who want to access their music from anywhere. The software is designed to be easy to set up and use, making it a popular choice for those who want to host their own music server and enjoy their music collection from anywhere.",
-  "install_methods": [
-    {
-      "type": "default",
-      "script": "ct/navidrome.sh",
-      "resources": {
-        "cpu": 2,
-        "ram": 1024,
-        "hdd": 4,
-        "os": "debian",
-        "version": "12"
-      }
-    }
-  ],
-  "default_credentials": {
-    "username": null,
-    "password": null
-  },
-  "notes": [
-    {
-      "text": "To change Navidrome music folder path, `nano /etc/navidrome/navidrome.toml`",
-      "type": "info"
-    }
-  ]
+    "name": "Navidrome",
+    "slug": "navidrome",
+    "categories": [
+        13
+    ],
+    "date_created": "2024-05-02",
+    "type": "ct",
+    "updateable": true,
+    "privileged": false,
+    "interface_port": 4533,
+    "documentation": null,
+    "website": "https://www.navidrome.org/",
+    "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/navidrome.webp",
+    "config_path": "/etc/navidrome/navidrome.toml",
+    "description": "Navidrome is a music server solution that makes your music collection accessible from anywhere. It provides a modern web-based user interface and compatibility with a range of third-party mobile apps for both iOS and Android devices. With Navidrome, users can access their music collection from anywhere, whether at home or on the go. The software supports a variety of music formats, making it easy for users to play their favorite songs and albums. Navidrome provides a simple and user-friendly interface for managing and organizing music collections, making it a valuable tool for music lovers who want to access their music from anywhere. The software is designed to be easy to set up and use, making it a popular choice for those who want to host their own music server and enjoy their music collection from anywhere.",
+    "install_methods": [
+        {
+            "type": "default",
+            "script": "ct/navidrome.sh",
+            "resources": {
+                "cpu": 2,
+                "ram": 1024,
+                "hdd": 4,
+                "os": "debian",
+                "version": "12"
+            }
+        }
+    ],
+    "default_credentials": {
+        "username": null,
+        "password": null
+    },
+    "notes": [
+        {
+            "text": "To change Navidrome music folder path, `nano /etc/navidrome/navidrome.toml`",
+            "type": "info"
+        }
+    ]
 }
--- a/frontend/public/json/onlyoffice.json
+++ b/frontend/public/json/onlyoffice.json
@ -2,7 +2,7 @@
  "name": "ONLYOFFICE Docs",
  "slug": "onlyoffice",
  "categories": [
-    12
+    9
  ],
  "date_created": "2025-06-24",
  "type": "ct",
--- a/frontend/public/json/opnsense-vm.json
+++ b/frontend/public/json/opnsense-vm.json
@ -0,0 +1,41 @@
+{
+  "name": "OPNsense",
+  "slug": "opnsense-vm",
+  "categories": [
+    4,
+    2
+  ],
+  "date_created": "2025-02-11",
+  "type": "vm",
+  "updateable": true,
+  "privileged": false,
+  "interface_port": 443,
+  "documentation": "https://docs.opnsense.org/",
+  "website": "https://opnsense.org/",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/opnsense.webp",
+  "config_path": "",
+  "description": "OPNsense is an open-source firewall and routing platform based on FreeBSD. It provides advanced security features, including intrusion detection, VPN support, traffic shaping, and web filtering, with an intuitive web interface for easy management. Known for its reliability and regular updates, OPNsense is a popular choice for both businesses and home networks.",
+  "install_methods": [
+    {
+      "type": "default",
+      "script": "vm/opnsense-vm.sh",
+      "resources": {
+        "cpu": 4,
+        "ram": 8192,
+        "hdd": 10,
+        "os": "FreeBSD",
+        "version": "latest"
+      }
+    }
+  ],
+  "default_credentials": {
+    "username": "root",
+    "password": "opnsense"
+  },
+  "notes": [
+    {
+      "text": "It will fail with default settings if there is no vmbr0 and vmbr1 on your node. Use advanced settings in this case.",
+      "type": "warning"
+    }
+  ]
+}
--- a/frontend/public/json/versions.json
+++ b/frontend/public/json/versions.json
@ -1,124 +1,4 @@
 [
-  {
-    "name": "Graylog2/graylog2-server",
-    "version": "7.0.0-alpha.1",
-    "date": "2025-07-28T11:28:22Z"
-  },
-  {
-    "name": "OliveTin/OliveTin",
-    "version": "2025.7.28",
-    "date": "2025-07-28T10:19:38Z"
-  },
-  {
-    "name": "Paymenter/Paymenter",
-    "version": "v1.2.6",
-    "date": "2025-07-28T09:31:34Z"
-  },
-  {
-    "name": "mattermost/mattermost",
-    "version": "v9.11.18",
-    "date": "2025-07-22T06:18:08Z"
-  },
-  {
-    "name": "gotson/komga",
-    "version": "1.23.0",
-    "date": "2025-07-28T08:44:47Z"
-  },
-  {
-    "name": "Checkmk/checkmk",
-    "version": "v2.3.0p35",
-    "date": "2025-07-28T08:32:54Z"
-  },
-  {
-    "name": "home-assistant/core",
-    "version": "2025.7.4",
-    "date": "2025-07-28T08:15:50Z"
-  },
-  {
-    "name": "PrivateBin/PrivateBin",
-    "version": "2.0.0",
-    "date": "2025-07-28T07:48:40Z"
-  },
-  {
-    "name": "esphome/esphome",
-    "version": "2025.7.4",
-    "date": "2025-07-28T07:33:36Z"
-  },
-  {
-    "name": "Jackett/Jackett",
-    "version": "v0.22.2202",
-    "date": "2025-07-28T06:00:10Z"
-  },
-  {
-    "name": "firefly-iii/firefly-iii",
-    "version": "v6.2.21",
-    "date": "2025-07-17T04:46:25Z"
-  },
-  {
-    "name": "theonedev/onedev",
-    "version": "v12.0.2",
-    "date": "2025-07-28T03:34:53Z"
-  },
-  {
-    "name": "TryGhost/Ghost-CLI",
-    "version": "v1.28.1",
-    "date": "2025-07-28T01:39:35Z"
-  },
-  {
-    "name": "steveiliop56/tinyauth",
-    "version": "v3.6.2",
-    "date": "2025-07-17T12:08:03Z"
-  },
-  {
-    "name": "umami-software/umami",
-    "version": "v2.19.0",
-    "date": "2025-07-27T22:25:00Z"
-  },
-  {
-    "name": "moghtech/komodo",
-    "version": "v1.18.4",
-    "date": "2025-06-25T00:06:56Z"
-  },
-  {
-    "name": "dani-garcia/vaultwarden",
-    "version": "1.34.2",
-    "date": "2025-07-27T18:49:05Z"
-  },
-  {
-    "name": "msgbyte/tianji",
-    "version": "v1.24.7",
-    "date": "2025-07-27T18:34:18Z"
-  },
-  {
-    "name": "benjaminjonard/koillection",
-    "version": "1.6.16",
-    "date": "2025-07-27T14:48:37Z"
-  },
-  {
-    "name": "keycloak/keycloak",
-    "version": "26.3.2",
-    "date": "2025-07-24T10:14:27Z"
-  },
-  {
-    "name": "project-zot/zot",
-    "version": "v2.1.6",
-    "date": "2025-07-27T01:14:14Z"
-  },
-  {
-    "name": "aceberg/WatchYourLAN",
-    "version": "2.1.3",
-    "date": "2025-07-26T14:19:00Z"
-  },
-  {
-    "name": "blakeblackshear/frigate",
-    "version": "v0.14.1",
-    "date": "2024-08-29T22:32:51Z"
-  },
-  {
-    "name": "MediaBrowser/Emby.Releases",
-    "version": "4.9.1.2",
-    "date": "2025-06-26T22:08:00Z"
-  },
  {
    "name": "henrygd/beszel",
    "version": "v0.12.1",
@ -131,8 +11,8 @@
  },
  {
    "name": "ollama/ollama",
-    "version": "v0.10.0-rc1",
-    "date": "2025-07-22T20:40:47Z"
+    "version": "v0.10.0-rc2",
+    "date": "2025-07-25T21:24:06Z"
  },
  {
    "name": "homarr-labs/homarr",
@ -154,11 +34,6 @@
    "version": "fumadocs-openapi@9.1.5",
    "date": "2025-07-25T16:20:20Z"
  },
-  {
-    "name": "emqx/emqx",
-    "version": "e6.0.0-M2.202508-alpha.1",
-    "date": "2025-07-25T16:01:00Z"
-  },
  {
    "name": "heiher/hev-socks5-server",
    "version": "2.9.0",
@ -179,11 +54,26 @@
    "version": "v1.5.3-beta.10",
    "date": "2025-07-15T06:07:03Z"
  },
+  {
+    "name": "Jackett/Jackett",
+    "version": "v0.22.2193",
+    "date": "2025-07-25T05:54:10Z"
+  },
  {
    "name": "ErsatzTV/ErsatzTV",
    "version": "v25.3.1",
    "date": "2025-07-25T03:39:31Z"
  },
+  {
+    "name": "TryGhost/Ghost-CLI",
+    "version": "v1.28.0",
+    "date": "2025-07-25T01:21:13Z"
+  },
+  {
+    "name": "steveiliop56/tinyauth",
+    "version": "v3.6.2",
+    "date": "2025-07-17T12:08:03Z"
+  },
  {
    "name": "Brandawg93/PeaNUT",
    "version": "v5.10.0",
@ -194,6 +84,11 @@
    "version": "v4.102.2",
    "date": "2025-07-24T22:42:01Z"
  },
+  {
+    "name": "MediaBrowser/Emby.Releases",
+    "version": "4.9.1.2",
+    "date": "2025-06-26T22:08:00Z"
+  },
  {
    "name": "linuxserver/Heimdall",
    "version": "v2.7.3",
@ -219,6 +114,11 @@
    "version": "prototype-cellulite-1",
    "date": "2025-07-24T16:32:57Z"
  },
+  {
+    "name": "keycloak/keycloak",
+    "version": "26.3.2",
+    "date": "2025-07-24T10:14:27Z"
+  },
  {
    "name": "grokability/snipe-it",
    "version": "v8.2.1",
@ -234,11 +134,26 @@
    "version": "10.0.19",
    "date": "2025-07-16T09:45:14Z"
  },
+  {
+    "name": "Paymenter/Paymenter",
+    "version": "v1.2.5",
+    "date": "2025-07-24T11:52:16Z"
+  },
+  {
+    "name": "Checkmk/checkmk",
+    "version": "v2.3.0p35-rc2",
+    "date": "2025-07-24T07:00:54Z"
+  },
  {
    "name": "zwave-js/zwave-js-ui",
    "version": "v10.10.0",
    "date": "2025-07-24T06:15:19Z"
  },
+  {
+    "name": "firefly-iii/firefly-iii",
+    "version": "v6.2.21",
+    "date": "2025-07-17T04:46:25Z"
+  },
  {
    "name": "advplyr/audiobookshelf",
    "version": "v2.26.3",
@ -314,11 +229,21 @@
    "version": "v4.3.1",
    "date": "2025-07-22T20:10:08Z"
  },
+  {
+    "name": "esphome/esphome",
+    "version": "2025.7.3",
+    "date": "2025-07-22T20:09:49Z"
+  },
  {
    "name": "rcourtman/Pulse",
    "version": "v3.42.0",
    "date": "2025-07-14T22:07:28Z"
  },
+  {
+    "name": "msgbyte/tianji",
+    "version": "v1.24.6",
+    "date": "2025-07-22T17:14:21Z"
+  },
  {
    "name": "Dolibarr/dolibarr",
    "version": "21.0.2",
@ -344,6 +269,16 @@
    "version": "v1.6.11",
    "date": "2025-07-22T12:11:38Z"
  },
+  {
+    "name": "home-assistant/core",
+    "version": "2025.7.3",
+    "date": "2025-07-22T08:30:59Z"
+  },
+  {
+    "name": "mattermost/mattermost",
+    "version": "v9.11.18",
+    "date": "2025-07-22T06:18:08Z"
+  },
  {
    "name": "adityachandelgit/BookLore",
    "version": "v0.34.1",
@ -414,6 +349,11 @@
    "version": "sdk/v0.26.0",
    "date": "2025-07-20T13:26:30Z"
  },
+  {
+    "name": "OliveTin/OliveTin",
+    "version": "2025.7.19",
+    "date": "2025-07-20T09:44:35Z"
+  },
  {
    "name": "documenso/documenso",
    "version": "v1.12.2-rc.2",
@ -454,6 +394,11 @@
    "version": "v0.29.0",
    "date": "2025-07-19T08:54:54Z"
  },
+  {
+    "name": "theonedev/onedev",
+    "version": "v12.0.1",
+    "date": "2025-07-18T15:02:25Z"
+  },
  {
    "name": "TandoorRecipes/recipes",
    "version": "1.5.35",
@ -464,6 +409,11 @@
    "version": "coverity-w30-4.13.0",
    "date": "2025-07-18T12:05:26Z"
  },
+  {
+    "name": "emqx/emqx",
+    "version": "e6.0.0-M1.202507-rc.1",
+    "date": "2025-07-18T07:48:52Z"
+  },
  {
    "name": "cross-seed/cross-seed",
    "version": "v6.13.1",
@ -494,6 +444,11 @@
    "version": "8.1.15",
    "date": "2025-07-16T18:06:03Z"
  },
+  {
+    "name": "benjaminjonard/koillection",
+    "version": "1.6.15",
+    "date": "2025-07-16T16:47:57Z"
+  },
  {
    "name": "usememos/memos",
    "version": "v0.25.0",
@ -539,6 +494,11 @@
    "version": "4.3.0",
    "date": "2025-07-15T09:54:38Z"
  },
+  {
+    "name": "gotson/komga",
+    "version": "1.22.1",
+    "date": "2025-07-15T06:44:29Z"
+  },
  {
    "name": "go-gitea/gitea",
    "version": "v1.24.3",
@ -594,6 +554,11 @@
    "version": "v10.10.7",
    "date": "2025-04-05T19:14:59Z"
  },
+  {
+    "name": "blakeblackshear/frigate",
+    "version": "v0.14.1",
+    "date": "2024-08-29T22:32:51Z"
+  },
  {
    "name": "leiweibau/Pi.Alert",
    "version": "v2025-07-12",
@ -734,6 +699,11 @@
    "version": "2.37.0",
    "date": "2025-07-04T14:49:43Z"
  },
+  {
+    "name": "Graylog2/graylog2-server",
+    "version": "6.3.1",
+    "date": "2025-07-04T11:20:48Z"
+  },
  {
    "name": "cloudflare/cloudflared",
    "version": "2025.7.0",
@ -804,6 +774,11 @@
    "version": "v7.4.4",
    "date": "2025-06-30T13:04:22Z"
  },
+  {
+    "name": "PrivateBin/PrivateBin",
+    "version": "1.7.8",
+    "date": "2025-06-30T09:00:54Z"
+  },
  {
    "name": "typesense/typesense",
    "version": "v29.0",
@ -824,6 +799,11 @@
    "version": "v1.6.1",
    "date": "2025-06-25T21:19:25Z"
  },
+  {
+    "name": "moghtech/komodo",
+    "version": "v1.18.4",
+    "date": "2025-06-25T00:06:56Z"
+  },
  {
    "name": "arunavo4/gitea-mirror",
    "version": "v2.18.0",
@ -894,6 +874,11 @@
    "version": "2.0.0-pre3",
    "date": "2025-06-18T08:01:24Z"
  },
+  {
+    "name": "project-zot/zot",
+    "version": "v2.1.5",
+    "date": "2025-06-17T18:04:11Z"
+  },
  {
    "name": "donaldzou/WGDashboard",
    "version": "v4.2.4",
@ -1024,6 +1009,11 @@
    "version": "5.10.0",
    "date": "2025-05-28T05:48:20Z"
  },
+  {
+    "name": "dani-garcia/vaultwarden",
+    "version": "1.34.1",
+    "date": "2025-05-26T21:40:54Z"
+  },
  {
    "name": "stonith404/pingvin-share",
    "version": "v1.13.0",
@ -1069,6 +1059,11 @@
    "version": "1.0.0",
    "date": "2025-05-12T07:39:23Z"
  },
+  {
+    "name": "umami-software/umami",
+    "version": "v2.18.1",
+    "date": "2025-05-12T07:16:12Z"
+  },
  {
    "name": "owncast/owncast",
    "version": "v0.2.3",
@ -1174,6 +1169,11 @@
    "version": "1.5.0",
    "date": "2025-03-30T17:42:59Z"
  },
+  {
+    "name": "aceberg/WatchYourLAN",
+    "version": "2.1.2-alpine",
+    "date": "2025-03-30T06:25:22Z"
+  },
  {
    "name": "inspircd/inspircd",
    "version": "v4.7.0",
--- a/frontend/src/config/site-config.tsx
+++ b/frontend/src/config/site-config.tsx
@ -45,7 +45,7 @@ export const navbarLinks = [
 export const mostPopularScripts = ["post-pve-install", "docker", "homeassistant"];

 export const analytics = {
-  url: "analytics.bramsuurd.nl",
+  url: "analytics.community-scripts.org",
  token: "aefee1b9-2a12-4ac2-9d82-a63113edc62e",
 };

--- a/install/actualbudget-install.sh
+++ b/install/actualbudget-install.sh
@ -15,8 +15,7 @@ update_os

 msg_info "Installing Dependencies"
 $STD apt-get install -y \
-  make \
-  g++
+  make
 msg_ok "Installed Dependencies"

 msg_info "Installing Actual Budget"
--- a/install/argus-install.sh
+++ b/install/argus-install.sh
@ -13,7 +13,17 @@ setting_up_container
 network_check
 update_os

-fetch_and_deploy_gh_release "Argus" "release-argus/Argus" "singlefile" "latest" "/opt/argus" "Argus*linux-amd64"
+msg_info "Installing Dependencies"
+$STD apt-get install -y \
+  jq
+msg_ok "Installed Dependencies"
+
+msg_info "Setup Argus"
+RELEASE=$(curl -fsSL https://api.github.com/repos/release-argus/Argus/releases/latest | jq -r .tag_name | sed 's/^v//')
+mkdir -p /opt/argus
+curl -fsSL "https://github.com/release-argus/Argus/releases/download/${RELEASE}/Argus-${RELEASE}.linux-amd64" -o /opt/argus/Argus
+chmod +x /opt/argus/Argus
+msg_ok "Setup Argus"

 msg_info "Setup Argus Config"
 cat <<EOF >/opt/argus/config.yml
@ -61,6 +71,7 @@ service:
      icon_link_to: https://helper-scripts.com/
      web_url: https://github.com/community-scripts/ProxmoxVE/releases
 EOF
+echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
 msg_ok "Setup Config"

 msg_info "Creating Service"
--- a/install/go2rtc-install.sh
+++ b/install/go2rtc-install.sh
@ -13,7 +13,7 @@ setting_up_container
 network_check
 update_os

-USE_ORIGINAL_FILENAME="true" fetch_and_deploy_gh_release "go2rtc" "AlexxIT/go2rtc" "singlefile" "latest" "/opt/go2rtc" "go2rtc_linux_amd64"
+fetch_and_deploy_gh_release "go2rtc" "AlexxIT/go2rtc" "singlefile" "latest" "/opt/go2rtc" "go2rtc_linux_amd64"

 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/go2rtc.service
--- a/install/gotify-install.sh
+++ b/install/gotify-install.sh
@ -13,8 +13,16 @@ setting_up_container
 network_check
 update_os

-fetch_and_deploy_gh_release "gotify" "gotify/server" "prebuild" "latest" "/opt/gotify" "gotify-linux-amd64.zip"
-chmod +x /opt/gotify/gotify-linux-amd64
+msg_info "Installing Gotify"
+RELEASE=$(curl -fsSL https://api.github.com/repos/gotify/server/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
+mkdir -p /opt/gotify
+cd /opt/gotify
+curl -fsSL "https://github.com/gotify/server/releases/download/v${RELEASE}/gotify-linux-amd64.zip" -o "gotify-linux-amd64.zip"
+$STD unzip gotify-linux-amd64.zip
+rm -rf gotify-linux-amd64.zip
+chmod +x gotify-linux-amd64
+echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
+msg_ok "Installed Gotify"

 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/gotify.service
--- a/install/grafana-install.sh
+++ b/install/grafana-install.sh
@ -14,20 +14,20 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
-  apt-transport-https \
-  software-properties-common
+$STD apt-get install -y apt-transport-https
+$STD apt-get install -y software-properties-common
 msg_ok "Installed Dependencies"

 msg_info "Setting up Grafana Repository"
 curl -fsSL "https://apt.grafana.com/gpg.key" -o "/usr/share/keyrings/grafana.key"
-echo "deb [signed-by=/usr/share/keyrings/grafana.key] https://apt.grafana.com stable main" >/etc/apt/sources.list.d/grafana.list
+sh -c 'echo "deb [signed-by=/usr/share/keyrings/grafana.key] https://apt.grafana.com stable main" > /etc/apt/sources.list.d/grafana.list'
 msg_ok "Set up Grafana Repository"

 msg_info "Installing Grafana"
 $STD apt-get update
 $STD apt-get install -y grafana
-systemctl enable -q --now  grafana-server
+systemctl start grafana-server
+systemctl enable --now -q grafana-server.service
 msg_ok "Installed Grafana"

 motd_ssh
--- a/install/hivemq-install.sh
+++ b/install/hivemq-install.sh
@ -13,26 +13,34 @@ setting_up_container
 network_check
 update_os

-JAVA_VERSION="21" setup_java
-fetch_and_deploy_gh_release "hivemq" "hivemq/hivemq-community-edition" "prebuild" "latest" "/opt/hivemq" "hivemq-ce-*.zip"
+msg_info "Installing OpenJDK"
+curl -fsSL "https://packages.adoptium.net/artifactory/api/gpg/key/public" | gpg --dearmor >/etc/apt/trusted.gpg.d/adoptium.gpg
+echo 'deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/adoptium.gpg] https://packages.adoptium.net/artifactory/deb bookworm main' >/etc/apt/sources.list.d/adoptium.list
+$STD apt-get update
+$STD apt-get install -y temurin-17-jre
+msg_ok "Installed OpenJDK"

-msg_info "Configuring HiveMQ CE"
+msg_info "Installing HiveMQ CE"
+RELEASE=$(curl -fsSL https://api.github.com/repos/hivemq/hivemq-community-edition/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
+curl -fsSL "https://github.com/hivemq/hivemq-community-edition/releases/download/${RELEASE}/hivemq-ce-${RELEASE}.zip" -o "hivemq-ce-${RELEASE}.zip"
+$STD unzip hivemq-ce-${RELEASE}.zip
+mkdir -p /opt/hivemq
+mv hivemq-ce-${RELEASE}/* /opt/hivemq
 useradd -d /opt/hivemq hivemq
 chown -R hivemq:hivemq /opt/hivemq
 chmod +x /opt/hivemq/bin/run.sh
 cp /opt/hivemq/bin/init-script/hivemq.service /etc/systemd/system/hivemq.service
 rm /opt/hivemq/conf/config.xml
 mv /opt/hivemq/conf/examples/configuration/config-sample-tcp-and-websockets.xml /opt/hivemq/conf/config.xml
-msg_ok "Configured HiveMQ CE"
-
-msg_info "Starting service"
 systemctl enable -q --now hivemq
-msg_ok "Service started"
+msg_ok "Installed HiveMQ CE"

 motd_ssh
 customize

 msg_info "Cleaning up"
+rm -rf hivemq-ce-${RELEASE}.zip
+rm -rf ../hivemq-ce-${RELEASE}
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"
--- a/install/karakeep-install.sh
+++ b/install/karakeep-install.sh
@ -64,7 +64,6 @@ $STD pnpm install --frozen-lockfile
 $STD pnpm build
 cd /opt/karakeep/apps/workers
 $STD pnpm install --frozen-lockfile
-$STD pnpm build
 cd /opt/karakeep/apps/cli
 $STD pnpm install --frozen-lockfile
 $STD pnpm build
@ -168,7 +167,7 @@ Wants=network.target karakeep-browser.service meilisearch.service
 After=network.target karakeep-browser.service meilisearch.service

 [Service]
-ExecStart=/usr/bin/node dist/index.mjs
+ExecStart=pnpm start:prod
 WorkingDirectory=/opt/karakeep/apps/workers
 EnvironmentFile=/etc/karakeep/karakeep.env
 Restart=always
--- a/install/n8n-install.sh
+++ b/install/n8n-install.sh
@ -1,7 +1,7 @@
 #!/usr/bin/env bash

 # Copyright (c) 2021-2025 tteck
-# Author: tteck (tteckster) | Co-Author: CrazyWolf13
+# Author: tteck (tteckster)
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 # Source: https://n8n.io/

@ -26,22 +26,13 @@ $STD npm install --global n8n
 msg_ok "Installed n8n"

 msg_info "Creating Service"
-HOST_IP=$(hostname -I | awk '{print $1}')
-mkdir -p /opt
-cat <<EOF >/opt/n8n.env
-N8N_SECURE_COOKIE=false
-N8N_PORT=5678
-N8N_PROTOCOL=http
-N8N_HOST=$HOST_IP
-EOF
-
 cat <<EOF >/etc/systemd/system/n8n.service
 [Unit]
 Description=n8n

 [Service]
 Type=simple
-EnvironmentFile="/opt/n8n.env"
+Environment="N8N_SECURE_COOKIE=false"
 ExecStart=n8n start
 [Install]
 WantedBy=multi-user.target
--- a/install/navidrome-install.sh
+++ b/install/navidrome-install.sh
@ -14,14 +14,18 @@ network_check
 update_os

 msg_info "Installing Dependencies (Patience)"
-$STD apt-get install -y ffmpeg
+$STD apt-get install -y \
+  ffmpeg
 msg_ok "Installed Dependencies"

-fetch_and_deploy_gh_release "navidrome" "navidrome/navidrome" "binary"
-
-msg_info "Starting Navidrome"
+msg_info "Installing Navidrome"
+RELEASE=$(curl -fsSL https://api.github.com/repos/navidrome/navidrome/releases/latest | grep "tag_name" | awk -F '"' '{print $4}')
+TMP_DEB=$(mktemp --suffix=.deb)
+curl -fsSL -o "${TMP_DEB}" "https://github.com/navidrome/navidrome/releases/download/${RELEASE}/navidrome_${RELEASE#v}_linux_amd64.deb"
+$STD apt-get install -y "${TMP_DEB}"
 systemctl enable -q --now navidrome
-msg_ok "Started Navidrome"
+echo "${RELEASE}" >/opt/Navidrome_version.txt
+msg_ok "Installed Navidrome"

 read -p "${TAB3}Do you want to install filebrowser addon? (y/n) " -n 1 -r
 if [[ $REPLY =~ ^[Yy]$ ]]; then
@ -32,6 +36,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
+rm -f "${TMP_DEB}"
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"
--- a/misc/alpine-install.func
+++ b/misc/alpine-install.func
@ -152,11 +152,4 @@ EOF

  echo "bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/${app}.sh)\"" >/usr/bin/update
  chmod +x /usr/bin/update
-
-  if [[ -n "${SSH_AUTHORIZED_KEY}" ]]; then
-    mkdir -p /root/.ssh
-    echo "${SSH_AUTHORIZED_KEY}" >/root/.ssh/authorized_keys
-    chmod 700 /root/.ssh
-    chmod 600 /root/.ssh/authorized_keys
-  fi
 }
--- a/misc/build.func
+++ b/misc/build.func
@ -66,36 +66,13 @@ root_check() {

 # This function checks the version of Proxmox Virtual Environment (PVE) and exits if the version is not supported.
 pve_check() {
-  local PVE_VER
-  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
-
-  # Check for Proxmox VE 8.x
-  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
-    local MINOR="${BASH_REMATCH[1]}"
-    if ((MINOR < 1 || MINOR > 4)); then
-      msg_error "This version of Proxmox VE is not supported."
-      echo -e "Required: Proxmox VE version 8.1 – 8.4"
-      exit 1
-    fi
-    return 0
+  if ! pveversion | grep -Eq "pve-manager/8\.[0-4](\.[0-9]+)*"; then
+    msg_error "${CROSS}${RD}This version of Proxmox Virtual Environment is not supported"
+    echo -e "Requires Proxmox Virtual Environment Version 8.1 or later."
+    echo -e "Exiting..."
+    sleep 2
+    exit
  fi
-
-  # Check for Proxmox VE 9.x (Beta) — require confirmation
-  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
-    if whiptail --title "Proxmox 9.x Detected (Beta)" \
-      --yesno "You are using Proxmox VE $PVE_VER, which is currently in Beta state.\n\nThis version is experimentally supported.\n\nDo you want to proceed anyway?" 12 70; then
-      msg_ok "Confirmed: Continuing with Proxmox VE $PVE_VER"
-      return 0
-    else
-      msg_error "Aborted by user: Proxmox VE 9.x was not confirmed."
-      exit 1
-    fi
-  fi
-
-  # All other unsupported versions
-  msg_error "This version of Proxmox VE is not supported."
-  echo -e "Supported versions: Proxmox VE 8.1 – 8.4 or 9.x (Beta, with confirmation)"
-  exit 1
 }

 # When a node is running tens of containers, it's possible to exceed the kernel's cryptographic key storage allocations.
@ -249,7 +226,6 @@ write_config() {
  # This function writes the configuration to a file.
  if whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "Write configfile" --yesno "Do you want to write the selections to a config file?" 10 60; then
    FILEPATH="/opt/community-scripts/${NSAPP}.conf"
-    [[ "$GATE" =~ ",gw=" ]] && local GATE="${GATE##,gw=}"
    if [[ ! -f $FILEPATH ]]; then
      cat <<EOF >"$FILEPATH"
 # ${NSAPP} Configuration File
--- a/misc/config-file.func
+++ b/misc/config-file.func
@ -272,8 +272,7 @@ config_file() {
      GATE=""
    elif [[ "$NET" =~ $ip_cidr_regex ]]; then
      echo -e "${NETWORK}${BOLD}${DGN}IP Address: ${BGN}$NET${CL}"
-      if [[ -n "$GATE" ]]; then
-        [[ "$GATE" =~ ",gw=" ]] && GATE="${GATE##,gw=}"
+      if [ ! -z "$GATE" ]; then
        if [[ "$GATE" =~ $ip_regex ]]; then
          echo -e "${GATEWAY}${BOLD}${DGN}Gateway IP Address: ${BGN}$GATE${CL}"
          GATE=",gw=$GATE"
--- a/misc/create_lxc.sh
+++ b/misc/create_lxc.sh
@ -32,6 +32,7 @@ function on_exit() {
 }

 function error_handler() {
+
  local exit_code="$?"
  local line_number="$1"
  local command="$2"
@ -50,14 +51,6 @@ function on_terminate() {
  exit 143
 }

-function exit_script() {
-  clear
-  printf "\e[?25h"
-  echo -e "\n${CROSS}${RD}User exited script${CL}\n"
-  kill 0
-  exit 1
-}
-
 function check_storage_support() {
  local CONTENT="$1"
  local -a VALID_STORAGES=()
@ -71,7 +64,21 @@ function check_storage_support() {
  [[ ${#VALID_STORAGES[@]} -gt 0 ]]
 }

-# This function selects a storage pool for a given content type (e.g., rootdir, vztmpl).
+# This checks for the presence of valid Container Storage and Template Storage locations
+msg_info "Validating Storage"
+if ! check_storage_support "rootdir"; then
+
+  msg_error "No valid storage found for 'rootdir' (Container)."
+  exit 1
+fi
+if ! check_storage_support "vztmpl"; then
+
+  msg_error "No valid storage found for 'vztmpl' (Template)."
+  exit 1
+fi
+msg_ok "Validated Storage (rootdir / vztmpl)."
+
+# This function is used to select the storage class and determine the corresponding storage content type and label.
 function select_storage() {
  local CLASS=$1 CONTENT CONTENT_LABEL

@ -106,20 +113,8 @@ function select_storage() {
    ;;
  esac

-  # Check for preset STORAGE variable
-  if [ "$CONTENT" = "rootdir" ] && [ -n "${STORAGE:-}" ]; then
-    if pvesm status -content "$CONTENT" | awk 'NR>1 {print $1}' | grep -qx "$STORAGE"; then
-      STORAGE_RESULT="$STORAGE"
-      msg_info "Using preset storage: $STORAGE_RESULT for $CONTENT_LABEL"
-      return 0
-    else
-      msg_error "Preset storage '$STORAGE' is not valid for content type '$CONTENT'."
-      return 2
-    fi
-  fi
-
+local -a MENU
  local -A STORAGE_MAP
-  local -a MENU
  local COL_WIDTH=0

  while read -r TAG TYPE _ TOTAL USED FREE _; do
@ -140,23 +135,17 @@ function select_storage() {

  if [ $((${#MENU[@]} / 3)) -eq 1 ]; then
    STORAGE_RESULT="${STORAGE_MAP[${MENU[0]}]}"
-    STORAGE_INFO="${MENU[1]}"
    return 0
  fi

  local WIDTH=$((COL_WIDTH + 42))
  while true; do
-    local DISPLAY_SELECTED
-    DISPLAY_SELECTED=$(whiptail --backtitle "Proxmox VE Helper Scripts" \
+    local DISPLAY_SELECTED=$(whiptail --backtitle "Proxmox VE Helper Scripts" \
      --title "Storage Pools" \
      --radiolist "Which storage pool for ${CONTENT_LABEL,,}?\n(Spacebar to select)" \
      16 "$WIDTH" 6 "${MENU[@]}" 3>&1 1>&2 2>&3)

-    # Cancel or ESC
-    [[ $? -ne 0 ]] && exit_script
-
-    # Strip trailing whitespace or newline (important for storages like "storage (dir)")
-    DISPLAY_SELECTED=$(sed 's/[[:space:]]*$//' <<<"$DISPLAY_SELECTED")
+    [[ $? -ne 0 ]] && return 3

    if [[ -z "$DISPLAY_SELECTED" || -z "${STORAGE_MAP[$DISPLAY_SELECTED]+_}" ]]; then
      whiptail --msgbox "No valid storage selected. Please try again." 8 58
@ -164,12 +153,6 @@ function select_storage() {
    fi

    STORAGE_RESULT="${STORAGE_MAP[$DISPLAY_SELECTED]}"
-    for ((i = 0; i < ${#MENU[@]}; i += 3)); do
-      if [[ "${MENU[$i]}" == "$DISPLAY_SELECTED" ]]; then
-        STORAGE_INFO="${MENU[$i + 1]}"
-        break
-      fi
-    done
    return 0
  done
 }
@ -198,22 +181,45 @@ if qm status "$CTID" &>/dev/null || pct status "$CTID" &>/dev/null; then
  exit 206
 fi

-# This checks for the presence of valid Container Storage and Template Storage locations
-msg_info "Validating Storage"
-if ! check_storage_support "rootdir"; then
-  msg_error "No valid storage found for 'rootdir' (Container)."
-  exit 1
-fi
-if ! check_storage_support "vztmpl"; then
-  msg_error "No valid storage found for 'vztmpl' (Template)."
-  exit 1
-fi
-msg_ok "Valid Storage Found"
+# DEFAULT_FILE="/usr/local/community-scripts/default_storage"
+# if [[ -f "$DEFAULT_FILE" ]]; then
+#   source "$DEFAULT_FILE"
+#   if [[ -n "$TEMPLATE_STORAGE" && -n "$CONTAINER_STORAGE" ]]; then
+#     msg_info "Using default storage configuration from: $DEFAULT_FILE"
+#     msg_ok "Template Storage: ${BL}$TEMPLATE_STORAGE${CL} ${GN}|${CL} Container Storage: ${BL}$CONTAINER_STORAGE${CL}"
+#   else
+#     msg_warn "Default storage file exists but is incomplete – falling back to manual selection"
+#     TEMPLATE_STORAGE=$(select_storage template)
+#     msg_ok "Using ${BL}$TEMPLATE_STORAGE${CL} ${GN}for Template Storage."
+#     CONTAINER_STORAGE=$(select_storage container)
+#     msg_ok "Using ${BL}$CONTAINER_STORAGE${CL} ${GN}for Container Storage."
+#   fi
+# else
+#   # TEMPLATE STORAGE SELECTION
+#   # Template Storage
+#   while true; do
+#     TEMPLATE_STORAGE=$(select_storage template)
+#     if [[ -n "$TEMPLATE_STORAGE" ]]; then
+#       msg_ok "Using ${BL}$TEMPLATE_STORAGE${CL} ${GN}for Template Storage."
+#       break
+#     fi
+#     msg_warn "No valid template storage selected. Please try again."
+#   done
+
+#   while true; do
+#     CONTAINER_STORAGE=$(select_storage container)
+#     if [[ -n "$CONTAINER_STORAGE" ]]; then
+#       msg_ok "Using ${BL}$CONTAINER_STORAGE${CL} ${GN}for Container Storage."
+#       break
+#     fi
+#     msg_warn "No valid container storage selected. Please try again."
+#   done
+
+# fi

 while true; do
  if select_storage template; then
    TEMPLATE_STORAGE="$STORAGE_RESULT"
-    TEMPLATE_STORAGE_INFO="$STORAGE_INFO"
    break
  fi
 done
@ -221,11 +227,9 @@ done
 while true; do
  if select_storage container; then
    CONTAINER_STORAGE="$STORAGE_RESULT"
-    CONTAINER_STORAGE_INFO="$STORAGE_INFO"
    break
  fi
 done
-msg_ok "Validated Storage | Container: ${BL}$CONTAINER_STORAGE${CL} ($CONTAINER_STORAGE_INFO)"

 # Check free space on selected container storage
 STORAGE_FREE=$(pvesm status | awk -v s="$CONTAINER_STORAGE" '$1 == s { print $6 }')
@ -272,34 +276,28 @@ fi
 TEMPLATE="${TEMPLATES[-1]}"
 TEMPLATE_PATH="$(pvesm path $TEMPLATE_STORAGE:vztmpl/$TEMPLATE 2>/dev/null || echo "/var/lib/vz/template/cache/$TEMPLATE")"

-TEMPLATE_VALID=1
-if ! pveam list "$TEMPLATE_STORAGE" | grep -q "$TEMPLATE"; then
-  TEMPLATE_VALID=0
-elif [ ! -s "$TEMPLATE_PATH" ]; then
-  TEMPLATE_VALID=0
-elif ! tar --use-compress-program=zstdcat -tf "$TEMPLATE_PATH" >/dev/null 2>&1; then
-  TEMPLATE_VALID=0
-fi
-
-if [ "$TEMPLATE_VALID" -eq 0 ]; then
+# Check if template exists and is valid
+if ! pveam list "$TEMPLATE_STORAGE" | grep -q "$TEMPLATE" || ! zstdcat "$TEMPLATE_PATH" | tar -tf - >/dev/null 2>&1; then
  msg_warn "Template $TEMPLATE not found or appears to be corrupted. Re-downloading."
+
  [[ -f "$TEMPLATE_PATH" ]] && rm -f "$TEMPLATE_PATH"
  for attempt in {1..3}; do
    msg_info "Attempt $attempt: Downloading LXC template..."
+
    if pveam download "$TEMPLATE_STORAGE" "$TEMPLATE" >/dev/null 2>&1; then
      msg_ok "Template download successful."
      break
    fi
+
    if [ $attempt -eq 3 ]; then
-      msg_error "Failed after 3 attempts. Please check network access or manually run:\n  pveam download $TEMPLATE_STORAGE $TEMPLATE"
+      msg_error "Failed after 3 attempts. Please check your Proxmox host’s internet access or manually run:\n  pveam download $TEMPLATE_STORAGE $TEMPLATE"
      exit 208
    fi
+
    sleep $((attempt * 5))
  done
 fi

-msg_ok "LXC Template '$TEMPLATE' is ready to use."
-
 msg_info "Creating LXC Container"
 # Check and fix subuid/subgid
 grep -q "root:100000:65536" /etc/subuid || echo "root:100000:65536" >>/etc/subuid
@ -311,7 +309,7 @@ PCT_OPTIONS=(${PCT_OPTIONS[@]:-${DEFAULT_PCT_OPTIONS[@]}})

 # Secure creation of the LXC container with lock and template check
 lockfile="/tmp/template.${TEMPLATE}.lock"
-exec 9>"$lockfile" || {
+exec 9>"$lockfile" >/dev/null 2>&1 || {
  msg_error "Failed to create lock file '$lockfile'."
  exit 200
 }
@ -349,6 +347,7 @@ if ! pct create "$CTID" "${TEMPLATE_STORAGE}:vztmpl/${TEMPLATE}" "${PCT_OPTIONS[
  done

  sleep 1 # I/O-Sync-Delay
+
  msg_ok "Re-downloaded LXC Template"
 fi

--- a/misc/tools.func
+++ b/misc/tools.func
@ -959,7 +959,7 @@ function fetch_and_deploy_gh_release() {
        $STD apt-get install -y unzip
      fi
      unzip -q "$tmpdir/$filename" -d "$unpack_tmp"
-    elif [[ "$filename" == *.tar.* || "$filename" == *.tgz ]]; then
+    elif [[ "$filename" == *.tar.* ]]; then
      tar -xf "$tmpdir/$filename" -C "$unpack_tmp"
    else
      msg_error "Unsupported archive format: $filename"
@ -969,41 +969,23 @@ function fetch_and_deploy_gh_release() {

    local top_dirs
    top_dirs=$(find "$unpack_tmp" -mindepth 1 -maxdepth 1 -type d | wc -l)
-    local top_entries inner_dir
-    top_entries=$(find "$unpack_tmp" -mindepth 1 -maxdepth 1)
-    if [[ "$(echo "$top_entries" | wc -l)" -eq 1 && -d "$top_entries" ]]; then
+
+    if [[ "$top_dirs" -eq 1 ]]; then
      # Strip leading folder
-      inner_dir="$top_entries"
+      local inner_dir
+      inner_dir=$(find "$unpack_tmp" -mindepth 1 -maxdepth 1 -type d)
      shopt -s dotglob nullglob
-      if compgen -G "$inner_dir/*" >/dev/null; then
-        cp -r "$inner_dir"/* "$target/" || {
-          msg_error "Failed to copy contents from $inner_dir to $target"
-          rm -rf "$tmpdir" "$unpack_tmp"
-          return 1
-        }
-      else
-        msg_error "Inner directory is empty: $inner_dir"
-        rm -rf "$tmpdir" "$unpack_tmp"
-        return 1
-      fi
+      cp -r "$inner_dir"/* "$target/"
      shopt -u dotglob nullglob
    else
      # Copy all contents
      shopt -s dotglob nullglob
-      if compgen -G "$unpack_tmp/*" >/dev/null; then
-        cp -r "$unpack_tmp"/* "$target/" || {
-          msg_error "Failed to copy contents to $target"
-          rm -rf "$tmpdir" "$unpack_tmp"
-          return 1
-        }
-      else
-        msg_error "Unpacked archive is empty"
-        rm -rf "$tmpdir" "$unpack_tmp"
-        return 1
-      fi
+      cp -r "$unpack_tmp"/* "$target/"
      shopt -u dotglob nullglob
    fi

+    rm -rf "$unpack_tmp"
+
    ### Singlefile Mode ###
  elif [[ "$mode" == "singlefile" ]]; then
    local pattern="${6%\"}"
--- a/vm/archlinux-vm.sh
+++ b/vm/archlinux-vm.sh
@ -138,37 +138,14 @@ function check_root() {
  fi
 }

-pve_check() {
-  local PVE_VER
-  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
-
-  # Check for Proxmox VE 8.x
-  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
-    local MINOR="${BASH_REMATCH[1]}"
-    if ((MINOR < 1 || MINOR > 4)); then
-      msg_error "This version of Proxmox VE is not supported."
-      echo -e "Required: Proxmox VE version 8.1 – 8.4"
-      exit 1
-    fi
-    return 0
+function pve_check() {
+  if ! pveversion | grep -Eq "pve-manager/8\.[1-4](\.[0-9]+)*"; then
+    msg_error "${CROSS}${RD}This version of Proxmox Virtual Environment is not supported"
+    echo -e "Requires Proxmox Virtual Environment Version 8.1 or later."
+    echo -e "Exiting..."
+    sleep 2
+    exit
  fi
-
-  # Check for Proxmox VE 9.x (Beta) — require confirmation
-  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
-    if whiptail --title "Proxmox 9.x Detected (Beta)" \
-      --yesno "You are using Proxmox VE $PVE_VER, which is currently in Beta state.\n\nThis version is experimentally supported.\n\nDo you want to proceed anyway?" 12 70; then
-      msg_ok "Confirmed: Continuing with Proxmox VE $PVE_VER"
-      return 0
-    else
-      msg_error "Aborted by user: Proxmox VE 9.x was not confirmed."
-      exit 1
-    fi
-  fi
-
-  # All other unsupported versions
-  msg_error "This version of Proxmox VE is not supported."
-  echo -e "Supported versions: Proxmox VE 8.1 – 8.4 or 9.x (Beta, with confirmation)"
-  exit 1
 }

 function arch_check() {
--- a/vm/debian-vm.sh
+++ b/vm/debian-vm.sh
@ -138,37 +138,14 @@ function check_root() {
  fi
 }

-pve_check() {
-  local PVE_VER
-  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
-
-  # Check for Proxmox VE 8.x
-  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
-    local MINOR="${BASH_REMATCH[1]}"
-    if ((MINOR < 1 || MINOR > 4)); then
-      msg_error "This version of Proxmox VE is not supported."
-      echo -e "Required: Proxmox VE version 8.1 – 8.4"
-      exit 1
-    fi
-    return 0
+function pve_check() {
+  if ! pveversion | grep -Eq "pve-manager/8\.[1-4](\.[0-9]+)*"; then
+    msg_error "${CROSS}${RD}This version of Proxmox Virtual Environment is not supported"
+    echo -e "Requires Proxmox Virtual Environment Version 8.1 or later."
+    echo -e "Exiting..."
+    sleep 2
+    exit
  fi
-
-  # Check for Proxmox VE 9.x (Beta) — require confirmation
-  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
-    if whiptail --title "Proxmox 9.x Detected (Beta)" \
-      --yesno "You are using Proxmox VE $PVE_VER, which is currently in Beta state.\n\nThis version is experimentally supported.\n\nDo you want to proceed anyway?" 12 70; then
-      msg_ok "Confirmed: Continuing with Proxmox VE $PVE_VER"
-      return 0
-    else
-      msg_error "Aborted by user: Proxmox VE 9.x was not confirmed."
-      exit 1
-    fi
-  fi
-
-  # All other unsupported versions
-  msg_error "This version of Proxmox VE is not supported."
-  echo -e "Supported versions: Proxmox VE 8.1 – 8.4 or 9.x (Beta, with confirmation)"
-  exit 1
 }

 function arch_check() {
--- a/vm/docker-vm.sh
+++ b/vm/docker-vm.sh
@ -139,37 +139,14 @@ function check_root() {
  fi
 }

-pve_check() {
-  local PVE_VER
-  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
-
-  # Check for Proxmox VE 8.x
-  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
-    local MINOR="${BASH_REMATCH[1]}"
-    if ((MINOR < 1 || MINOR > 4)); then
-      msg_error "This version of Proxmox VE is not supported."
-      echo -e "Required: Proxmox VE version 8.1 – 8.4"
-      exit 1
-    fi
-    return 0
+function pve_check() {
+  if ! pveversion | grep -Eq "pve-manager/8\.[1-4](\.[0-9]+)*"; then
+    msg_error "${CROSS}${RD}This version of Proxmox Virtual Environment is not supported"
+    echo -e "Requires Proxmox Virtual Environment Version 8.1 or later."
+    echo -e "Exiting..."
+    sleep 2
+    exit
  fi
-
-  # Check for Proxmox VE 9.x (Beta) — require confirmation
-  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
-    if whiptail --title "Proxmox 9.x Detected (Beta)" \
-      --yesno "You are using Proxmox VE $PVE_VER, which is currently in Beta state.\n\nThis version is experimentally supported.\n\nDo you want to proceed anyway?" 12 70; then
-      msg_ok "Confirmed: Continuing with Proxmox VE $PVE_VER"
-      return 0
-    else
-      msg_error "Aborted by user: Proxmox VE 9.x was not confirmed."
-      exit 1
-    fi
-  fi
-
-  # All other unsupported versions
-  msg_error "This version of Proxmox VE is not supported."
-  echo -e "Supported versions: Proxmox VE 8.1 – 8.4 or 9.x (Beta, with confirmation)"
-  exit 1
 }

 function arch_check() {
--- a/vm/haos-vm.sh
+++ b/vm/haos-vm.sh
@ -142,37 +142,14 @@ function check_root() {
  fi
 }

-pve_check() {
-  local PVE_VER
-  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
-
-  # Check for Proxmox VE 8.x
-  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
-    local MINOR="${BASH_REMATCH[1]}"
-    if ((MINOR < 1 || MINOR > 4)); then
-      msg_error "This version of Proxmox VE is not supported."
-      echo -e "Required: Proxmox VE version 8.1 – 8.4"
-      exit 1
-    fi
-    return 0
+function pve_check() {
+  if ! pveversion | grep -Eq "pve-manager/8\.[1-4](\.[0-9]+)*"; then
+    msg_error "${CROSS}${RD}This version of Proxmox Virtual Environment is not supported"
+    echo -e "Requires Proxmox Virtual Environment Version 8.1 or later."
+    echo -e "Exiting..."
+    sleep 2
+    exit
  fi
-
-  # Check for Proxmox VE 9.x (Beta) — require confirmation
-  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
-    if whiptail --title "Proxmox 9.x Detected (Beta)" \
-      --yesno "You are using Proxmox VE $PVE_VER, which is currently in Beta state.\n\nThis version is experimentally supported.\n\nDo you want to proceed anyway?" 12 70; then
-      msg_ok "Confirmed: Continuing with Proxmox VE $PVE_VER"
-      return 0
-    else
-      msg_error "Aborted by user: Proxmox VE 9.x was not confirmed."
-      exit 1
-    fi
-  fi
-
-  # All other unsupported versions
-  msg_error "This version of Proxmox VE is not supported."
-  echo -e "Supported versions: Proxmox VE 8.1 – 8.4 or 9.x (Beta, with confirmation)"
-  exit 1
 }

 function arch_check() {
--- a/vm/mikrotik-routeros.sh
+++ b/vm/mikrotik-routeros.sh
@ -139,37 +139,14 @@ function check_root() {
  fi
 }

-pve_check() {
-  local PVE_VER
-  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
-
-  # Check for Proxmox VE 8.x
-  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
-    local MINOR="${BASH_REMATCH[1]}"
-    if ((MINOR < 1 || MINOR > 4)); then
-      msg_error "This version of Proxmox VE is not supported."
-      echo -e "Required: Proxmox VE version 8.1 – 8.4"
-      exit 1
-    fi
-    return 0
+function pve_check() {
+  if ! pveversion | grep -Eq "pve-manager/8\.[1-4](\.[0-9]+)*"; then
+    msg_error "${CROSS}${RD}This version of Proxmox Virtual Environment is not supported"
+    echo -e "Requires Proxmox Virtual Environment Version 8.1 or later."
+    echo -e "Exiting..."
+    sleep 2
+    exit
  fi
-
-  # Check for Proxmox VE 9.x (Beta) — require confirmation
-  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
-    if whiptail --title "Proxmox 9.x Detected (Beta)" \
-      --yesno "You are using Proxmox VE $PVE_VER, which is currently in Beta state.\n\nThis version is experimentally supported.\n\nDo you want to proceed anyway?" 12 70; then
-      msg_ok "Confirmed: Continuing with Proxmox VE $PVE_VER"
-      return 0
-    else
-      msg_error "Aborted by user: Proxmox VE 9.x was not confirmed."
-      exit 1
-    fi
-  fi
-
-  # All other unsupported versions
-  msg_error "This version of Proxmox VE is not supported."
-  echo -e "Supported versions: Proxmox VE 8.1 – 8.4 or 9.x (Beta, with confirmation)"
-  exit 1
 }

 function arch_check() {
--- a/vm/nextcloud-vm.sh
+++ b/vm/nextcloud-vm.sh
@ -138,37 +138,14 @@ function check_root() {
  fi
 }

-pve_check() {
-  local PVE_VER
-  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
-
-  # Check for Proxmox VE 8.x
-  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
-    local MINOR="${BASH_REMATCH[1]}"
-    if ((MINOR < 1 || MINOR > 4)); then
-      msg_error "This version of Proxmox VE is not supported."
-      echo -e "Required: Proxmox VE version 8.1 – 8.4"
-      exit 1
-    fi
-    return 0
+function pve_check() {
+  if ! pveversion | grep -Eq "pve-manager/8\.[1-4](\.[0-9]+)*"; then
+    msg_error "${CROSS}${RD}This version of Proxmox Virtual Environment is not supported"
+    echo -e "Requires Proxmox Virtual Environment Version 8.1 or later."
+    echo -e "Exiting..."
+    sleep 2
+    exit
  fi
-
-  # Check for Proxmox VE 9.x (Beta) — require confirmation
-  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
-    if whiptail --title "Proxmox 9.x Detected (Beta)" \
-      --yesno "You are using Proxmox VE $PVE_VER, which is currently in Beta state.\n\nThis version is experimentally supported.\n\nDo you want to proceed anyway?" 12 70; then
-      msg_ok "Confirmed: Continuing with Proxmox VE $PVE_VER"
-      return 0
-    else
-      msg_error "Aborted by user: Proxmox VE 9.x was not confirmed."
-      exit 1
-    fi
-  fi
-
-  # All other unsupported versions
-  msg_error "This version of Proxmox VE is not supported."
-  echo -e "Supported versions: Proxmox VE 8.1 – 8.4 or 9.x (Beta, with confirmation)"
-  exit 1
 }

 function arch_check() {
--- a/vm/openwrt.sh
+++ b/vm/openwrt.sh
@ -184,37 +184,14 @@ function msg_error() {
  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
 }

-pve_check() {
-  local PVE_VER
-  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
-
-  # Check for Proxmox VE 8.x
-  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
-    local MINOR="${BASH_REMATCH[1]}"
-    if ((MINOR < 1 || MINOR > 4)); then
-      msg_error "This version of Proxmox VE is not supported."
-      echo -e "Required: Proxmox VE version 8.1 – 8.4"
-      exit 1
-    fi
-    return 0
+function pve_check() {
+  if ! pveversion | grep -Eq "pve-manager/8\.[1-4](\.[0-9]+)*"; then
+    msg_error "This version of Proxmox Virtual Environment is not supported"
+    echo -e "Requires Proxmox Virtual Environment Version 8.1 or later."
+    echo -e "Exiting..."
+    sleep 2
+    exit
  fi
-
-  # Check for Proxmox VE 9.x (Beta) — require confirmation
-  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
-    if whiptail --title "Proxmox 9.x Detected (Beta)" \
-      --yesno "You are using Proxmox VE $PVE_VER, which is currently in Beta state.\n\nThis version is experimentally supported.\n\nDo you want to proceed anyway?" 12 70; then
-      msg_ok "Confirmed: Continuing with Proxmox VE $PVE_VER"
-      return 0
-    else
-      msg_error "Aborted by user: Proxmox VE 9.x was not confirmed."
-      exit 1
-    fi
-  fi
-
-  # All other unsupported versions
-  msg_error "This version of Proxmox VE is not supported."
-  echo -e "Supported versions: Proxmox VE 8.1 – 8.4 or 9.x (Beta, with confirmation)"
-  exit 1
 }

 function arch_check() {
--- a/vm/opnsense-vm.sh
+++ b/vm/opnsense-vm.sh
@ -180,37 +180,14 @@ function msg_error() {
  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
 }

-pve_check() {
-  local PVE_VER
-  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
-
-  # Check for Proxmox VE 8.x
-  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
-    local MINOR="${BASH_REMATCH[1]}"
-    if ((MINOR < 1 || MINOR > 4)); then
-      msg_error "This version of Proxmox VE is not supported."
-      echo -e "Required: Proxmox VE version 8.1 – 8.4"
-      exit 1
-    fi
-    return 0
+function pve_check() {
+  if ! pveversion | grep -Eq "pve-manager/8\.[1-4](\.[0-9]+)*"; then
+    msg_error "This version of Proxmox Virtual Environment is not supported"
+    echo -e "Requires Proxmox Virtual Environment Version 8.1 or later."
+    echo -e "Exiting..."
+    sleep 2
+    exit
  fi
-
-  # Check for Proxmox VE 9.x (Beta) — require confirmation
-  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
-    if whiptail --title "Proxmox 9.x Detected (Beta)" \
-      --yesno "You are using Proxmox VE $PVE_VER, which is currently in Beta state.\n\nThis version is experimentally supported.\n\nDo you want to proceed anyway?" 12 70; then
-      msg_ok "Confirmed: Continuing with Proxmox VE $PVE_VER"
-      return 0
-    else
-      msg_error "Aborted by user: Proxmox VE 9.x was not confirmed."
-      exit 1
-    fi
-  fi
-
-  # All other unsupported versions
-  msg_error "This version of Proxmox VE is not supported."
-  echo -e "Supported versions: Proxmox VE 8.1 – 8.4 or 9.x (Beta, with confirmation)"
-  exit 1
 }

 function arch_check() {
--- a/vm/owncloud-vm.sh
+++ b/vm/owncloud-vm.sh
@ -139,37 +139,14 @@ function check_root() {
  fi
 }

-pve_check() {
-  local PVE_VER
-  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
-
-  # Check for Proxmox VE 8.x
-  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
-    local MINOR="${BASH_REMATCH[1]}"
-    if ((MINOR < 1 || MINOR > 4)); then
-      msg_error "This version of Proxmox VE is not supported."
-      echo -e "Required: Proxmox VE version 8.1 – 8.4"
-      exit 1
-    fi
-    return 0
+function pve_check() {
+  if ! pveversion | grep -Eq "pve-manager/8\.[1-4](\.[0-9]+)*"; then
+    msg_error "${CROSS}${RD}This version of Proxmox Virtual Environment is not supported"
+    echo -e "Requires Proxmox Virtual Environment Version 8.1 or later."
+    echo -e "Exiting..."
+    sleep 2
+    exit
  fi
-
-  # Check for Proxmox VE 9.x (Beta) — require confirmation
-  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
-    if whiptail --title "Proxmox 9.x Detected (Beta)" \
-      --yesno "You are using Proxmox VE $PVE_VER, which is currently in Beta state.\n\nThis version is experimentally supported.\n\nDo you want to proceed anyway?" 12 70; then
-      msg_ok "Confirmed: Continuing with Proxmox VE $PVE_VER"
-      return 0
-    else
-      msg_error "Aborted by user: Proxmox VE 9.x was not confirmed."
-      exit 1
-    fi
-  fi
-
-  # All other unsupported versions
-  msg_error "This version of Proxmox VE is not supported."
-  echo -e "Supported versions: Proxmox VE 8.1 – 8.4 or 9.x (Beta, with confirmation)"
-  exit 1
 }

 function arch_check() {
--- a/vm/pimox-haos-vm.sh
+++ b/vm/pimox-haos-vm.sh
@ -147,37 +147,14 @@ function check_root() {
  fi
 }

-pve_check() {
-  local PVE_VER
-  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
-
-  # Check for Proxmox VE 8.x
-  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
-    local MINOR="${BASH_REMATCH[1]}"
-    if ((MINOR < 1 || MINOR > 4)); then
-      msg_error "This version of Proxmox VE is not supported."
-      echo -e "Required: Proxmox VE version 8.1 – 8.4"
-      exit 1
-    fi
-    return 0
+function pve_check() {
+  if ! pveversion | grep -Eq "pve-manager/8\.[1-4](\.[0-9]+)*"; then
+    msg_error "${CROSS}${RD}This version of Proxmox Virtual Environment is not supported"
+    echo -e "Requires Proxmox Virtual Environment Version 8.1 or later."
+    echo -e "Exiting..."
+    sleep 2
+    exit
  fi
-
-  # Check for Proxmox VE 9.x (Beta) — require confirmation
-  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
-    if whiptail --title "Proxmox 9.x Detected (Beta)" \
-      --yesno "You are using Proxmox VE $PVE_VER, which is currently in Beta state.\n\nThis version is experimentally supported.\n\nDo you want to proceed anyway?" 12 70; then
-      msg_ok "Confirmed: Continuing with Proxmox VE $PVE_VER"
-      return 0
-    else
-      msg_error "Aborted by user: Proxmox VE 9.x was not confirmed."
-      exit 1
-    fi
-  fi
-
-  # All other unsupported versions
-  msg_error "This version of Proxmox VE is not supported."
-  echo -e "Supported versions: Proxmox VE 8.1 – 8.4 or 9.x (Beta, with confirmation)"
-  exit 1
 }

 function arch_check() {
--- a/vm/ubuntu2204-vm.sh
+++ b/vm/ubuntu2204-vm.sh
@ -134,37 +134,14 @@ function check_root() {
  fi
 }

-pve_check() {
-  local PVE_VER
-  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
-
-  # Check for Proxmox VE 8.x
-  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
-    local MINOR="${BASH_REMATCH[1]}"
-    if ((MINOR < 1 || MINOR > 4)); then
-      msg_error "This version of Proxmox VE is not supported."
-      echo -e "Required: Proxmox VE version 8.1 – 8.4"
-      exit 1
-    fi
-    return 0
+function pve_check() {
+  if ! pveversion | grep -Eq "pve-manager/8\.[1-4](\.[0-9]+)*"; then
+    msg_error "${CROSS}${RD}This version of Proxmox Virtual Environment is not supported"
+    echo -e "Requires Proxmox Virtual Environment Version 8.1 or later."
+    echo -e "Exiting..."
+    sleep 2
+    exit
  fi
-
-  # Check for Proxmox VE 9.x (Beta) — require confirmation
-  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
-    if whiptail --title "Proxmox 9.x Detected (Beta)" \
-      --yesno "You are using Proxmox VE $PVE_VER, which is currently in Beta state.\n\nThis version is experimentally supported.\n\nDo you want to proceed anyway?" 12 70; then
-      msg_ok "Confirmed: Continuing with Proxmox VE $PVE_VER"
-      return 0
-    else
-      msg_error "Aborted by user: Proxmox VE 9.x was not confirmed."
-      exit 1
-    fi
-  fi
-
-  # All other unsupported versions
-  msg_error "This version of Proxmox VE is not supported."
-  echo -e "Supported versions: Proxmox VE 8.1 – 8.4 or 9.x (Beta, with confirmation)"
-  exit 1
 }

 function arch_check() {
--- a/vm/ubuntu2404-vm.sh
+++ b/vm/ubuntu2404-vm.sh
@ -137,37 +137,14 @@ function check_root() {
  fi
 }

-pve_check() {
-  local PVE_VER
-  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
-
-  # Check for Proxmox VE 8.x
-  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
-    local MINOR="${BASH_REMATCH[1]}"
-    if ((MINOR < 1 || MINOR > 4)); then
-      msg_error "This version of Proxmox VE is not supported."
-      echo -e "Required: Proxmox VE version 8.1 – 8.4"
-      exit 1
-    fi
-    return 0
+function pve_check() {
+  if ! pveversion | grep -Eq "pve-manager/8\.[1-4](\.[0-9]+)*"; then
+    msg_error "${CROSS}${RD}This version of Proxmox Virtual Environment is not supported"
+    echo -e "Requires Proxmox Virtual Environment Version 8.1 or later."
+    echo -e "Exiting..."
+    sleep 2
+    exit
  fi
-
-  # Check for Proxmox VE 9.x (Beta) — require confirmation
-  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
-    if whiptail --title "Proxmox 9.x Detected (Beta)" \
-      --yesno "You are using Proxmox VE $PVE_VER, which is currently in Beta state.\n\nThis version is experimentally supported.\n\nDo you want to proceed anyway?" 12 70; then
-      msg_ok "Confirmed: Continuing with Proxmox VE $PVE_VER"
-      return 0
-    else
-      msg_error "Aborted by user: Proxmox VE 9.x was not confirmed."
-      exit 1
-    fi
-  fi
-
-  # All other unsupported versions
-  msg_error "This version of Proxmox VE is not supported."
-  echo -e "Supported versions: Proxmox VE 8.1 – 8.4 or 9.x (Beta, with confirmation)"
-  exit 1
 }

 function arch_check() {
--- a/vm/ubuntu2410-vm.sh
+++ b/vm/ubuntu2410-vm.sh
@ -136,37 +136,14 @@ function check_root() {
  fi
 }

-pve_check() {
-  local PVE_VER
-  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
-
-  # Check for Proxmox VE 8.x
-  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
-    local MINOR="${BASH_REMATCH[1]}"
-    if ((MINOR < 1 || MINOR > 4)); then
-      msg_error "This version of Proxmox VE is not supported."
-      echo -e "Required: Proxmox VE version 8.1 – 8.4"
-      exit 1
-    fi
-    return 0
+function pve_check() {
+  if ! pveversion | grep -Eq "pve-manager/8\.[1-4](\.[0-9]+)*"; then
+    msg_error "${CROSS}${RD}This version of Proxmox Virtual Environment is not supported"
+    echo -e "Requires Proxmox Virtual Environment Version 8.1 or later."
+    echo -e "Exiting..."
+    sleep 2
+    exit
  fi
-
-  # Check for Proxmox VE 9.x (Beta) — require confirmation
-  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
-    if whiptail --title "Proxmox 9.x Detected (Beta)" \
-      --yesno "You are using Proxmox VE $PVE_VER, which is currently in Beta state.\n\nThis version is experimentally supported.\n\nDo you want to proceed anyway?" 12 70; then
-      msg_ok "Confirmed: Continuing with Proxmox VE $PVE_VER"
-      return 0
-    else
-      msg_error "Aborted by user: Proxmox VE 9.x was not confirmed."
-      exit 1
-    fi
-  fi
-
-  # All other unsupported versions
-  msg_error "This version of Proxmox VE is not supported."
-  echo -e "Supported versions: Proxmox VE 8.1 – 8.4 or 9.x (Beta, with confirmation)"
-  exit 1
 }

 function arch_check() {
--- a/vm/ubuntu2504-vm.sh
+++ b/vm/ubuntu2504-vm.sh
@ -136,37 +136,14 @@ function check_root() {
  fi
 }

-pve_check() {
-  local PVE_VER
-  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
-
-  # Check for Proxmox VE 8.x
-  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
-    local MINOR="${BASH_REMATCH[1]}"
-    if ((MINOR < 1 || MINOR > 4)); then
-      msg_error "This version of Proxmox VE is not supported."
-      echo -e "Required: Proxmox VE version 8.1 – 8.4"
-      exit 1
-    fi
-    return 0
+function pve_check() {
+  if ! pveversion | grep -Eq "pve-manager/8\.[1-4](\.[0-9]+)*"; then
+    msg_error "${CROSS}${RD}This version of Proxmox Virtual Environment is not supported"
+    echo -e "Requires Proxmox Virtual Environment Version 8.1 or later."
+    echo -e "Exiting..."
+    sleep 2
+    exit
  fi
-
-  # Check for Proxmox VE 9.x (Beta) — require confirmation
-  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
-    if whiptail --title "Proxmox 9.x Detected (Beta)" \
-      --yesno "You are using Proxmox VE $PVE_VER, which is currently in Beta state.\n\nThis version is experimentally supported.\n\nDo you want to proceed anyway?" 12 70; then
-      msg_ok "Confirmed: Continuing with Proxmox VE $PVE_VER"
-      return 0
-    else
-      msg_error "Aborted by user: Proxmox VE 9.x was not confirmed."
-      exit 1
-    fi
-  fi
-
-  # All other unsupported versions
-  msg_error "This version of Proxmox VE is not supported."
-  echo -e "Supported versions: Proxmox VE 8.1 – 8.4 or 9.x (Beta, with confirmation)"
-  exit 1
 }

 function arch_check() {
--- a/vm/umbrel-os-vm.sh
+++ b/vm/umbrel-os-vm.sh
@ -138,37 +138,14 @@ function check_root() {
  fi
 }

-pve_check() {
-  local PVE_VER
-  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
-
-  # Check for Proxmox VE 8.x
-  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
-    local MINOR="${BASH_REMATCH[1]}"
-    if ((MINOR < 1 || MINOR > 4)); then
-      msg_error "This version of Proxmox VE is not supported."
-      echo -e "Required: Proxmox VE version 8.1 – 8.4"
-      exit 1
-    fi
-    return 0
+function pve_check() {
+  if ! pveversion | grep -Eq "pve-manager/8\.[1-4](\.[0-9]+)*"; then
+    msg_error "${CROSS}${RD}This version of Proxmox Virtual Environment is not supported"
+    echo -e "Requires Proxmox Virtual Environment Version 8.1 or later."
+    echo -e "Exiting..."
+    sleep 2
+    exit
  fi
-
-  # Check for Proxmox VE 9.x (Beta) — require confirmation
-  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
-    if whiptail --title "Proxmox 9.x Detected (Beta)" \
-      --yesno "You are using Proxmox VE $PVE_VER, which is currently in Beta state.\n\nThis version is experimentally supported.\n\nDo you want to proceed anyway?" 12 70; then
-      msg_ok "Confirmed: Continuing with Proxmox VE $PVE_VER"
-      return 0
-    else
-      msg_error "Aborted by user: Proxmox VE 9.x was not confirmed."
-      exit 1
-    fi
-  fi
-
-  # All other unsupported versions
-  msg_error "This version of Proxmox VE is not supported."
-  echo -e "Supported versions: Proxmox VE 8.1 – 8.4 or 9.x (Beta, with confirmation)"
-  exit 1
 }

 function arch_check() {