Apply suggestion from @tremor021

.github/workflows/delete-pocketbase-entry-on-removal.yml

@@ -1,150 +0,0 @@
-name: Delete PocketBase entry on script/JSON removal
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - "frontend/public/json/**"
-      - "vm/**"
-      - "tools/**"
-      - "turnkey/**"
-      - "ct/**"
-      - "install/**"
-
-jobs:
-  delete-pocketbase-entry:
-    runs-on: self-hosted
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Get slugs from deleted JSON and script files
-        id: slugs
-        run: |
-          BEFORE="${{ github.event.before }}"
-          AFTER="${{ github.event.after }}"
-          slugs=""
-
-          # Deleted JSON files: get slug from previous commit
-          deleted_json=$(git diff --name-only --diff-filter=D "$BEFORE" "$AFTER" -- frontend/public/json/ | grep '\.json$' || true)
-          for f in $deleted_json; do
-            [[ -z "$f" ]] && continue
-            s=$(git show "$BEFORE:$f" 2>/dev/null | jq -r '.slug // empty' 2>/dev/null || true)
-            [[ -n "$s" ]] && slugs="$slugs $s"
-          done
-
-          # Deleted script files: derive slug from path
-          deleted_sh=$(git diff --name-only --diff-filter=D "$BEFORE" "$AFTER" -- ct/ install/ tools/ turnkey/ vm/ | grep '\.sh$' || true)
-          for f in $deleted_sh; do
-            [[ -z "$f" ]] && continue
-            base="${f##*/}"
-            base="${base%.sh}"
-            if [[ "$f" == install/* && "$base" == *-install ]]; then
-              s="${base%-install}"
-            else
-              s="$base"
-            fi
-            [[ -n "$s" ]] && slugs="$slugs $s"
-          done
-
-          slugs=$(echo $slugs | xargs -n1 | sort -u | tr '\n' ' ')
-          if [[ -z "$slugs" ]]; then
-            echo "No deleted JSON or script files to remove from PocketBase."
-            echo "count=0" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          echo "$slugs" > slugs_to_delete.txt
-          echo "count=$(echo $slugs | wc -w)" >> "$GITHUB_OUTPUT"
-          echo "Slugs to delete: $slugs"
-
-      - name: Delete from PocketBase
-        if: steps.slugs.outputs.count != '0'
-        env:
-          POCKETBASE_URL: ${{ secrets.POCKETBASE_URL }}
-          POCKETBASE_COLLECTION: ${{ secrets.POCKETBASE_COLLECTION }}
-          POCKETBASE_ADMIN_EMAIL: ${{ secrets.POCKETBASE_ADMIN_EMAIL }}
-          POCKETBASE_ADMIN_PASSWORD: ${{ secrets.POCKETBASE_ADMIN_PASSWORD }}
-        run: |
-          node << 'ENDSCRIPT'
-          (async function() {
-            const fs = require('fs');
-            const https = require('https');
-            const http = require('http');
-            const url = require('url');
-
-            function request(fullUrl, opts) {
-              return new Promise(function(resolve, reject) {
-                const u = url.parse(fullUrl);
-                const isHttps = u.protocol === 'https:';
-                const body = opts.body;
-                const options = {
-                  hostname: u.hostname,
-                  port: u.port || (isHttps ? 443 : 80),
-                  path: u.path,
-                  method: opts.method || 'GET',
-                  headers: opts.headers || {}
-                };
-                if (body) options.headers['Content-Length'] = Buffer.byteLength(body);
-                const lib = isHttps ? https : http;
-                const req = lib.request(options, function(res) {
-                  let data = '';
-                  res.on('data', function(chunk) { data += chunk; });
-                  res.on('end', function() {
-                    resolve({ ok: res.statusCode >= 200 && res.statusCode < 300, statusCode: res.statusCode, body: data });
-                  });
-                });
-                req.on('error', reject);
-                if (body) req.write(body);
-                req.end();
-              });
-            }
-
-            const raw = process.env.POCKETBASE_URL.replace(/\/$/, '');
-            const apiBase = /\/api$/i.test(raw) ? raw : raw + '/api';
-            const coll = process.env.POCKETBASE_COLLECTION;
-            const slugs = fs.readFileSync('slugs_to_delete.txt', 'utf8').trim().split(/\s+/).filter(Boolean);
-
-            const authUrl = apiBase + '/collections/users/auth-with-password';
-            const authBody = JSON.stringify({
-              identity: process.env.POCKETBASE_ADMIN_EMAIL,
-              password: process.env.POCKETBASE_ADMIN_PASSWORD
-            });
-            const authRes = await request(authUrl, {
-              method: 'POST',
-              headers: { 'Content-Type': 'application/json' },
-              body: authBody
-            });
-            if (!authRes.ok) {
-              throw new Error('Auth failed. Response: ' + authRes.body);
-            }
-            const token = JSON.parse(authRes.body).token;
-            const recordsUrl = apiBase + '/collections/' + encodeURIComponent(coll) + '/records';
-
-            for (const slug of slugs) {
-              const filter = "(slug='" + slug + "')";
-              const listRes = await request(recordsUrl + '?filter=' + encodeURIComponent(filter) + '&perPage=1', {
-                headers: { 'Authorization': token }
-              });
-              const list = JSON.parse(listRes.body);
-              const existingId = list.items && list.items[0] && list.items[0].id;
-              if (!existingId) {
-                console.log('No PocketBase record for slug "' + slug + '", skipping.');
-                continue;
-              }
-              const delRes = await request(recordsUrl + '/' + existingId, {
-                method: 'DELETE',
-                headers: { 'Authorization': token }
-              });
-              if (delRes.ok) {
-                console.log('Deleted PocketBase record for slug "' + slug + '" (id=' + existingId + ').');
-              } else {
-                console.warn('DELETE failed for slug "' + slug + '": ' + delRes.statusCode + ' ' + delRes.body);
-              }
-            }
-            console.log('Done.');
-          })().catch(e => { console.error(e); process.exit(1); });
-          ENDSCRIPT
-        shell: bash

.github/workflows/trigger_github_pages_redirect.yml

@@ -1,41 +0,0 @@
-name: Pages Redirect
-
-on:
-  workflow_dispatch:
-
-permissions:
-  pages: write
-  id-token: write
-  contents: read
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Create redirect page
-        run: |
-          mkdir site
-          cat <<EOF > site/index.html
-          <!DOCTYPE html>
-          <html>
-          <head>
-            <meta charset="utf-8">
-            <meta http-equiv="refresh" content="0; url=https://community-scripts.org/">
-            <link rel="canonical" href="https://community-scripts.org/">
-            <title>Redirecting...</title>
-          </head>
-          <body>
-            Redirecting...
-          </body>
-          </html>
-          EOF
-
-      - uses: actions/upload-pages-artifact@v3
-        with:
-          path: site
-
-      - name: Deploy
-        uses: actions/deploy-pages@v4

CHANGELOG.md

@@ -422,19 +422,6 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
 
 ## 2026-03-11
 
-### 🚀 Updated Scripts
-
-  - #### 🐞 Bug Fixes
-
-    - Tracearr:  Increase default disk variable from 5 to 10 [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#12762](https://github.com/community-scripts/ProxmoxVE/pull/12762))
-    - Fix Wireguard Dashboard update [@odin568](https://github.com/odin568) ([#12767](https://github.com/community-scripts/ProxmoxVE/pull/12767))
-
-### 🧰 Tools
-
-  - #### ✨ New Features
-
-    - Coder-Code-Server: Check if config file exists [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#12758](https://github.com/community-scripts/ProxmoxVE/pull/12758))
-
 ## 2026-03-10
 
 ### 🚀 Updated Scripts

ct/tracearr.sh

@@ -9,7 +9,7 @@ APP="Tracearr"
 var_tags="${var_tags:-media}"
 var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-2048}"
-var_disk="${var_disk:-10}"
+var_disk="${var_disk:-5}"
 var_os="${var_os:-debian}"
 var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"

ct/wireguard.sh

@@ -37,7 +37,7 @@ function update_script() {
   if [[ -d /etc/wgdashboard ]]; then
     sleep 2
     cd /etc/wgdashboard/src
-    $STD ./wgd.sh update -y
+    $STD ./wgd.sh update
     $STD ./wgd.sh start
   fi
   msg_ok "Updated LXC"

frontend/public/json/github-versions.json

@@ -1,12 +1,12 @@
 {
-  "generated": "2026-03-11T12:12:40Z",
+  "generated": "2026-03-11T06:17:37Z",
   "versions": [
     {
       "slug": "2fauth",
       "repo": "Bubka/2FAuth",
-      "version": "v6.1.0",
+      "version": "v6.0.0",
       "pinned": false,
-      "date": "2026-03-11T07:48:27Z"
+      "date": "2026-01-14T16:00:58Z"
     },
     {
       "slug": "adguard",
@@ -270,9 +270,9 @@
     {
       "slug": "databasus",
       "repo": "databasus/databasus",
-      "version": "v3.19.1",
+      "version": "v3.18.0",
       "pinned": false,
-      "date": "2026-03-11T10:25:28Z"
+      "date": "2026-03-08T20:19:15Z"
     },
     {
       "slug": "dawarich",
@@ -284,9 +284,9 @@
     {
       "slug": "discopanel",
       "repo": "nickheyer/discopanel",
-      "version": "v2.0.3",
+      "version": "v2.0.2",
       "pinned": false,
-      "date": "2026-03-11T07:29:10Z"
+      "date": "2026-03-09T03:38:49Z"
     },
     {
       "slug": "dispatcharr",
@@ -319,9 +319,9 @@
     {
       "slug": "donetick",
       "repo": "donetick/donetick",
-      "version": "v0.1.75-beta.3",
+      "version": "v0.1.74",
       "pinned": false,
-      "date": ""
+      "date": "2026-02-14T23:21:45Z"
     },
     {
       "slug": "drawio",
@@ -1327,9 +1327,9 @@
     {
       "slug": "revealjs",
       "repo": "hakimel/reveal.js",
-      "version": "6.0.0",
+      "version": "5.2.1",
       "pinned": false,
-      "date": "2026-03-11T11:54:59Z"
+      "date": "2025-03-28T13:00:23Z"
     },
     {
       "slug": "romm",
@@ -1376,9 +1376,9 @@
     {
       "slug": "seaweedfs",
       "repo": "seaweedfs/seaweedfs",
-      "version": "4.17",
+      "version": "4.16",
       "pinned": false,
-      "date": "2026-03-11T09:30:38Z"
+      "date": "2026-03-10T06:11:05Z"
     },
     {
       "slug": "seelf",
@@ -1712,9 +1712,9 @@
     {
       "slug": "wanderer",
       "repo": "meilisearch/meilisearch",
-      "version": "v1.38.2",
+      "version": "v1.38.0",
       "pinned": false,
-      "date": "2026-03-11T11:36:01Z"
+      "date": "2026-03-09T08:06:29Z"
     },
     {
       "slug": "warracker",
@@ -1831,9 +1831,9 @@
     {
       "slug": "zitadel",
       "repo": "zitadel/zitadel",
-      "version": "v4.12.2",
+      "version": "v4.12.1",
       "pinned": false,
-      "date": "2026-03-11T07:50:10Z"
+      "date": "2026-03-04T12:40:17Z"
     },
     {
       "slug": "zoraxy",

frontend/public/json/tracearr.json

@@ -21,7 +21,7 @@
       "resources": {
         "cpu": 2,
         "ram": 2048,
-        "hdd": 10,
+        "hdd": 5,
         "os": "Debian",
         "version": "13"
       }

misc/api.func

@@ -196,7 +196,7 @@ explain_exit_code() {
   103) echo "Validation: Shell is not Bash" ;;
   104) echo "Validation: Not running as root (or invoked via sudo)" ;;
   105) echo "Validation: Proxmox VE version not supported" ;;
-  106) echo "Validation: Unsupported architecture (requires amd64 or arm64)" ;;
+  106) echo "Validation: Architecture not supported (ARM / PiMox)" ;;
   107) echo "Validation: Kernel key parameters unreadable" ;;
   108) echo "Validation: Kernel key limits exceeded" ;;
   109) echo "Proxmox: No available container ID after max attempts" ;;
@@ -348,10 +348,10 @@ explain_exit_code() {
 json_escape() {
   # Escape a string for safe JSON embedding using awk (handles any input size).
   # Pipeline: strip ANSI → remove control chars → escape \ " TAB → join lines with \n
-  printf '%s' "$1" |
+  printf '%s' "$1" \
-    sed 's/\x1b\[[0-9;]*[a-zA-Z]//g' |
+    | sed 's/\x1b\[[0-9;]*[a-zA-Z]//g' \
-    tr -d '\000-\010\013\014\016-\037\177\r' |
+    | tr -d '\000-\010\013\014\016-\037\177\r' \
-    awk '
+    | awk '
         BEGIN { ORS = "" }
         {
           gsub(/\\/, "\\\\")   # backslash → \\

misc/build.func

@@ -1826,9 +1826,9 @@ advanced_settings() {
   while [ $STEP -le $MAX_STEP ]; do
     case $STEP in
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 1: Container Type
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     1)
       local default_on="ON"
       local default_off="OFF"
@@ -1851,9 +1851,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 2: Root Password
-    # ------------------------------------------------------------------------------
+    # ════════════════════════════════════════<EFBFBD><EFBFBD><EFBFBD>═══════════════════════════════<EFBFBD><EFBFBD><EFBFBD>══
     2)
       if PW1=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "ROOT PASSWORD" \
@@ -1905,9 +1905,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 3: Container ID
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     3)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "CONTAINER ID" \
@@ -1939,9 +1939,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 4: Hostname
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     4)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "HOSTNAME" \
@@ -1962,9 +1962,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 5: Disk Size
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     5)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "DISK SIZE" \
@@ -1983,9 +1983,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 6: CPU Cores
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     6)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "CPU CORES" \
@@ -2004,9 +2004,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 7: RAM Size
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     7)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "RAM SIZE" \
@@ -2025,9 +2025,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 8: Network Bridge
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     8)
       if [[ ${#BRIDGE_MENU_OPTIONS[@]} -eq 0 ]]; then
         # Validate default bridge exists
@@ -2063,9 +2063,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 9: IPv4 Configuration
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     9)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "IPv4 CONFIGURATION" \
@@ -2160,9 +2160,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 10: IPv6 Configuration
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     10)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "IPv6 CONFIGURATION" \
@@ -2235,9 +2235,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 11: MTU Size
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     11)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "MTU SIZE" \
@@ -2255,9 +2255,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 12: DNS Search Domain
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     12)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "DNS SEARCH DOMAIN" \
@@ -2271,9 +2271,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 13: DNS Server
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     13)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "DNS SERVER" \
@@ -2287,9 +2287,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 14: MAC Address
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     14)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "MAC ADDRESS" \
@@ -2307,9 +2307,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 15: VLAN Tag
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     15)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "VLAN TAG" \
@@ -2327,9 +2327,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 16: Tags
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     16)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "CONTAINER TAGS" \
@@ -2349,18 +2349,18 @@ advanced_settings() {
       fi
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 17: SSH Settings
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     17)
       configure_ssh_settings "Step $STEP/$MAX_STEP"
       # configure_ssh_settings handles its own flow, always advance
       ((STEP++))
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 18: FUSE Support
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     18)
       local fuse_default_flag="--defaultno"
       [[ "$_enable_fuse" == "yes" || "$_enable_fuse" == "1" ]] && fuse_default_flag=""
@@ -2382,9 +2382,9 @@ advanced_settings() {
       ((STEP++))
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 19: TUN/TAP Support
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     19)
       local tun_default_flag="--defaultno"
       [[ "$_enable_tun" == "yes" || "$_enable_tun" == "1" ]] && tun_default_flag=""
@@ -2406,9 +2406,9 @@ advanced_settings() {
       ((STEP++))
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 20: Nesting Support
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     20)
       local nesting_default_flag=""
       [[ "$_enable_nesting" == "0" || "$_enable_nesting" == "no" ]] && nesting_default_flag="--defaultno"
@@ -2436,9 +2436,9 @@ advanced_settings() {
       ((STEP++))
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 21: GPU Passthrough
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     21)
       local gpu_default_flag="--defaultno"
       [[ "$_enable_gpu" == "yes" ]] && gpu_default_flag=""
@@ -2460,9 +2460,9 @@ advanced_settings() {
       ((STEP++))
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 22: Keyctl Support (Docker/systemd)
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     22)
       local keyctl_default_flag="--defaultno"
       [[ "$_enable_keyctl" == "1" ]] && keyctl_default_flag=""
@@ -2484,9 +2484,9 @@ advanced_settings() {
       ((STEP++))
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 23: APT Cacher Proxy
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     23)
       local apt_cacher_default_flag="--defaultno"
       [[ "$_apt_cacher" == "yes" ]] && apt_cacher_default_flag=""
@@ -2516,9 +2516,9 @@ advanced_settings() {
       ((STEP++))
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 24: Container Timezone
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     24)
       local tz_hint="$_ct_timezone"
       [[ -z "$tz_hint" ]] && tz_hint="(empty - will use host timezone)"
@@ -2541,9 +2541,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 25: Container Protection
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     25)
       local protect_default_flag="--defaultno"
       [[ "$_protect_ct" == "yes" || "$_protect_ct" == "1" ]] && protect_default_flag=""
@@ -2565,9 +2565,9 @@ advanced_settings() {
       ((STEP++))
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 26: Device Node Creation (mknod)
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     26)
       local mknod_default_flag="--defaultno"
       [[ "$_enable_mknod" == "1" ]] && mknod_default_flag=""
@@ -2589,9 +2589,9 @@ advanced_settings() {
       ((STEP++))
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 27: Mount Filesystems
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     27)
       local mount_hint=""
       [[ -n "$_mount_fs" ]] && mount_hint="$_mount_fs" || mount_hint="(none)"
@@ -2608,9 +2608,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     # STEP 28: Verbose Mode & Confirmation
-    # ------------------------------------------------------------------------------
+    # ═══════════════════════════════════════════════════════════════════════════
     28)
       local verbose_default_flag="--defaultno"
       [[ "$_verbose" == "yes" ]] && verbose_default_flag=""
@@ -2676,9 +2676,9 @@ Advanced:
     esac
   done
 
-  # ------------------------------------------------------------------------------
+  # ═══════════════════════════════════════════════════════════════════════════
   # Apply all collected values to global variables
-  # ------------------------------------------------------------------------------
+  # ═══════════════════════════════════════════════════════════════════════════
   CT_TYPE="$_ct_type"
   PW="$_pw"
   CT_ID="$_ct_id"
@@ -2895,9 +2895,6 @@ echo_default() {
   echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}${DISK_SIZE} GB${CL}"
   echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}${CORE_COUNT}${CL}"
   echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}${RAM_SIZE} MiB${CL}"
-  if [[ "$(dpkg --print-architecture)" == "arm64" ]]; then
-    echo -e "${INFO}${BOLD}${DGN}Architecture: ${BGN}arm64${CL}"
-  fi
   if [[ -n "${var_gpu:-}" && "${var_gpu}" == "yes" ]]; then
     echo -e "${GPU}${BOLD}${DGN}GPU Passthrough: ${BGN}Enabled${CL}"
   fi
@@ -3428,9 +3425,6 @@ start() {
     set_std_mode
     ensure_profile_loaded
     get_lxc_ip
-    if [[ "$(dpkg --print-architecture)" == "arm64" ]] && declare -f update_script_arm64 >/dev/null 2>&1; then
-      update_script_arm64
-    fi
     update_script
     update_motd_ip
     cleanup_lxc
@@ -3459,9 +3453,6 @@ start() {
     esac
     ensure_profile_loaded
     get_lxc_ip
-    if [[ "$(dpkg --print-architecture)" == "arm64" ]] && declare -f update_script_arm64 >/dev/null 2>&1; then
-      update_script_arm64
-    fi
     update_script
     update_motd_ip
     cleanup_lxc
@@ -4085,11 +4076,7 @@ EOF'
       msg_warn "Skipping timezone setup – zone '$tz' not found in container"
     fi
 
-    local _base_pkgs="sudo curl mc gnupg2 jq"
+    pct exec "$CTID" -- bash -c "apt-get update 2>&1 && apt-get install -y sudo curl mc gnupg2 jq 2>&1" >>"$BUILD_LOG" 2>&1 || {
-    if [[ "${ARCH:-amd64}" == "arm64" ]]; then
-      _base_pkgs+=" openssh-server wget gcc"
-    fi
-    pct exec "$CTID" -- bash -c "apt-get update 2>&1 && apt-get install -y ${_base_pkgs} 2>&1" >>"$BUILD_LOG" 2>&1 || {
       msg_error "apt-get base packages installation failed"
       install_exit_code=1
     }
@@ -4120,16 +4107,7 @@ EOF'
     # that sends "configuring" status AFTER the host already reported "failed"
     export CONTAINER_INSTALLING=true
 
-    local _install_script
+    lxc-attach -n "$CTID" -- bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/install/${var_install}.sh)"
-    _install_script="$(curl -fsSL "https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/install/${var_install}.sh")"
-    if [[ "$ARCH" == "arm64" ]]; then
-      local _arm_script
-      _arm_script="$(curl -fsSL "https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/install/arm/${var_install}.sh" 2>/dev/null || true)"
-      if [[ -n "$_arm_script" ]]; then
-        _install_script="${_arm_script}"$'\n'"${_install_script}"
-      fi
-    fi
-    lxc-attach -n "$CTID" -- bash -c "$_install_script"
     local lxc_exit=$?
 
     unset CONTAINER_INSTALLING
@@ -4507,16 +4485,7 @@ EOF'
           # Re-run install script in existing container (don't destroy/recreate)
           set +Eeuo pipefail
           trap - ERR
-          local _install_script
+          lxc-attach -n "$CTID" -- bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/install/${var_install}.sh)"
-          _install_script="$(curl -fsSL "https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/install/${var_install}.sh")"
-          if [[ "$ARCH" == "arm64" ]]; then
-            local _arm_script
-            _arm_script="$(curl -fsSL "https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/install/arm/${var_install}.sh" 2>/dev/null || true)"
-            if [[ -n "$_arm_script" ]]; then
-              _install_script="${_arm_script}"$'\n'"${_install_script}"
-            fi
-          fi
-          lxc-attach -n "$CTID" -- bash -c "$_install_script"
           local apt_retry_exit=$?
           set -Eeuo pipefail
           trap 'error_handler' ERR
@@ -5035,72 +5004,6 @@ create_lxc_container() {
     esac
   }
 
-  ARCH="$(dpkg --print-architecture)"
-
-  # Maps OS type + version to the release variant name used by ARM64 template sources.
-  arm64_template_variant() {
-    case "$1" in
-    debian)
-      case "$2" in
-      12 | 12.*) echo "bookworm" ;; 13 | 13.*) echo "trixie" ;;
-      *) echo "trixie" ;;
-      esac
-      ;;
-    alpine) echo "3.22" ;;
-    ubuntu)
-      case "$2" in
-      24.04* | noble) echo "noble" ;; 24.10* | oracular) echo "oracular" ;;
-      *) echo "jammy" ;;
-      esac
-      ;;
-    *) return 1 ;;
-    esac
-  }
-
-  # Downloads an ARM64 LXC rootfs template to $1.
-  # Debian: fetches latest release from community-scripts/debian-arm64-lxc on GitHub.
-  # Others: fetches from jenkins.linuxcontainers.org.
-  download_arm64_template() {
-    local dest="$1" url
-
-    mkdir -p "$(dirname "$dest")" || {
-      msg_error "Cannot create template dir."
-      exit 207
-    }
-
-    if [[ "$PCT_OSTYPE" == "debian" ]]; then
-      url=$(curl -fsSL "https://api.github.com/repos/community-scripts/debian-arm64-lxc/releases/latest" |
-        grep -Eo "https://[^\"]*debian-${CUSTOM_TEMPLATE_VARIANT}-arm64-rootfs\.tar\.xz" | head -n1)
-      [[ -n "$url" ]] || {
-        msg_error "Could not find Debian ${CUSTOM_TEMPLATE_VARIANT} ARM64 template URL."
-        exit 207
-      }
-    else
-      url="https://jenkins.linuxcontainers.org/job/image-${PCT_OSTYPE}/architecture=arm64,release=${CUSTOM_TEMPLATE_VARIANT},variant=default/lastStableBuild/artifact/rootfs.tar.xz"
-    fi
-
-    msg_info "Downloading ${PCT_OSTYPE^} ${CUSTOM_TEMPLATE_VARIANT} ARM64 template"
-    if ! curl -fsSL -o "$dest" "$url"; then
-      msg_error "Failed to download ARM64 template from: $url"
-      exit 208
-    fi
-    msg_ok "Downloaded ARM64 LXC template"
-  }
-
-  # Architecture-aware template download wrapper.
-  # Optional $1 overrides destination path (for local-storage fallback).
-  download_template() {
-    local dest="${1:-$TEMPLATE_PATH}"
-    if [[ "$ARCH" == "arm64" ]]; then
-      download_arm64_template "$dest"
-    else
-      pveam download "$TEMPLATE_STORAGE" "$TEMPLATE" >>"${BUILD_LOG:-/dev/null}" 2>&1 || {
-        msg_error "Failed to download template '$TEMPLATE' to storage '$TEMPLATE_STORAGE'"
-        exit 222
-      }
-    fi
-  }
-
   # ------------------------------------------------------------------------------
   # Required input variables
   # ------------------------------------------------------------------------------
@@ -5237,40 +5140,6 @@ create_lxc_container() {
   # ------------------------------------------------------------------------------
   # Template discovery & validation
   # ------------------------------------------------------------------------------
-  CUSTOM_TEMPLATE_VARIANT=""
-
-  if [[ "$ARCH" == "arm64" ]]; then
-    # ARM64: use custom template download from linuxcontainers.org / GitHub
-    msg_info "Preparing ARM64 template"
-
-    CUSTOM_TEMPLATE_VARIANT=$(arm64_template_variant "$PCT_OSTYPE" "${PCT_OSVERSION:-}") || {
-      msg_error "No ARM64 template mapping for ${PCT_OSTYPE} ${PCT_OSVERSION:-latest}"
-      exit 207
-    }
-
-    TEMPLATE="${PCT_OSTYPE}-${CUSTOM_TEMPLATE_VARIANT}-rootfs.tar.xz"
-    TEMPLATE_SOURCE="custom-arm64"
-
-    # Resolve template path: pvesm → storage.cfg fallback → default
-    TEMPLATE_PATH="$(pvesm path "${TEMPLATE_STORAGE}:vztmpl/${TEMPLATE}" 2>/dev/null || true)"
-    if [[ -z "$TEMPLATE_PATH" ]]; then
-      local _tpl_base
-      _tpl_base=$(awk -v s="$TEMPLATE_STORAGE" '$1==s {f=1} f && /path/ {print $2; exit}' /etc/pve/storage.cfg)
-      TEMPLATE_PATH="${_tpl_base:-/var/lib/vz}/template/cache/$TEMPLATE"
-    fi
-
-    # Download if missing, too small, or corrupt (single pass)
-    if [[ ! -f "$TEMPLATE_PATH" ]]; then
-      download_arm64_template "$TEMPLATE_PATH"
-    elif [[ "$(stat -c%s "$TEMPLATE_PATH")" -lt 1000000 ]] || ! tar -tf "$TEMPLATE_PATH" &>/dev/null; then
-      msg_warn "Local template invalid – re-downloading."
-      rm -f "$TEMPLATE_PATH"
-      download_arm64_template "$TEMPLATE_PATH"
-    else
-      msg_ok "Template ${BL}$TEMPLATE${CL} found locally."
-    fi
-
-  else
   TEMPLATE_SEARCH="${PCT_OSTYPE}-${PCT_OSVERSION:-}"
   case "$PCT_OSTYPE" in
   debian | ubuntu) TEMPLATE_PATTERN="-standard_" ;;
@@ -5367,7 +5236,7 @@ create_lxc_container() {
         exit 0
       fi
     else
-        msg_error "No ${PCT_OSTYPE} templates available"
+      msg_error "No ${PCT_OSTYPE} templates available at all"
       exit 225
     fi
   fi
@@ -5403,7 +5272,7 @@ create_lxc_container() {
         done
 
         echo ""
-          read -p "Select version [1-${#AVAILABLE_VERSIONS[@]}] or press Enter to exit: " choice </dev/tty
+        read -p "Select version [1-${#AVAILABLE_VERSIONS[@]}] or Enter to exit: " choice </dev/tty
 
         if [[ "$choice" =~ ^[0-9]+$ ]] && [[ "$choice" -ge 1 ]] && [[ "$choice" -le ${#AVAILABLE_VERSIONS[@]} ]]; then
           export var_version="${AVAILABLE_VERSIONS[$((choice - 1))]}"
@@ -5476,21 +5345,21 @@ create_lxc_container() {
 
   NEED_DOWNLOAD=0
   if [[ ! -f "$TEMPLATE_PATH" ]]; then
-      msg_info "Template not present locally, will download it."
+    msg_info "Template not present locally – will download."
     NEED_DOWNLOAD=1
   elif [[ ! -r "$TEMPLATE_PATH" ]]; then
-      msg_error "Template file exists but is not readable, check permissions."
+    msg_error "Template file exists but is not readable – check permissions."
     exit 221
   elif [[ "$(stat -c%s "$TEMPLATE_PATH")" -lt 1000000 ]]; then
     if [[ -n "$ONLINE_TEMPLATE" ]]; then
-        msg_warn "Template file too small (<1MB), re-downloading."
+      msg_warn "Template file too small (<1MB) – re-downloading."
       NEED_DOWNLOAD=1
     else
       msg_warn "Template looks too small, but no online version exists. Keeping local file."
     fi
   elif ! tar -tf "$TEMPLATE_PATH" &>/dev/null; then
     if [[ -n "$ONLINE_TEMPLATE" ]]; then
-        msg_warn "Template appears corrupted, re-downloading."
+      msg_warn "Template appears corrupted – re-downloading."
       NEED_DOWNLOAD=1
     else
       msg_warn "Template appears corrupted, but no online version exists. Keeping local file."
@@ -5529,7 +5398,6 @@ create_lxc_container() {
     msg_error "Template $TEMPLATE not available in storage $TEMPLATE_STORAGE after download."
     exit 223
   fi
-  fi
 
   # ------------------------------------------------------------------------------
   # Dynamic preflight for Debian 13.x: offer upgrade if available (no hard mins)
@@ -5607,13 +5475,19 @@ create_lxc_container() {
   if [[ ! -s "$TEMPLATE_PATH" || "$(stat -c%s "$TEMPLATE_PATH" 2>/dev/null || echo 0)" -lt 1000000 ]]; then
     msg_info "Template file missing or too small – downloading"
     rm -f "$TEMPLATE_PATH"
-    download_template
+    pveam download "$TEMPLATE_STORAGE" "$TEMPLATE" >>"${BUILD_LOG:-/dev/null}" 2>&1 || {
+      msg_error "Failed to download template '$TEMPLATE' to storage '$TEMPLATE_STORAGE'"
+      exit 222
+    }
     msg_ok "Template downloaded"
   elif ! tar -tf "$TEMPLATE_PATH" &>/dev/null; then
-    if [[ "$ARCH" == "arm64" || -n "$ONLINE_TEMPLATE" ]]; then
+    if [[ -n "$ONLINE_TEMPLATE" ]]; then
       msg_info "Template appears corrupted – re-downloading"
       rm -f "$TEMPLATE_PATH"
-      download_template
+      pveam download "$TEMPLATE_STORAGE" "$TEMPLATE" >>"${BUILD_LOG:-/dev/null}" 2>&1 || {
+        msg_error "Failed to re-download template '$TEMPLATE'"
+        exit 222
+      }
       msg_ok "Template re-downloaded"
     else
       msg_warn "Template appears corrupted, but no online version exists. Skipping re-download."
@@ -5634,7 +5508,7 @@ create_lxc_container() {
     if grep -qiE 'unable to open|corrupt|invalid' "$LOGFILE"; then
       msg_info "Template may be corrupted – re-downloading"
       rm -f "$TEMPLATE_PATH"
-      download_template
+      pveam download "$TEMPLATE_STORAGE" "$TEMPLATE" >>"${BUILD_LOG:-/dev/null}" 2>&1
       msg_ok "Template re-downloaded"
     fi
 
@@ -5647,11 +5521,7 @@ create_lxc_container() {
         if [[ ! -f "$LOCAL_TEMPLATE_PATH" ]]; then
           msg_ok "Trying local storage fallback"
           msg_info "Downloading template to local"
-          if [[ "$ARCH" == "arm64" ]]; then
-            download_arm64_template "$LOCAL_TEMPLATE_PATH"
-          else
           pveam download local "$TEMPLATE" >>"${BUILD_LOG:-/dev/null}" 2>&1
-          fi
           msg_ok "Template downloaded to local"
         else
           msg_ok "Trying local storage fallback"

misc/core.func

@@ -344,15 +344,9 @@ pve_check() {
 # - Provides link to ARM64-compatible scripts
 # ------------------------------------------------------------------------------
 arch_check() {
-  local arch
+  if [ "$(dpkg --print-architecture)" != "amd64" ]; then
-  arch="$(dpkg --print-architecture)"
+    msg_error "This script will not work with PiMox (ARM architecture detected)."
-  if [[ "$arch" != "amd64" && "$arch" != "arm64" ]]; then
+    msg_warn "Visit https://github.com/asylumexp/Proxmox for ARM64 support."
-    msg_error "This script requires amd64 or arm64 (detected: $arch)."
-    sleep 2
-    exit 106
-  fi
-  if [[ "$arch" == "arm64" && "${var_arm64:-}" != "yes" ]]; then
-    msg_error "This script does not yet support arm64."
     sleep 2
     exit 106
   fi

misc/error_handler.func

@@ -99,7 +99,7 @@ if ! declare -f explain_exit_code &>/dev/null; then
     103) echo "Validation: Shell is not Bash" ;;
     104) echo "Validation: Not running as root (or invoked via sudo)" ;;
     105) echo "Validation: Proxmox VE version not supported" ;;
-    106) echo "Validation: Unsupported architecture (requires amd64 or arm64)" ;;
+    106) echo "Validation: Architecture not supported (ARM / PiMox)" ;;
     107) echo "Validation: Kernel key parameters unreadable" ;;
     108) echo "Validation: Kernel key limits exceeded" ;;
     109) echo "Proxmox: No available container ID after max attempts" ;;

misc/tools.func

@@ -2822,13 +2822,10 @@ function fetch_and_deploy_codeberg_release() {
     # Fall back to architecture heuristic
     if [[ -z "$url_match" ]]; then
       for u in $assets; do
-        if [[ "${arch,,}" =~ ^(amd64|x86_64)$ ]]; then
+        if [[ "$u" =~ ($arch|amd64|x86_64|aarch64|arm64).*\.deb$ ]]; then
-          [[ "$u" =~ (amd64|x86_64).*\.deb$ ]] || continue
-        elif [[ "${arch,,}" =~ ^(arm64|aarch64)$ ]]; then
-          [[ "$u" =~ (arm64|aarch64).*\.deb$ ]] || continue
-        fi
           url_match="$u"
           break
+        fi
       done
     fi
 
@@ -3125,11 +3122,7 @@ _gh_scan_older_releases() {
         done)
       fi
       if [[ "$has_match" != "true" ]]; then
-        if [[ "${arch,,}" =~ ^(amd64|x86_64)$ ]]; then
+        has_match=$(echo "$releases_list" | jq -r ".[$i].assets[].browser_download_url" | grep -qE "($arch|amd64|x86_64|aarch64|arm64).*\.deb$" && echo true)
-          has_match=$(echo "$releases_list" | jq -r ".[$i].assets[].browser_download_url" | grep -qE '(amd64|x86_64).*\.deb$' && echo true)
-        elif [[ "${arch,,}" =~ ^(arm64|aarch64)$ ]]; then
-          has_match=$(echo "$releases_list" | jq -r ".[$i].assets[].browser_download_url" | grep -qE '(arm64|aarch64).*\.deb$' && echo true)
-        fi
       fi
       if [[ "$has_match" != "true" ]]; then
         has_match=$(echo "$releases_list" | jq -r ".[$i].assets[].browser_download_url" | grep -qE '\.deb$' && echo true)
@@ -3335,13 +3328,10 @@ function fetch_and_deploy_gh_release() {
     # If no match via explicit pattern, fall back to architecture heuristic
     if [[ -z "$url_match" ]]; then
       for u in $assets; do
-        if [[ "${arch,,}" =~ ^(amd64|x86_64)$ ]]; then
+        if [[ "$u" =~ ($arch|amd64|x86_64|aarch64|arm64).*\.deb$ ]]; then
-          [[ "$u" =~ (amd64|x86_64).*\.deb$ ]] || continue
-        elif [[ "${arch,,}" =~ ^(arm64|aarch64)$ ]]; then
-          [[ "$u" =~ (arm64|aarch64).*\.deb$ ]] || continue
-        fi
           url_match="$u"
           break
+        fi
       done
     fi
 
@@ -3372,13 +3362,10 @@ function fetch_and_deploy_gh_release() {
         fi
         if [[ -z "$url_match" ]]; then
           for u in $assets; do
-            if [[ "${arch,,}" =~ ^(amd64|x86_64)$ ]]; then
+            if [[ "$u" =~ ($arch|amd64|x86_64|aarch64|arm64).*\.deb$ ]]; then
-              [[ "$u" =~ (amd64|x86_64).*\.deb$ ]] || continue
-            elif [[ "${arch,,}" =~ ^(arm64|aarch64)$ ]]; then
-              [[ "$u" =~ (arm64|aarch64).*\.deb$ ]] || continue
-            fi
               url_match="$u"
               break
+            fi
           done
         fi
         if [[ -z "$url_match" ]]; then
@@ -3746,12 +3733,7 @@ function setup_ffmpeg() {
 
   # Binary fallback mode
   if [[ "$TYPE" == "binary" ]]; then
-    local ffmpeg_arch
+    if ! CURL_TIMEOUT=300 curl_with_retry "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz" "$TMP_DIR/ffmpeg.tar.xz"; then
-    case "$(dpkg --print-architecture 2>/dev/null || echo amd64)" in
-    arm64) ffmpeg_arch="arm64" ;;
-    *) ffmpeg_arch="amd64" ;;
-    esac
-    if ! CURL_TIMEOUT=300 curl_with_retry "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-${ffmpeg_arch}-static.tar.xz" "$TMP_DIR/ffmpeg.tar.xz"; then
       msg_error "Failed to download FFmpeg binary"
       rm -rf "$TMP_DIR"
       return 1
@@ -3833,12 +3815,7 @@ function setup_ffmpeg() {
   # If no source download (either VERSION empty or download failed), use binary
   if [[ -z "$VERSION" ]]; then
     msg_info "Setup FFmpeg from pre-built binary"
-    local ffmpeg_arch
+    if ! CURL_TIMEOUT=300 curl_with_retry "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz" "$TMP_DIR/ffmpeg.tar.xz"; then
-    case "$(dpkg --print-architecture 2>/dev/null || echo amd64)" in
-    arm64) ffmpeg_arch="arm64" ;;
-    *) ffmpeg_arch="amd64" ;;
-    esac
-    if ! CURL_TIMEOUT=300 curl_with_retry "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-${ffmpeg_arch}-static.tar.xz" "$TMP_DIR/ffmpeg.tar.xz"; then
       msg_error "Failed to download FFmpeg pre-built binary"
       rm -rf "$TMP_DIR"
       return 1
@@ -7904,12 +7881,7 @@ function setup_yq() {
     msg_info "Setup yq $LATEST_VERSION"
   fi
 
-  local yq_arch
+  if ! curl_with_retry "https://github.com/${GITHUB_REPO}/releases/download/v${LATEST_VERSION}/yq_linux_amd64" "$TMP_DIR/yq"; then
-  case "$(dpkg --print-architecture 2>/dev/null || echo amd64)" in
-  arm64) yq_arch="arm64" ;;
-  *) yq_arch="amd64" ;;
-  esac
-  if ! curl_with_retry "https://github.com/${GITHUB_REPO}/releases/download/v${LATEST_VERSION}/yq_linux_${yq_arch}" "$TMP_DIR/yq"; then
     msg_error "Failed to download yq"
     rm -rf "$TMP_DIR"
     return 1