chore: add VERSION v0.3.0

2026-04-16 06:06:14 -04:00 · 2025-10-10 13:10:38 +00:00
573 changed files with 15595 additions and 58858 deletions
--- a/.env.example
+++ b/.env.example
@@ -1,15 +1,15 @@
 # When adding additional environment variables, the schema in "/src/env.js"
 # should be updated accordingly.

-# PocketBase - public API for script metadata (mirrors the community website)
-PB_URL="https://db.community-scripts.org"
-
-# Repository - used for downloading actual .sh script files
 REPO_URL="https://github.com/community-scripts/ProxmoxVE"
 REPO_BRANCH="main"
 SCRIPTS_DIRECTORY="scripts"
 ALLOWED_SCRIPT_EXTENSIONS=".sh"

+CT_SCRIPT_FOLDER="ct"
+INSTALL_SCRIPT_FOLDER="install"
+JSON_FOLDER="frontend/public/json"
+
 # Security
 MAX_SCRIPT_EXECUTION_TIME="900000"
 ALLOWED_SCRIPT_PATHS="scripts/"
@@ -18,26 +18,11 @@ ALLOWED_SCRIPT_PATHS="scripts/"
 WEBSOCKET_PORT="3001"

 # User settings
-# Optional tokens for private repos: GITHUB_TOKEN (GitHub), GITLAB_TOKEN (GitLab),
-# BITBUCKET_APP_PASSWORD or BITBUCKET_TOKEN (Bitbucket). REPO_URL and added repos
-# can be GitHub, GitLab, Bitbucket, or custom Git servers.
 GITHUB_TOKEN=
-GITLAB_TOKEN=
-BITBUCKET_APP_PASSWORD=
 SAVE_FILTER=false
 FILTERS=
 AUTH_USERNAME=
 AUTH_PASSWORD_HASH= 
 AUTH_ENABLED=false
 AUTH_SETUP_COMPLETED=false
-JWT_SECRET=
-DATABASE_URL="file:/opt/ProxmoxVE-Local/data/pve-scripts.db"
-AUTO_SYNC_ENABLED=false
-SYNC_INTERVAL_TYPE=
-SYNC_INTERVAL_PREDEFINED=
-AUTO_DOWNLOAD_NEW=
-AUTO_UPDATE_EXISTING=
-NOTIFICATION_ENABLED=
-APPRISE_URLS=
-LAST_AUTO_SYNC=
-SYNC_INTERVAL_CRON=
+JWT_SECRET=
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -4,7 +4,7 @@


 ## 🔗 Related PR / Issue  
-Fixes: #
+Link: #


 ## ✅ Prerequisites  (**X** in brackets) 
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -1,15 +1,12 @@
 # Template for release drafts
-name-template: 'v$NEXT_PATCH_VERSION'   # You can switch to $NEXT_MINOR_VERSION or $NEXT_MAJOR_VERSION
-tag-template: 'v$NEXT_PATCH_VERSION'
+name-template: 'v$NEXT_MINOR_VERSION'   # You can switch to $NEXT_MINOR_VERSION or $NEXT_MAJOR_VERSION
+tag-template: 'v$NEXT_MINOR_VERSION'

 # Exclude PRs with this label from release notes
 exclude-labels:
  - automated

 categories:
-  - title: "Breaking Changes"
-    labels:
-      - breaking
  - title: "🚀 Features"
    labels:
      - feature
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -9,9 +9,6 @@ on:
  pull_request:
    branches: [ "main" ]

-permissions:
-  contents: read
-
 jobs:
  build:

@@ -19,7 +16,7 @@ jobs:

    strategy:
      matrix:
-        node-version: [24.x]
+        node-version: [22.x]
        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/

    steps:
--- a/.github/workflows/publish_release.yml
+++ b/.github/workflows/publish_release.yml
@@ -31,28 +31,21 @@ jobs:
          echo "Found draft version: ${{ steps.draft.outputs.tag_name }}"

      
-      - name: Create branch and commit VERSION and package.json
+      - name: Create branch and commit VERSION
        run: |
          branch="update-version-${{ steps.draft.outputs.tag_name }}"
          # Delete remote branch if exists
          git push origin --delete "$branch" || echo "No remote branch to delete"
          git fetch origin main
          git checkout -b "$branch" origin/main
-          # Version without 'v' prefix (e.g. v1.2.3 -> 1.2.3)
+          # Write VERSION file and timestamp to ensure a diff
          version="${{ steps.draft.outputs.tag_name }}"
-          version_plain=$(echo "$version" | sed 's/^v//')
-          # Write VERSION file
-          echo "$version_plain" > VERSION
-          # Update package.json version
-          jq --arg v "$version_plain" '.version = $v' package.json > package.json.tmp && mv package.json.tmp package.json
-          git add VERSION package.json
+          echo "$version" | sed 's/^v//' > VERSION
+          git add VERSION
          git config user.name "github-actions[bot]"
          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git commit -m "chore: bump version to $version_plain (VERSION + package.json)" --allow-empty
-
-      - name: Push changes
-        run: |
-          git push --force-with-lease --set-upstream origin "update-version-${{ steps.draft.outputs.tag_name }}"
+          git commit -m "chore: add VERSION $version" --allow-empty
+          git push --set-upstream origin "$branch"

      
      - name: Create PR with GitHub CLI
@@ -61,8 +54,8 @@ jobs:
            pr_url=$(gh pr create \
            --base main \
            --head update-version-${{ steps.draft.outputs.tag_name }} \
-            --title "chore: bump version to ${{ steps.draft.outputs.tag_name }} (VERSION + package.json)" \
-            --body "Updates VERSION file and package.json version for release ${{ steps.draft.outputs.tag_name }}" \
+            --title "chore: add VERSION ${{ steps.draft.outputs.tag_name }}" \
+            --body "Adds VERSION file for release ${{ steps.draft.outputs.tag_name }}" \
            --label automated)
    
            pr_number=$(echo "$pr_url" | awk -F/ '{print $NF}')
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -6,10 +6,6 @@ on:
      - main
  workflow_dispatch: 

-permissions:
-  contents: write
-  pull-requests: read
-
 jobs:
  update_release_draft:
    runs-on: ubuntu-latest
--- a/.gitignore
+++ b/.gitignore
@@ -14,22 +14,13 @@
 /prisma/db.sqlite
 /prisma/db.sqlite-journal
 db.sqlite
-data/*.db
-
-# prisma generated client
-/prisma/generated/
-
-# ssh keys (sensitive)
-data/ssh-keys/
+data/settings.db

 # next.js
 /.next/
 /out/
 next-env.d.ts

-# cached logos (downloaded at runtime)
-/public/logos/
-
 # production
 /build

@@ -43,9 +34,6 @@ yarn-debug.log*
 yarn-error.log*
 .pnpm-debug.log*

-update.log
-server.log
-
 # local env files
 # do not commit any .env files to git, except for the .env.example file. https://create.t3.gg/en/usage/env-variables#using-environment-variables
 .env
@@ -58,5 +46,4 @@ server.log
 *.tsbuildinfo

 # idea files
-.idea
-/generated/prisma
+.idea
--- a/.npmrc
+++ b/.npmrc
@@ -1 +0,0 @@
-legacy-peer-deps=true
--- a/README.md
+++ b/README.md
@@ -100,7 +100,7 @@ apt install -y nodejs
 ```bash
 # Clone the repository
 git clone https://github.com/community-scripts/ProxmoxVE-Local.git /opt/PVESciptslocal
-cd /opt/PVESciptslocal
+cd PVESciptslocal

 # Install dependencies and build
 npm install
@@ -210,249 +210,6 @@ The application uses SQLite for storing server configurations:
 - **Backup**: Copy `data/settings.db` to backup your server configurations
 - **Reset**: Delete `data/settings.db` to reset all server configurations

-## 📖 Feature Guide
-
-This section provides detailed information about the application's key features and how to use them effectively.
-
-### Server Settings
-
-Manage your Proxmox VE servers and configure connection settings.
-
-**Adding PVE Servers:**
- **Server Name**: A friendly name to identify your server
- **IP Address**: The IP address or hostname of your PVE server
- **Username**: PVE user account (usually root or a dedicated user)
- **SSH Port**: Default is 22, change if your server uses a different port
-
-**Authentication Types:**
- **Password**: Use username and password authentication
- **SSH Key**: Use SSH key pair for secure authentication
- **Both**: Try SSH key first, fallback to password if needed
-
-**Server Color Coding:**
-Assign colors to servers for visual distinction throughout the application. This helps identify which server you're working with when managing scripts. This needs to be enabled in the General Settings.
-
-### General Settings
-
-Configure application preferences and behavior.
-
-**Save Filters:**
-When enabled, your script filter preferences (search terms, categories, sorting) will be automatically saved and restored when you return to the application:
- Search queries are preserved
- Selected script types are remembered
- Sort preferences are maintained
- Category selections are saved
-
-**Server Color Coding:**
-Enable visual color coding for servers throughout the application. This makes it easier to identify which server you're working with.
-
-**GitHub Integration:**
-Add a GitHub Personal Access Token to increase API rate limits and improve performance:
- Bypasses GitHub's rate limiting for unauthenticated requests
- Improves script loading and syncing performance
- Token is stored securely and only used for API calls
-
-**Authentication:**
-Secure your application with username and password authentication:
- Set up username and password for app access
- Enable/disable authentication as needed
- Credentials are stored securely
-
-### Sync Button
-
-Synchronize script metadata from the ProxmoxVE GitHub repository.
-
-**What Does Syncing Do?**
- **Updates Script Metadata**: Downloads the latest script information (JSON files)
- **Refreshes Available Scripts**: Updates the list of scripts you can download
- **Updates Categories**: Refreshes script categories and organization
- **Checks for Updates**: Identifies which downloaded scripts have newer versions
-
-**Important Notes:**
- **Metadata Only**: Syncing only updates script information, not the actual script files
- **No Downloads**: Script files are downloaded separately when you choose to install them
- **Last Sync Time**: Shows when the last successful sync occurred
- **Rate Limits**: GitHub API limits may apply without a personal access token
-
-**When to Sync:**
- When you want to see the latest available scripts
- To check for updates to your downloaded scripts
- If you notice scripts are missing or outdated
- After the ProxmoxVE repository has been updated
-
-### Available Scripts
-
-Browse and discover scripts from the ProxmoxVE repository.
-
-**Browsing Scripts:**
- **Category Sidebar**: Filter scripts by category (Storage, Network, Security, etc.)
- **Search**: Find scripts by name or description
- **View Modes**: Switch between card and list view
- **Sorting**: Sort by name or creation date
-
-**Filtering Options:**
- **Script Types**: Filter by CT (Container) or other script types
- **Update Status**: Show only scripts with available updates
- **Search Query**: Search within script names and descriptions
- **Categories**: Filter by specific script categories
-
-**Script Actions:**
- **View Details**: Click on a script to see full information and documentation
- **Download**: Download script files to your local system
- **Install**: Run scripts directly on your PVE servers
- **Preview**: View script content before downloading
-
-### Downloaded Scripts
-
-Manage scripts that have been downloaded to your local system.
-
-**What Are Downloaded Scripts?**
-These are scripts that you've downloaded from the repository and are stored locally on your system:
- Script files are stored in your local scripts directory
- You can run these scripts on your PVE servers
- Scripts can be updated when newer versions are available
-
-**Update Detection:**
-The system automatically checks if newer versions of your downloaded scripts are available:
- Scripts with updates available are marked with an update indicator
- You can filter to show only scripts with available updates
- Update detection happens when you sync with the repository
-
-**Managing Downloaded Scripts:**
- **Update Scripts**: Download the latest version of a script
- **View Details**: See script information and documentation
- **Install/Run**: Execute scripts on your PVE servers
- **Filter & Search**: Use the same filtering options as Available Scripts
-
-### Installed Scripts
-
-Track and manage scripts that are installed on your PVE servers.
-
-**Auto-Detection (Primary Feature):**
-The system can automatically detect LXC containers that have community-script tags on your PVE servers:
- **Automatic Discovery**: Scans your PVE servers for containers with community-script tags
- **Container Detection**: Identifies LXC containers running Proxmox helper scripts
- **Server Association**: Links detected scripts to the specific PVE server
- **Bulk Import**: Automatically creates records for all detected scripts
-
-**How Auto-Detection Works:**
-1. Connects to your configured PVE servers
-2. Scans LXC container configurations
-3. Looks for containers with community-script tags
-4. Creates installed script records automatically
-
-**Manual Script Management:**
- **Add Scripts Manually**: Create records for scripts not auto-detected
- **Edit Script Details**: Update script names and container IDs
- **Delete Scripts**: Remove scripts from tracking
- **Bulk Operations**: Clean up old or invalid script records
-
-**Script Tracking Features:**
- **Installation Status**: Track success, failure, or in-progress installations
- **Server Association**: Know which server each script is installed on
- **Container ID**: Link scripts to specific LXC containers
- **Web UI Access**: Track and access Web UI IP addresses and ports
- **Execution Logs**: View output and logs from script installations
- **Filtering**: Filter by server, status, or search terms
-
-**Managing Installed Scripts:**
- **View All Scripts**: See all tracked scripts across all servers
- **Filter by Server**: Show scripts for a specific PVE server
- **Filter by Status**: Show successful, failed, or in-progress installations
- **Sort Options**: Sort by name, container ID, server, status, or date
- **Update Scripts**: Re-run or update existing script installations
-
-**Web UI Access:**
-Automatically detect and access Web UI interfaces for your installed scripts:
- **Auto-Detection**: Automatically detects Web UI URLs from script installation output
- **IP & Port Tracking**: Stores and displays Web UI IP addresses and ports
- **One-Click Access**: Click IP:port to open Web UI in new tab
- **Manual Detection**: Re-detect IP using `hostname -I` inside container
- **Port Detection**: Uses script metadata to get correct port (e.g., actualbudget:5006)
- **Editable Fields**: Manually edit IP and port values as needed
-
-**Actions Dropdown:**
-Clean interface with all actions organized in a dropdown menu:
- **Edit Button**: Always visible for quick script editing
- **Actions Dropdown**: Contains Update, Shell, Open UI, Start/Stop, Destroy, Delete
- **Smart Visibility**: Dropdown only appears when actions are available
- **Auto-Close**: Dropdown closes after clicking any action
- **Disabled States**: Actions are disabled when container is stopped
-
-**Container Control:**
-Directly control LXC containers from the installed scripts page via SSH:
- **Start/Stop Button**: Control container state with `pct start/stop <ID>`
- **Container Status**: Real-time status indicator (running/stopped/unknown)
- **Destroy Button**: Permanently remove LXC container with `pct destroy <ID>`
- **Confirmation Modals**: Simple OK/Cancel for start/stop, type container ID to confirm destroy
- **SSH Execution**: All commands executed remotely via configured SSH connections
-
-**Safety Features:**
- Start/Stop actions require simple confirmation
- Destroy action requires typing the container ID to confirm
- All actions show loading states and error handling
- Only works with SSH scripts that have valid container IDs
-
-### Update System
-
-Keep your PVE Scripts Management application up to date with the latest features and improvements.
-
-**What Does Updating Do?**
- **Downloads Latest Version**: Fetches the newest release from the GitHub repository
- **Updates Application Files**: Replaces current files with the latest version
- **Installs Dependencies**: Updates Node.js packages and dependencies
- **Rebuilds Application**: Compiles the application with latest changes
- **Restarts Server**: Automatically restarts the application server
-
-**How to Update:**
-
-**Automatic Update (Recommended):**
- Click the "Update Now" button when an update is available
- The system will handle everything automatically
- You'll see a progress overlay with update logs
- The page will reload automatically when complete
-
-**Manual Update (Advanced):**
-If automatic update fails, you can update manually:
-```bash
-# Navigate to the application directory
-cd $PVESCRIPTLOCAL_DIR
-
-# Pull latest changes
-git pull
-
-# Install dependencies
-npm install
-
-# Build the application
-npm run build
-
-# Start the application
-npm start
-```
-
-**Update Process:**
-1. **Check for Updates**: System automatically checks GitHub for new releases
-2. **Download Update**: Downloads the latest release files
-3. **Backup Current Version**: Creates backup of current installation
-4. **Install New Version**: Replaces files and updates dependencies
-5. **Build Application**: Compiles the updated code
-6. **Restart Server**: Stops old server and starts new version
-7. **Reload Page**: Automatically refreshes the browser
-
-**Release Notes:**
-Click the external link icon next to the update button to view detailed release notes on GitHub:
- See what's new in each version
- Read about bug fixes and improvements
- Check for any breaking changes
- View installation requirements
-
-**Important Notes:**
- **Backup**: Your data and settings are preserved during updates
- **Downtime**: Brief downtime occurs during the update process
- **Compatibility**: Updates maintain backward compatibility with your data
- **Rollback**: If issues occur, you can manually revert to previous version
-
 ## 📁 Project Structure

 ```
--- a/2
+++ b/2
@@ -1 +1 @@
-0.5.8
+0.3.0
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,23 +1,15 @@
-import eslintPluginNext from "@next/eslint-plugin-next";
+import { FlatCompat } from "@eslint/eslintrc";
 import tseslint from "typescript-eslint";
-import reactPlugin from "eslint-plugin-react";
-import reactHooksPlugin from "eslint-plugin-react-hooks";
+
+const compat = new FlatCompat({
+  baseDirectory: import.meta.dirname,
+});

 export default tseslint.config(
  {
-    ignores: [".next", "next-env.d.ts", "postcss.config.js", "prettier.config.js"],
-  },
-  {
-    plugins: {
-      "@next/next": eslintPluginNext,
-      "react": reactPlugin,
-      "react-hooks": reactHooksPlugin,
-    },
-    rules: {
-      ...eslintPluginNext.configs.recommended.rules,
-      ...eslintPluginNext.configs["core-web-vitals"].rules,
-    },
+    ignores: [".next"],
  },
+  ...compat.extends("next/core-web-vitals"),
  {
    files: ["**/*.ts", "**/*.tsx"],
    extends: [
--- a/json/files.txt
+++ b/json/files.txt
@@ -1,405 +0,0 @@
-2fauth.json
-actualbudget.json
-add-iptag.json
-add-netbird-lxc.json
-add-tailscale-lxc.json
-adguard.json
-adventurelog.json
-agentdvr.json
-all-templates.json
-alpine-it-tools.json
-alpine-tinyauth.json
-alpine.json
-apache-cassandra.json
-apache-couchdb.json
-apache-guacamole.json
-apache-tika.json
-apache-tomcat.json
-apt-cacher-ng.json
-archivebox.json
-archlinux-vm.json
-argus.json
-aria2.json
-asterisk.json
-audiobookshelf.json
-authelia.json
-autobrr.json
-autocaliweb.json
-babybuddy.json
-backrest.json
-baikal.json
-bar-assistant.json
-barcode-buddy.json
-bazarr.json
-beszel.json
-bitmagnet.json
-blocky.json
-booklore.json
-bookstack.json
-bunkerweb.json
-bytestash.json
-caddy.json
-casaos.json
-changedetection.json
-channels.json
-checkmk.json
-clean-lxcs.json
-clean-orphaned-lvm.json
-cleanuparr.json
-cloudflare-ddns.json
-cloudflared.json
-cloudreve.json
-cockpit.json
-coder-code-server.json
-commafeed.json
-configarr.json
-convertx.json
-copyparty.json
-cosmos.json
-crafty-controller.json
-cron-update-lxcs.json
-cronicle.json
-cross-seed.json
-crowdsec.json
-cryptpad.json
-daemonsync.json
-dashy.json
-debian-13-vm.json
-debian-vm.json
-debian.json
-deconz.json
-deluge.json
-docker-vm.json
-docker.json
-dockge.json
-docmost.json
-documenso.json
-dolibarr.json
-dotnetaspwebapi.json
-duplicati.json
-elementsynapse.json
-emby.json
-emqx.json
-ersatztv.json
-esphome.json
-evcc.json
-excalidraw.json
-execute.json
-fenrus.json
-fhem.json
-filebrowser-quantum.json
-filebrowser.json
-fileflows.json
-firefly.json
-flaresolverr.json
-flowiseai.json
-fluid-calendar.json
-forgejo.json
-freepbx.json
-freshrss.json
-frigate.json.bak
-fstrim.json
-fumadocs.json
-gatus.json
-ghost.json
-ghostfolio.json
-gitea-mirror.json
-gitea.json
-glance.json
-glances.json
-globaleaks.json
-glpi.json
-go2rtc.json
-goaway.json
-gokapi.json
-gotify.json
-grafana.json
-graylog.json
-grist.json
-grocy.json
-guardian.json
-habitica.json
-haos-vm.json
-headscale.json
-healthchecks.json
-heimdall-dashboard.json
-hev-socks5-server.json
-hivemq.json
-homarr.json
-homeassistant.json
-homebox.json
-homebridge.json
-homepage.json
-homer.json
-hortusfox.json
-host-backup.json
-huntarr.json
-hyperhdr.json
-hyperion.json
-immich.json
-influxdb.json
-inspircd.json
-inventree.json
-iobroker.json
-itsm-ng.json
-iventoy.json
-jackett.json
-jeedom.json
-jellyfin.json
-jellyseerr.json
-jenkins.json
-joplin-server.json
-jupyternotebook.json
-kapowarr.json
-karakeep.json
-kasm.json
-kavita.json
-kernel-clean.json
-kernel-pin.json
-keycloak.json
-kimai.json
-koillection.json
-kometa.json
-komga.json
-komodo.json
-kubo.json
-lazylibrarian.json
-leantime.json
-librespeed-rust.json
-libretranslate.json
-lidarr.json
-limesurvey.json
-linkstack.json
-linkwarden.json
-listmonk.json
-litellm.json
-lldap.json
-lubelogger.json
-lxc-delete.json
-lyrionmusicserver.json
-mafl.json
-magicmirror.json
-managemydamnlife.json
-mariadb.json
-matterbridge.json
-mattermost.json
-mealie.json
-mediamanager.json
-mediamtx.json
-medusa.json
-meilisearch.json
-memos.json
-meshcentral.json
-metadata.json
-metube.json
-microcode.json
-mikrotik-routeros.json
-minarca.json
-minio.json
-mongodb.json
-monica.json
-monitor-all.json
-motioneye.json
-mqtt.json
-myip.json
-mylar3.json
-myspeed.json
-mysql.json
-n8n.json
-navidrome.json
-neo4j.json
-netbox.json
-netdata.json
-nextcloud-vm.json
-nextcloudpi.json
-nextpvr.json
-nginxproxymanager.json
-nic-offloading-fix.json
-nocodb.json
-node-red.json
-nodebb.json
-notifiarr.json
-npmplus.json
-ntfy.json
-nxwitness.json
-nzbget.json
-oauth2-proxy.json
-octoprint.json
-odoo.json
-olivetin.json
-ollama.json
-omada.json
-ombi.json
-omv.json
-onedev.json
-onlyoffice.json
-open-archiver.json
-opengist.json
-openhab.json
-openobserve.json
-openproject.json
-openwebui.json
-openwrt-vm.json
-openziti-controller.json
-openziti-tunnel.json
-ots.json
-outline.json
-overseerr.json
-owncast.json
-owncloud-vm.json
-pairdrop.json
-palmr.json
-paperless-ai.json
-paperless-gpt.json
-paperless-ngx.json
-part-db.json
-paymenter.json
-pbs-microcode.json
-pbs4-upgrade.json
-peanut.json
-pelican-panel.json
-pelican-wings.json
-pf2etools.json
-photoprism.json
-phpipam.json
-phpmyadmin.json
-pialert.json
-pihole.json
-pimox-haos-vm.json
-planka.json
-plant-it.json
-plex.json
-pocketbase.json
-pocketid.json
-podman-homeassistant.json
-podman.json
-post-pbs-install.json
-post-pmg-install.json
-post-pve-install.json
-postgresql.json
-privatebin.json
-projectsend.json
-prometheus-alertmanager.json
-prometheus-blackbox-exporter.json
-prometheus-paperless-ngx-exporter.json
-prometheus-pve-exporter.json
-prometheus.json
-prowlarr.json
-proxmox-backup-server.json
-proxmox-datacenter-manager.json
-proxmox-mail-gateway.json
-ps5-mqtt.json
-pterodactyl-panel.json
-pterodactyl-wings.json
-pulse.json
-pve-privilege-converter.json
-pve-scripts-local.json
-qbittorrent.json
-rabbitmq.json
-radarr.json
-radicale.json
-rclone.json
-rdtclient.json
-reactive-resume.json
-readeck.json
-recyclarr.json
-redis.json
-redlib.json
-resiliosync.json
-revealjs.json
-runtipi.json
-rustdeskserver.json
-rwmarkable.json
-sabnzbd.json
-salt.json
-scaling-governor.json
-scraparr.json
-searxng.json
-seelf.json
-semaphore.json
-sftpgo.json
-shinobi.json
-signoz.json
-silverbullet.json
-slskd.json
-smokeping.json
-snipeit.json
-sonarqube.json
-sonarr.json
-spoolman.json
-sqlserver2022.json
-stirling-pdf.json
-streamlink-webui.json
-stylus.json
-suwayomi-server.json
-swizzin.json
-syncthing.json
-tandoor.json
-tasmoadmin.json
-tasmocompiler.json
-tautulli.json
-tdarr.json
-teamspeak-server.json
-technitiumdns.json
-teddycloud.json
-telegraf.json
-the-lounge.json
-threadfin.json
-tianji.json
-traccar.json
-tracktor.json
-traefik.json
-transmission.json
-trilium.json
-tududi.json
-tunarr.json
-turnkey.json
-twingate-connector.json
-typesense.json
-ubuntu.json
-ubuntu2204-vm.json
-ubuntu2404-vm.json
-ubuntu2504-vm.json
-uhf.json
-umami.json
-umbrel-os-vm.json
-umlautadaptarr.json
-unbound.json
-unifi.json
-unmanic.json
-update-lxcs.json
-update-repo.json
-upsnap.json
-uptimekuma.json
-urbackupserver.json
-vaultwarden.json
-verdaccio.json
-versions.json
-victoriametrics.json
-vikunja.json
-wallos.json
-warracker.json
-wastebin.json
-watcharr.json
-watchyourlan.json
-wavelog.json
-wazuh.json
-web-check.json
-webmin.json
-wger.json
-whisparr.json
-wikijs.json
-wireguard.json
-wizarr.json
-wordpress.json
-yt-dlp-webui.json
-yunohost.json
-zabbix.json
-zammad.json
-zerotier-one.json
-zigbee2mqtt.json
-zipline.json
-zitadel.json
-zoraxy.json
-zot-registry.json
-zwave-js-ui.json
--- a/next.config.js
+++ b/next.config.js
@@ -18,25 +18,31 @@ const config = {
      },
    ],
  },
-  // Allow cross-origin requests from local network in dev mode
-  // Note: In Next.js 16, we disable this check entirely for dev
-  async headers() {
-    return [
-      {
-        source: '/:path*',
-        headers: [
-          { key: 'Access-Control-Allow-Origin', value: '*' },
-          { key: 'Access-Control-Allow-Methods', value: 'GET,POST,PUT,DELETE,OPTIONS' },
-          { key: 'Access-Control-Allow-Headers', value: 'Content-Type, Authorization' },
-        ],
-      },
-    ];
-  },
+  // Allow cross-origin requests from local network ranges
+  allowedDevOrigins: [
+    'http://localhost:3000',
+    'http://127.0.0.1:3000',
+    'http://[::1]:3000',    
+    'http://10.*',
+    'http://172.16.*',
+    'http://172.17.*',
+    'http://172.18.*',
+    'http://172.19.*',
+    'http://172.20.*',
+    'http://172.21.*',
+    'http://172.22.*',
+    'http://172.23.*',
+    'http://172.24.*',
+    'http://172.25.*',
+    'http://172.26.*',
+    'http://172.27.*',
+    'http://172.28.*',
+    'http://172.29.*',
+    'http://172.30.*',
+    'http://172.31.*',
+    'http://192.168.*',
+  ],

-  turbopack: {
-    // Disable Turbopack and use Webpack instead for compatibility
-    // This is necessary for server-side code that uses child_process
-  },
  webpack: (config, { dev, isServer }) => {
    if (dev && !isServer) {
      config.watchOptions = {
@@ -44,19 +50,8 @@ const config = {
        aggregateTimeout: 300,
      };
    }
-    // Handle server-side modules
-    if (isServer) {
-      config.externals = config.externals || [];
-      if (!config.externals.includes('child_process')) {
-        config.externals.push('child_process');
-      }
-    }
    return config;
  },
-  // TypeScript errors will fail the build
-  typescript: {
-    ignoreBuildErrors: false,
-  },
 };

 export default config;
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,23 +1,20 @@
 {
  "name": "pve-scripts-local",
-  "version": "0.5.8",
+  "version": "0.1.0",
  "private": true,
  "type": "module",
  "scripts": {
-    "build": "prisma generate && node --import tsx scripts/cache-logos.ts && next build --webpack",
-    "check": "eslint . && tsc --noEmit",
-    "dev": "next dev --webpack",
-    "dev:server": "node --import tsx server.js",
-    "dev:next": "next dev --webpack",
+    "build": "next build",
+    "check": "next lint && tsc --noEmit",
+    "dev": "next dev",
+    "dev:server": "node server.js",
+    "dev:next": "next dev --turbo",
    "format:check": "prettier --check \"**/*.{ts,tsx,js,jsx,mdx}\" --cache",
    "format:write": "prettier --write \"**/*.{ts,tsx,js,jsx,mdx}\" --cache",
-    "generate": "prisma generate",
-    "lint": "eslint .",
-    "lint:fix": "eslint --fix .",
-    "migrate": "prisma migrate dev",
+    "lint": "next lint",
+    "lint:fix": "next lint --fix",
    "preview": "next build && next start",
-    "postinstall": "prisma generate",
-    "start": "node --import tsx server.js",
+    "start": "node server.js",
    "test": "vitest",
    "test:ui": "vitest --ui",
    "test:run": "vitest run",
@@ -25,89 +22,67 @@
    "typecheck": "tsc --noEmit"
  },
  "dependencies": {
-    "@prisma/adapter-better-sqlite3": "^7.6.0",
-    "@prisma/client": "^7.6.0",
-    "@radix-ui/react-dropdown-menu": "^2.1.16",
-    "@radix-ui/react-slot": "^1.2.4",
-    "@t3-oss/env-nextjs": "^0.13.11",
-    "@tailwindcss/typography": "^0.5.19",
-    "@tanstack/react-query": "^5.96.0",
-    "@trpc/client": "^11.16.0",
-    "@trpc/react-query": "^11.16.0",
-    "@trpc/server": "^11.16.0",
+    "@radix-ui/react-slot": "^1.2.3",
+    "@t3-oss/env-nextjs": "^0.13.8",
+    "@tanstack/react-query": "^5.87.4",
+    "@trpc/client": "^11.6.0",
+    "@trpc/react-query": "^11.6.0",
+    "@trpc/server": "^11.6.0",
    "@types/react-syntax-highlighter": "^15.5.13",
    "@types/ws": "^8.18.1",
-    "@xterm/addon-fit": "^0.11.0",
-    "@xterm/addon-web-links": "^0.12.0",
-    "@xterm/xterm": "^6.0.0",
-    "axios": "^1.14.0",
-    "bcryptjs": "^3.0.3",
-    "better-sqlite3": "^12.8.0",
+    "@xterm/addon-fit": "^0.10.0",
+    "@xterm/addon-web-links": "^0.11.0",
+    "@xterm/xterm": "^5.5.0",
+    "bcryptjs": "^3.0.2",
+    "better-sqlite3": "^12.4.1",
    "class-variance-authority": "^0.7.1",
    "clsx": "^2.1.1",
-    "cron-validator": "^1.4.0",
-    "dotenv": "^17.3.1",
-    "jsonwebtoken": "^9.0.3",
-    "lucide-react": "^1.7.0",
-    "next": ">=16.2.1",
-    "node-cron": "^4.2.1",
-    "node-pty": "^1.1.0",
-    "pocketbase": "^0.26.8",
-    "react": "^19.2.4",
-    "react-dom": "^19.2.4",
-    "react-markdown": "^10.1.0",
-    "react-syntax-highlighter": "^16.1.1",
+    "jsonwebtoken": "^9.0.2",
+    "lucide-react": "^0.545.0",
+    "next": "^15.5.3",
+    "node-pty": "^1.0.0",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "react-syntax-highlighter": "^15.6.6",
    "refractor": "^5.0.0",
-    "remark-gfm": "^4.0.1",
    "server-only": "^0.0.1",
-    "strip-ansi": "^7.2.0",
-    "superjson": "^2.2.6",
-    "tailwind-merge": "^3.5.0",
-    "vite": "^8.0.3",
-    "ws": "^8.20.0",
-    "zod": "^4.3.6"
+    "strip-ansi": "^7.1.2",
+    "superjson": "^2.2.1",
+    "tailwind-merge": "^3.3.1",
+    "ws": "^8.18.3",
+    "zod": "^4.1.12"
  },
  "devDependencies": {
-    "@tailwindcss/postcss": "^4.2.2",
+    "@eslint/eslintrc": "^3.3.1",
+    "@tailwindcss/postcss": "^4.0.15",
    "@testing-library/jest-dom": "^6.9.1",
-    "@testing-library/react": "^16.3.2",
+    "@testing-library/react": "^16.3.0",
    "@testing-library/user-event": "^14.6.1",
-    "@types/bcryptjs": "^3.0.0",
-    "@types/better-sqlite3": "^7.6.13",
+    "@types/bcryptjs": "^2.4.6",
+    "@types/better-sqlite3": "^7.6.8",
    "@types/jsonwebtoken": "^9.0.10",
-    "@types/node": "^24.10.9",
-    "@types/node-cron": "^3.0.11",
-    "@types/react": "^19.2.14",
-    "@types/react-dom": "^19.2.3",
-    "@vitejs/plugin-react": "^6.0.1",
-    "@vitest/coverage-v8": "^4.1.2",
-    "@vitest/ui": "^4.1.2",
-    "baseline-browser-mapping": "^2.10.13",
-    "eslint": "^10.1.0",
-    "eslint-config-next": "^16.2.1",
-    "jsdom": "^29.0.1",
-    "next": ">=16.2.1",
-    "postcss": "^8.5.8",
-    "prettier": "^3.8.1",
-    "prettier-plugin-tailwindcss": "^0.7.2",
-    "prisma": "^7.6.0",
-    "tailwindcss": "^4.2.2",
-    "tsx": "^4.21.0",
-    "typescript": "^6.0.2",
-    "typescript-eslint": "^8.58.0",
-    "vitest": "^4.1.2"
+    "@types/node": "^24.7.1",
+    "@types/react": "^19.0.0",
+    "@types/react-dom": "^19.0.0",
+    "@vitejs/plugin-react": "^5.0.2",
+    "@vitest/coverage-v8": "^3.2.4",
+    "@vitest/ui": "^3.2.4",
+    "eslint": "^9.23.0",
+    "eslint-config-next": "^15.5.4",
+    "jsdom": "^27.0.0",
+    "postcss": "^8.5.3",
+    "prettier": "^3.5.3",
+    "prettier-plugin-tailwindcss": "^0.6.11",
+    "tailwindcss": "^4.1.14",
+    "typescript": "^5.8.2",
+    "typescript-eslint": "^8.27.0",
+    "vitest": "^3.2.4"
  },
  "ct3aMetadata": {
    "initVersion": "7.39.3"
  },
  "packageManager": "npm@10.9.3",
-  "engines": {
-    "node": ">=24.0.0"
-  },
  "overrides": {
-    "prismjs": "^1.30.0",
-    "hono": ">=4.11.7",
-    "@hono/node-server": ">=1.19.10",
-    "lodash": "^4.17.23"
+    "prismjs": "^1.30.0"
  }
 }
--- a/prisma.config.ts
+++ b/prisma.config.ts
@@ -1,21 +0,0 @@
-import 'dotenv/config'
-import path from 'path'
-import { defineConfig } from 'prisma/config'
-
-// Resolve database path
-const dbPath = process.env.DATABASE_URL ?? `file:${path.join(process.cwd(), 'data', 'pve-scripts.db')}`
-
-export default defineConfig({
-  schema: 'prisma/schema.prisma',
-  datasource: {
-    url: dbPath,
-  },
-  // @ts-expect-error - Prisma 7 config types are incomplete
-  studio: {
-    adapter: async () => {
-      const { PrismaBetterSqlite3 } = await import('@prisma/adapter-better-sqlite3')
-       
-      return new PrismaBetterSqlite3({ url: dbPath })
-    },
-  },
-})
--- a/prisma/migrations/20251017092130_init/migration.sql
+++ b/prisma/migrations/20251017092130_init/migration.sql
@@ -1,74 +0,0 @@
-- CreateTable
-CREATE TABLE "installed_scripts" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "script_name" TEXT NOT NULL,
-    "script_path" TEXT NOT NULL,
-    "container_id" TEXT,
-    "server_id" INTEGER,
-    "execution_mode" TEXT NOT NULL,
-    "installation_date" DATETIME DEFAULT CURRENT_TIMESTAMP,
-    "status" TEXT NOT NULL,
-    "output_log" TEXT,
-    "web_ui_ip" TEXT,
-    "web_ui_port" INTEGER,
-    CONSTRAINT "installed_scripts_server_id_fkey" FOREIGN KEY ("server_id") REFERENCES "servers" ("id") ON DELETE SET NULL ON UPDATE CASCADE
-);
-
-- CreateTable
-CREATE TABLE "servers" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "name" TEXT NOT NULL,
-    "ip" TEXT NOT NULL,
-    "user" TEXT NOT NULL,
-    "password" TEXT,
-    "auth_type" TEXT DEFAULT 'password',
-    "ssh_key" TEXT,
-    "ssh_key_passphrase" TEXT,
-    "ssh_port" INTEGER DEFAULT 22,
-    "color" TEXT,
-    "created_at" DATETIME DEFAULT CURRENT_TIMESTAMP,
-    "updated_at" DATETIME,
-    "ssh_key_path" TEXT,
-    "key_generated" BOOLEAN DEFAULT false
-);
-
-- CreateTable
-CREATE TABLE "lxc_configs" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "installed_script_id" INTEGER NOT NULL,
-    "arch" TEXT,
-    "cores" INTEGER,
-    "memory" INTEGER,
-    "hostname" TEXT,
-    "swap" INTEGER,
-    "onboot" INTEGER,
-    "ostype" TEXT,
-    "unprivileged" INTEGER,
-    "net_name" TEXT,
-    "net_bridge" TEXT,
-    "net_hwaddr" TEXT,
-    "net_ip_type" TEXT,
-    "net_ip" TEXT,
-    "net_gateway" TEXT,
-    "net_type" TEXT,
-    "net_vlan" INTEGER,
-    "rootfs_storage" TEXT,
-    "rootfs_size" TEXT,
-    "feature_keyctl" INTEGER,
-    "feature_nesting" INTEGER,
-    "feature_fuse" INTEGER,
-    "feature_mount" TEXT,
-    "tags" TEXT,
-    "advanced_config" TEXT,
-    "synced_at" DATETIME,
-    "config_hash" TEXT,
-    "created_at" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updated_at" DATETIME NOT NULL,
-    CONSTRAINT "lxc_configs_installed_script_id_fkey" FOREIGN KEY ("installed_script_id") REFERENCES "installed_scripts" ("id") ON DELETE CASCADE ON UPDATE CASCADE
-);
-
-- CreateIndex
-CREATE UNIQUE INDEX "servers_name_key" ON "servers"("name");
-
-- CreateIndex
-CREATE UNIQUE INDEX "lxc_configs_installed_script_id_key" ON "lxc_configs"("installed_script_id");
--- a/prisma/migrations/20251113125441_add_repositories/migration.sql
+++ b/prisma/migrations/20251113125441_add_repositories/migration.sql
@@ -1,14 +0,0 @@
-- CreateTable
-CREATE TABLE "repositories" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "url" TEXT NOT NULL,
-    "enabled" BOOLEAN NOT NULL DEFAULT true,
-    "is_default" BOOLEAN NOT NULL DEFAULT false,
-    "is_removable" BOOLEAN NOT NULL DEFAULT true,
-    "priority" INTEGER NOT NULL DEFAULT 0,
-    "created_at" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updated_at" DATETIME NOT NULL
-);
-
-- CreateIndex
-CREATE UNIQUE INDEX "repositories_url_key" ON "repositories"("url");
--- a/prisma/migrations/20251118091618_add_backups_and_pbs_credentials/migration.sql
+++ b/prisma/migrations/20251118091618_add_backups_and_pbs_credentials/migration.sql
@@ -1,41 +0,0 @@
-- CreateTable
-CREATE TABLE IF NOT EXISTS "backups" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "container_id" TEXT NOT NULL,
-    "server_id" INTEGER NOT NULL,
-    "hostname" TEXT NOT NULL,
-    "backup_name" TEXT NOT NULL,
-    "backup_path" TEXT NOT NULL,
-    "size" BIGINT,
-    "created_at" DATETIME,
-    "storage_name" TEXT NOT NULL,
-    "storage_type" TEXT NOT NULL,
-    "discovered_at" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    CONSTRAINT "backups_server_id_fkey" FOREIGN KEY ("server_id") REFERENCES "servers" ("id") ON DELETE CASCADE ON UPDATE CASCADE
-);
-
-- CreateTable
-CREATE TABLE IF NOT EXISTS "pbs_storage_credentials" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "server_id" INTEGER NOT NULL,
-    "storage_name" TEXT NOT NULL,
-    "pbs_ip" TEXT NOT NULL,
-    "pbs_datastore" TEXT NOT NULL,
-    "pbs_password" TEXT NOT NULL,
-    "pbs_fingerprint" TEXT NOT NULL,
-    "created_at" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updated_at" DATETIME NOT NULL,
-    CONSTRAINT "pbs_storage_credentials_server_id_fkey" FOREIGN KEY ("server_id") REFERENCES "servers" ("id") ON DELETE CASCADE ON UPDATE CASCADE
-);
-
-- CreateIndex
-CREATE INDEX IF NOT EXISTS "backups_container_id_idx" ON "backups"("container_id");
-
-- CreateIndex
-CREATE INDEX IF NOT EXISTS "backups_server_id_idx" ON "backups"("server_id");
-
-- CreateIndex
-CREATE INDEX IF NOT EXISTS "pbs_storage_credentials_server_id_idx" ON "pbs_storage_credentials"("server_id");
-
-- CreateIndex
-CREATE UNIQUE INDEX IF NOT EXISTS "pbs_storage_credentials_server_id_storage_name_key" ON "pbs_storage_credentials"("server_id", "storage_name");
--- a/prisma/migrations/migration_lock.toml
+++ b/prisma/migrations/migration_lock.toml
@@ -1,3 +0,0 @@
-# Please do not edit this file manually
-# It should be added in your version-control system (e.g., Git)
-provider = "sqlite"
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -1,148 +0,0 @@
-generator client {
-  provider = "prisma-client"
-  output   = "./generated/prisma"
-}
-
-datasource db {
-  provider = "sqlite"
-}
-
-model InstalledScript {
-  id                Int       @id @default(autoincrement())
-  script_name       String
-  script_path       String
-  container_id      String?
-  server_id         Int?
-  execution_mode    String
-  installation_date DateTime? @default(now())
-  status            String
-  output_log        String?
-  web_ui_ip         String?
-  web_ui_port       Int?
-  server            Server?   @relation(fields: [server_id], references: [id], onDelete: SetNull)
-  lxc_config        LXCConfig?
-  
-  @@map("installed_scripts")
-}
-
-model Server {
-  id                 Int                @id @default(autoincrement())
-  name               String             @unique
-  ip                 String
-  user               String
-  password           String?
-  auth_type          String?            @default("password")
-  ssh_key            String?
-  ssh_key_passphrase String?
-  ssh_port           Int?               @default(22)
-  color              String?
-  created_at         DateTime?          @default(now())
-  updated_at         DateTime?          @updatedAt
-  ssh_key_path       String?
-  key_generated      Boolean?           @default(false)
-  installed_scripts  InstalledScript[]
-  backups            Backup[]
-  pbs_credentials    PBSStorageCredential[]
-  
-  @@map("servers")
-}
-
-model LXCConfig {
-  id                    Int              @id @default(autoincrement())
-  installed_script_id   Int              @unique
-  installed_script      InstalledScript  @relation(fields: [installed_script_id], references: [id], onDelete: Cascade)
-  
-  // Basic settings
-  arch                  String?
-  cores                 Int?
-  memory                Int?
-  hostname              String?
-  swap                  Int?
-  onboot                Int?            // 0 or 1
-  ostype                String?
-  unprivileged          Int?            // 0 or 1
-  
-  // Network settings (net0)
-  net_name              String?
-  net_bridge            String?
-  net_hwaddr            String?
-  net_ip_type           String?         // 'dhcp' or 'static'
-  net_ip                String?         // IP with CIDR for static
-  net_gateway           String?
-  net_type              String?         // usually 'veth'
-  net_vlan              Int?
-  
-  // Storage
-  rootfs_storage        String?
-  rootfs_size           String?
-  
-  // Features
-  feature_keyctl        Int?            // 0 or 1
-  feature_nesting       Int?            // 0 or 1
-  feature_fuse          Int?            // 0 or 1
-  feature_mount         String?         // other mount features
-  
-  // Tags
-  tags                  String?
-  
-  // Advanced/raw settings (lxc.* entries and other uncommon settings)
-  advanced_config       String?         // Text blob for advanced settings
-  
-  // Metadata
-  synced_at             DateTime?
-  config_hash           String?         // Hash of server config for diff detection
-  
-  created_at            DateTime         @default(now())
-  updated_at            DateTime         @updatedAt
-  
-  @@map("lxc_configs")
-}
-
-model Backup {
-  id                Int       @id @default(autoincrement())
-  container_id      String
-  server_id         Int
-  hostname          String
-  backup_name       String
-  backup_path       String
-  size              BigInt?
-  created_at        DateTime?
-  storage_name      String
-  storage_type      String    // 'local', 'storage', or 'pbs'
-  discovered_at     DateTime  @default(now())
-  server            Server    @relation(fields: [server_id], references: [id], onDelete: Cascade)
-  
-  @@index([container_id])
-  @@index([server_id])
-  @@map("backups")
-}
-
-model PBSStorageCredential {
-  id                Int       @id @default(autoincrement())
-  server_id         Int
-  storage_name      String
-  pbs_ip            String
-  pbs_datastore     String
-  pbs_password      String
-  pbs_fingerprint   String
-  created_at        DateTime  @default(now())
-  updated_at        DateTime  @updatedAt
-  server            Server    @relation(fields: [server_id], references: [id], onDelete: Cascade)
-  
-  @@unique([server_id, storage_name])
-  @@index([server_id])
-  @@map("pbs_storage_credentials")
-}
-
-model Repository {
-  id          Int      @id @default(autoincrement())
-  url         String   @unique
-  enabled     Boolean  @default(true)
-  is_default  Boolean  @default(false)
-  is_removable Boolean @default(true)
-  priority    Int      @default(0)
-  created_at  DateTime @default(now())
-  updated_at  DateTime @updatedAt
-  
-  @@map("repositories")
-}
--- a/restore.log
+++ b/restore.log
@@ -1,10 +0,0 @@
-Starting restore...
-Reading container configuration...
-Stopping container...
-Destroying container...
-Logging into PBS...
-Downloading backup from PBS...
-Packing backup folder...
-Restoring container...
-Cleaning up temporary files...
-Restore completed successfully
--- a/scripts/cache-logos.ts
+++ b/scripts/cache-logos.ts
@@ -1,34 +0,0 @@
-/**
- * Build-time script: fetch all logos from PocketBase and cache them to public/logos/.
- * Called as part of `npm run build` so the app starts with logos pre-cached.
- */
-
-import { getPb } from '../src/server/services/pbService';
-import { cacheLogos } from '../src/server/services/logoCacheService';
-
-async function main() {
-  console.log('[cache-logos] Fetching script list from PocketBase...');
-  const pb = getPb();
-  const records = await pb.collection('script_scripts').getFullList({
-    fields: 'slug,logo',
-    batch: 500,
-  });
-
-  const entries = records
-     
-    .filter((r) => r.logo)
-    .map((r) => ({ slug: r.slug, url: r.logo }));
-
-  console.log(`[cache-logos] Caching ${entries.length} logos...`);
-   
-  const result = await cacheLogos(entries);
-  console.log(
-    `[cache-logos] Done: ${result.downloaded} downloaded, ${result.skipped} already cached, ${result.errors} errors`,
-  );
-}
-
-main().catch((err) => {
-  console.error('[cache-logos] Failed:', err);
-  // Non-fatal — build should continue even if logo caching fails
-  process.exit(0);
-});
--- a/scripts/core/alpine-install.func
+++ b/scripts/core/alpine-install.func
@@ -1,240 +1,163 @@
-# Copyright (c) 2021-2026 community-scripts ORG
+# Copyright (c) 2021-2025 community-scripts ORG
 # Author: tteck (tteckster)
 # Co-Author: MickLesk
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE

 if ! command -v curl >/dev/null 2>&1; then
-	apk update && apk add curl >/dev/null 2>&1
+  apk update && apk add curl >/dev/null 2>&1
 fi
-source "$(dirname "${BASH_SOURCE[0]}")/core.func"
-source "$(dirname "${BASH_SOURCE[0]}")/error-handler.func"
+
 load_functions
-catch_errors
-
-# Persist diagnostics setting inside container (exported from build.func)
-# so addon scripts running later can find the user's choice
-if [[ ! -f /usr/local/community-scripts/diagnostics ]]; then
-	mkdir -p /usr/local/community-scripts
-	echo "DIAGNOSTICS=${DIAGNOSTICS:-no}" >/usr/local/community-scripts/diagnostics
-fi
-
-# Get LXC IP address (must be called INSIDE container, after network is up)
-get_lxc_ip
-
-# ------------------------------------------------------------------------------
-# post_progress_to_api()
-#
-# - Lightweight progress ping from inside the container
-# - Updates the existing telemetry record status
-# - Arguments:
-#   * $1: status (optional, default: "configuring")
-# - Signals that the installation is actively progressing (not stuck)
-# - Fire-and-forget: never blocks or fails the script
-# - Only executes if DIAGNOSTICS=yes and RANDOM_UUID is set
-# ------------------------------------------------------------------------------
-post_progress_to_api() {
-	command -v curl &>/dev/null || return 0
-	[[ "${DIAGNOSTICS:-no}" == "no" ]] && return 0
-	[[ -z "${RANDOM_UUID:-}" ]] && return 0
-
-	local progress_status="${1:-configuring}"
-
-	curl -fsS -m 5 -X POST "https://telemetry.community-scripts.org/telemetry" \
-		-H "Content-Type: application/json" \
-		-d "{\"random_id\":\"${RANDOM_UUID}\",\"execution_id\":\"${EXECUTION_ID:-${RANDOM_UUID}}\",\"type\":\"lxc\",\"nsapp\":\"${app:-unknown}\",\"status\":\"${progress_status}\"}" &>/dev/null || true
-}

 # This function enables IPv6 if it's not disabled and sets verbose mode
 verb_ip6() {
-	set_std_mode # Set STD mode based on VERBOSE
+  set_std_mode # Set STD mode based on VERBOSE

-	if [ "${IPV6_METHOD:-}" = "disable" ]; then
-		msg_info "Disabling IPv6 (this may affect some services)"
-		$STD sysctl -w net.ipv6.conf.all.disable_ipv6=1
-		$STD sysctl -w net.ipv6.conf.default.disable_ipv6=1
-		$STD sysctl -w net.ipv6.conf.lo.disable_ipv6=1
-		mkdir -p /etc/sysctl.d
-		$STD tee /etc/sysctl.d/99-disable-ipv6.conf >/dev/null <<EOF
-net.ipv6.conf.all.disable_ipv6 = 1
-net.ipv6.conf.default.disable_ipv6 = 1
-net.ipv6.conf.lo.disable_ipv6 = 1
-EOF
-		$STD rc-update add sysctl default
-		msg_ok "Disabled IPv6"
-	fi
+  if [ "$DISABLEIPV6" == "yes" ]; then
+    $STD sysctl -w net.ipv6.conf.all.disable_ipv6=1
+    echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf
+    $STD rc-update add sysctl default
+  fi
+}
+
+# This function catches errors and handles them with the error handler function
+catch_errors() {
+  set -Eeuo pipefail
+  trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+}
+
+# This function handles errors
+error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }

 # This function sets up the Container OS by generating the locale, setting the timezone, and checking the network connection
 setting_up_container() {
-	msg_info "Setting up Container OS"
-	while [ $i -gt 0 ]; do
-		if [ "$(ip addr show | grep 'inet ' | grep -v '127.0.0.1' | awk '{print $2}' | cut -d'/' -f1)" != "" ]; then
-			break
-		fi
-		echo 1>&2 -en "${CROSS}${RD} No Network! "
-		sleep $RETRY_EVERY
-		i=$((i - 1))
-	done
+  msg_info "Setting up Container OS"
+  while [ $i -gt 0 ]; do
+    if [ "$(ip addr show | grep 'inet ' | grep -v '127.0.0.1' | awk '{print $2}' | cut -d'/' -f1)" != "" ]; then
+      break
+    fi
+    echo 1>&2 -en "${CROSS}${RD} No Network! "
+    sleep $RETRY_EVERY
+    i=$((i - 1))
+  done

-	if [ "$(ip addr show | grep 'inet ' | grep -v '127.0.0.1' | awk '{print $2}' | cut -d'/' -f1)" = "" ]; then
-		echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
-		echo -e "${NETWORK}Check Network Settings"
-		exit 121
-	fi
-	msg_ok "Set up Container OS"
-	msg_ok "Network Connected: ${BL}$(ip addr show | grep 'inet ' | awk '{print $2}' | cut -d'/' -f1 | tail -n1)${CL}"
-	post_progress_to_api
+  if [ "$(ip addr show | grep 'inet ' | grep -v '127.0.0.1' | awk '{print $2}' | cut -d'/' -f1)" = "" ]; then
+    echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
+    echo -e "${NETWORK}Check Network Settings"
+    exit 1
+  fi
+  msg_ok "Set up Container OS"
+  msg_ok "Network Connected: ${BL}$(ip addr show | grep 'inet ' | awk '{print $2}' | cut -d'/' -f1 | tail -n1)${CL}"
 }

 # This function checks the network connection by pinging a known IP address and prompts the user to continue if the internet is not connected
 network_check() {
-	set +e
-	trap - ERR
-	ipv4_connected=false
-
-	# Check IPv4 connectivity to Cloudflare, Google & Quad9 DNS servers
-	if ping -c 1 -W 1 1.1.1.1 &>/dev/null || ping -c 1 -W 1 8.8.8.8 &>/dev/null || ping -c 1 -W 1 9.9.9.9 &>/dev/null; then
-		msg_ok "IPv4 Internet Connected"
-		ipv4_connected=true
-	else
-		msg_error "IPv4 Internet Not Connected"
-	fi
-
-	if [[ $ipv4_connected == false ]]; then
-		read -r -p "No Internet detected, would you like to continue anyway? <y/N> " prompt
-		if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
-			echo -e "${INFO}${RD}Expect Issues Without Internet${CL}"
-		else
-			echo -e "${NETWORK}Check Network Settings"
-			exit 122
-		fi
-	fi
-
-	# DNS resolution checks for GitHub-related domains
-	GIT_HOSTS=("github.com" "raw.githubusercontent.com" "api.github.com" "git.community-scripts.org")
-	GIT_STATUS="Git DNS:"
-	DNS_FAILED=false
-
-	for HOST in "${GIT_HOSTS[@]}"; do
-		RESOLVEDIP=$(getent hosts "$HOST" | awk '{ print $1 }' | grep -E '(^([0-9]{1,3}\.){3}[0-9]{1,3}$)|(^[a-fA-F0-9:]+$)' | head -n1)
-		if [[ -z "$RESOLVEDIP" ]]; then
-			GIT_STATUS+="$HOST:($DNSFAIL)"
-			DNS_FAILED=true
-		else
-			GIT_STATUS+=" $HOST:($DNSOK)"
-		fi
-	done
-
-	if [[ "$DNS_FAILED" == true ]]; then
-		fatal "$GIT_STATUS"
-	else
-		msg_ok "$GIT_STATUS"
-	fi
-
-	set -e
-	trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+  set +e
+  trap - ERR
+  if ping -c 1 -W 1 1.1.1.1 &>/dev/null || ping -c 1 -W 1 8.8.8.8 &>/dev/null || ping -c 1 -W 1 9.9.9.9 &>/dev/null; then
+    msg_ok "Internet Connected"
+  else
+    msg_error "Internet NOT Connected"
+    read -r -p "Would you like to continue anyway? <y/N> " prompt
+    if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
+      echo -e "${INFO}${RD}Expect Issues Without Internet${CL}"
+    else
+      echo -e "${NETWORK}Check Network Settings"
+      exit 1
+    fi
+  fi
+  RESOLVEDIP=$(getent hosts github.com | awk '{ print $1 }')
+  if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi
+  set -e
+  trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
 }

-# This function updates the Container OS by running apk upgrade with mirror fallback
+# This function updates the Container OS by running apt-get update and upgrade
 update_os() {
-	msg_info "Updating Container OS"
-	if ! $STD apk -U upgrade; then
-		msg_warn "apk update failed (dl-cdn.alpinelinux.org), trying alternate mirrors..."
-		local alpine_mirrors="mirror.init7.net ftp.halifax.rwth-aachen.de mirrors.edge.kernel.org alpine.mirror.wearetriple.com mirror.leaseweb.com uk.alpinelinux.org dl-2.alpinelinux.org dl-4.alpinelinux.org"
-		local apk_ok=false
-		for m in $(printf '%s\n' $alpine_mirrors | shuf); do
-			if timeout 2 bash -c "echo >/dev/tcp/$m/80" 2>/dev/null; then
-				msg_custom "${INFO}" "${YW}" "Attempting mirror: ${m}"
-				cat <<EOF >/etc/apk/repositories
-http://$m/alpine/latest-stable/main
-http://$m/alpine/latest-stable/community
-EOF
-				if $STD apk -U upgrade; then
-					msg_ok "CDN set to ${m}: tests passed"
-					apk_ok=true
-					break
-				else
-					msg_warn "Mirror ${m} failed"
-				fi
-			fi
-		done
-		if [[ "$apk_ok" != true ]]; then
-			msg_error "All Alpine mirrors failed. Check network or try again later."
-			exit 1
-		fi
-	fi
-	local tools_content
-	tools_content=$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func) || {
-		msg_error "Failed to download tools.func"
-		exit 115
-	}
-	source /dev/stdin <<<"$tools_content"
-	if ! declare -f fetch_and_deploy_gh_release >/dev/null 2>&1; then
-		msg_error "tools.func loaded but incomplete — missing expected functions"
-		exit 115
-	fi
-	msg_ok "Updated Container OS"
-	post_progress_to_api
+  msg_info "Updating Container OS"
+  $STD apk -U upgrade
+  #source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/tools.func)
+  msg_ok "Updated Container OS"
 }

 # This function modifies the message of the day (motd) and SSH settings
 motd_ssh() {
-	echo "export TERM='xterm-256color'" >>/root/.bashrc
+  echo "export TERM='xterm-256color'" >>/root/.bashrc
+  IP=$(ip -4 addr show eth0 | awk '/inet / {print $2}' | cut -d/ -f1 | head -n 1)

-	PROFILE_FILE="/etc/profile.d/00_lxc-details.sh"
-	echo "echo -e \"\"" >"$PROFILE_FILE"
-	echo -e "echo -e \"${BOLD}${APPLICATION} LXC Container${CL}"\" >>"$PROFILE_FILE"
-	echo -e "echo -e \"${TAB}${GATEWAY}${YW} Provided by: ${GN}community-scripts ORG ${YW}| GitHub: ${GN}https://github.com/community-scripts/ProxmoxVE${CL}\"" >>"$PROFILE_FILE"
-	echo "echo \"\"" >>"$PROFILE_FILE"
-	echo -e "echo -e \"${TAB}${OS}${YW} OS: ${GN}\$(grep ^NAME /etc/os-release | cut -d= -f2 | tr -d '\"') - Version: \$(grep ^VERSION_ID /etc/os-release | cut -d= -f2 | tr -d '\"')${CL}\"" >>"$PROFILE_FILE"
-	echo -e "echo -e \"${TAB}${HOSTNAME}${YW} Hostname: ${GN}\$(hostname)${CL}\"" >>"$PROFILE_FILE"
-	echo -e "echo -e \"${TAB}${INFO}${YW} IP Address: ${GN}\$(ip -4 addr show eth0 | awk '/inet / {print \$2}' | cut -d/ -f1 | head -n 1)${CL}\"" >>"$PROFILE_FILE"
+  if [ -f "/etc/os-release" ]; then
+    OS_NAME=$(grep ^NAME /etc/os-release | cut -d= -f2 | tr -d '"')
+    OS_VERSION=$(grep ^VERSION_ID /etc/os-release | cut -d= -f2 | tr -d '"')
+  else
+    OS_NAME="Alpine Linux"
+    OS_VERSION="Unknown"
+  fi

-	# Configure SSH if enabled
-	if [[ "${SSH_ROOT}" == "yes" ]]; then
-		# Enable sshd service
-		$STD rc-update add sshd
-		# Allow root login via SSH
-		sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config
-		# Start the sshd service
-		$STD /etc/init.d/sshd start
-	fi
-	post_progress_to_api
+  PROFILE_FILE="/etc/profile.d/00_lxc-details.sh"
+  echo "echo -e \"\"" >"$PROFILE_FILE"
+  echo -e "echo -e \"${BOLD}${APPLICATION} LXC Container${CL}"\" >>"$PROFILE_FILE"
+  echo -e "echo -e \"${TAB}${GATEWAY}${YW} Provided by: ${GN}community-scripts ORG ${YW}| GitHub: ${GN}https://github.com/community-scripts/ProxmoxVE${CL}\"" >>"$PROFILE_FILE"
+  echo "echo \"\"" >>"$PROFILE_FILE"
+  echo -e "echo -e \"${TAB}${OS}${YW} OS: ${GN}${OS_NAME} - Version: ${OS_VERSION}${CL}\"" >>"$PROFILE_FILE"
+  echo -e "echo -e \"${TAB}${HOSTNAME}${YW} Hostname: ${GN}\$(hostname)${CL}\"" >>"$PROFILE_FILE"
+  echo -e "echo -e \"${TAB}${INFO}${YW} IP Address: ${GN}\$(ip -4 addr show eth0 | awk '/inet / {print \$2}' | cut -d/ -f1 | head -n 1)${CL}\"" >>"$PROFILE_FILE"
+
+  # Configure SSH if enabled
+  if [[ "${SSH_ROOT}" == "yes" ]]; then
+    # Enable sshd service
+    $STD rc-update add sshd
+    # Allow root login via SSH
+    sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config
+    # Start the sshd service
+    $STD /etc/init.d/sshd start
+  fi
 }

 # Validate Timezone for some LXC's
 validate_tz() {
-	[[ -f "/usr/share/zoneinfo/$1" ]]
+  [[ -f "/usr/share/zoneinfo/$1" ]]
 }

 # This function customizes the container and enables passwordless login for the root user
 customize() {
-	if [[ "$PASSWORD" == "" ]]; then
-		msg_info "Customizing Container"
-		passwd -d root >/dev/null 2>&1
+  if [[ "$PASSWORD" == "" ]]; then
+    msg_info "Customizing Container"
+    passwd -d root >/dev/null 2>&1

-		# Ensure agetty is available
-		apk add --no-cache --force-broken-world util-linux >/dev/null 2>&1
+    # Ensure agetty is available
+    apk add --no-cache --force-broken-world util-linux >/dev/null 2>&1

-		# Create persistent autologin boot script
-		mkdir -p /etc/local.d
-		cat <<'EOF' >/etc/local.d/autologin.start
+    # Create persistent autologin boot script
+    mkdir -p /etc/local.d
+    cat <<'EOF' >/etc/local.d/autologin.start
 #!/bin/sh
 sed -i 's|^tty1::respawn:.*|tty1::respawn:/sbin/agetty --autologin root --noclear tty1 38400 linux|' /etc/inittab
 kill -HUP 1
 EOF
-		touch /root/.hushlogin
+    touch /root/.hushlogin

-		chmod +x /etc/local.d/autologin.start
-		rc-update add local >/dev/null 2>&1
+    chmod +x /etc/local.d/autologin.start
+    rc-update add local >/dev/null 2>&1

-		# Apply autologin immediately for current session
-		/etc/local.d/autologin.start
+    # Apply autologin immediately for current session
+    /etc/local.d/autologin.start

-		msg_ok "Customized Container"
-	fi
+    msg_ok "Customized Container"
+  fi

-	echo "bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/${app}.sh)\"" >/usr/bin/update
-	chmod +x /usr/bin/update
-	post_progress_to_api
-}
+  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/scripts/core/alpine-tools.func
+++ b/scripts/core/alpine-tools.func
@@ -1,515 +0,0 @@
-#!/bin/ash
-# shellcheck shell=ash
-
-# Expects existing msg_* functions and optional $STD from the framework.
-
-# ------------------------------
-# helpers
-# ------------------------------
-lower() { printf '%s' "$1" | tr '[:upper:]' '[:lower:]'; }
-has() { command -v "$1" >/dev/null 2>&1; }
-
-need_tool() {
-	# usage: need_tool curl jq unzip ...
-	# setup missing tools via apk
-	local missing=0 t
-	for t in "$@"; do
-		if ! has "$t"; then missing=1; fi
-	done
-	if [ "$missing" -eq 1 ]; then
-		msg_info "Installing tools: $*"
-		apk add --no-cache "$@" >/dev/null 2>&1 || {
-			msg_error "apk add failed for: $*"
-			return 100
-		}
-		msg_ok "Tools ready: $*"
-	fi
-}
-
-net_resolves() {
-	# better handling for missing getent on Alpine
-	# usage: net_resolves api.github.com
-	local host="$1"
-	ping -c1 -W1 "$host" >/dev/null 2>&1 || nslookup "$host" >/dev/null 2>&1
-}
-
-ensure_usr_local_bin_persist() {
-	# Login shells: /etc/profile.d/
-	local PROFILE_FILE="/etc/profile.d/10-localbin.sh"
-	if [ ! -f "$PROFILE_FILE" ]; then
-		echo 'case ":$PATH:" in *:/usr/local/bin:*) ;; *) export PATH="/usr/local/bin:$PATH";; esac' >"$PROFILE_FILE"
-		chmod +x "$PROFILE_FILE"
-	fi
-
-	# Non-login shells (pct enter): /root/.profile and /root/.bashrc
-	for rc_file in /root/.profile /root/.bashrc; do
-		if [ -f "$rc_file" ] && ! grep -q '/usr/local/bin' "$rc_file"; then
-			echo 'export PATH="/usr/local/bin:$PATH"' >>"$rc_file"
-		fi
-	done
-}
-
-download_with_progress() {
-	# $1 url, $2 dest
-	local url="$1" out="$2" cl
-	need_tool curl pv || return 127
-	cl=$(curl -fsSLI "$url" 2>/dev/null | awk 'tolower($0) ~ /^content-length:/ {print $2}' | tr -d '\r')
-	if [ -n "$cl" ]; then
-		curl -fsSL "$url" | pv -s "$cl" >"$out" || {
-			msg_error "Download failed: $url"
-			return 250
-		}
-	else
-		curl -fL# -o "$out" "$url" || {
-			msg_error "Download failed: $url"
-			return 250
-		}
-	fi
-}
-
-# ------------------------------
-# GitHub: check Release
-# ------------------------------
-check_for_gh_release() {
-	# app, repo, [pinned]
-	local app="$1" source="$2" pinned="${3:-}"
-	local app_lc
-	app_lc="$(lower "$app" | tr -d ' ')"
-	local current_file="$HOME/.${app_lc}"
-	local current="" release tag
-
-	msg_info "Check for update: $app"
-
-	net_resolves api.github.com || {
-		msg_error "DNS/network error: api.github.com"
-		return 6
-	}
-	need_tool curl jq || return 127
-
-	tag=$(curl -fsSL "https://api.github.com/repos/${source}/releases/latest" | jq -r '.tag_name // empty')
-	[ -z "$tag" ] && {
-		msg_error "Unable to fetch latest tag for $app"
-		return 22
-	}
-	release="${tag#v}"
-
-	[ -f "$current_file" ] && current="$(cat "$current_file")"
-
-	if [ -n "$pinned" ]; then
-		if [ "$pinned" = "$release" ]; then
-			msg_ok "$app pinned to v$pinned (no update)"
-			return 1
-		fi
-		if [ "$current" = "$pinned" ]; then
-			msg_ok "$app pinned v$pinned installed (upstream v$release)"
-			return 1
-		fi
-		msg_info "$app pinned v$pinned (upstream v$release) → update/downgrade"
-		CHECK_UPDATE_RELEASE="$pinned"
-		return 0
-	fi
-
-	if [ "$release" != "$current" ] || [ ! -f "$current_file" ]; then
-		CHECK_UPDATE_RELEASE="$release"
-		msg_info "New release available: v$release (current: v${current:-none})"
-		return 0
-	fi
-
-	msg_ok "$app is up to date (v$release)"
-	return 1
-}
-
-# ------------------------------
-# GitHub: get Release  & deploy (Alpine)
-# modes: tarball | prebuild | singlefile
-# ------------------------------
-fetch_and_deploy_gh() {
-	# $1 app, $2 repo, [$3 mode], [$4 version], [$5 target], [$6 asset_pattern
-	local app="$1" repo="$2" mode="${3:-tarball}" version="${4:-latest}" target="${5:-/opt/$1}" pattern="${6:-}"
-	local app_lc
-	app_lc="$(lower "$app" | tr -d ' ')"
-	local vfile="$HOME/.${app_lc}"
-	local json url filename tmpd unpack
-
-	net_resolves api.github.com || {
-		msg_error "DNS/network error"
-		return 6
-	}
-	need_tool curl jq tar || return 127
-	[ "$mode" = "prebuild" ] || [ "$mode" = "singlefile" ] && need_tool unzip >/dev/null 2>&1 || true
-
-	tmpd="$(mktemp -d)" || return 252
-	mkdir -p "$target"
-
-	# Release JSON
-	if [ "$version" = "latest" ]; then
-		json="$(curl -fsSL "https://api.github.com/repos/$repo/releases/latest")" || {
-			msg_error "GitHub API failed"
-			rm -rf "$tmpd"
-			return 22
-		}
-	else
-		json="$(curl -fsSL "https://api.github.com/repos/$repo/releases/tags/$version")" || {
-			msg_error "GitHub API failed"
-			rm -rf "$tmpd"
-			return 22
-		}
-	fi
-
-	# correct Version
-	version="$(printf '%s' "$json" | jq -r '.tag_name // empty')"
-	version="${version#v}"
-
-	[ -z "$version" ] && {
-		msg_error "No tag in release json"
-		rm -rf "$tmpd"
-		return 65
-	}
-
-	case "$mode" in
-	tarball | source)
-		url="$(printf '%s' "$json" | jq -r '.tarball_url // empty')"
-		[ -z "$url" ] && url="https://github.com/$repo/archive/refs/tags/v$version.tar.gz"
-		filename="${app_lc}-${version}.tar.gz"
-		download_with_progress "$url" "$tmpd/$filename" || {
-			rm -rf "$tmpd"
-			return 250
-		}
-		tar -xzf "$tmpd/$filename" -C "$tmpd" || {
-			msg_error "tar extract failed"
-			rm -rf "$tmpd"
-			return 251
-		}
-		unpack="$(find "$tmpd" -mindepth 1 -maxdepth 1 -type d | head -n1)"
-		# copy content of unpack to target
-		(cd "$unpack" && tar -cf - .) | (cd "$target" && tar -xf -) || {
-			msg_error "copy failed"
-			rm -rf "$tmpd"
-			return 252
-		}
-		;;
-	prebuild)
-		[ -n "$pattern" ] || {
-			msg_error "prebuild requires asset pattern"
-			rm -rf "$tmpd"
-			return 65
-		}
-		url="$(printf '%s' "$json" | jq -r '.assets[].browser_download_url' | awk -v p="$pattern" '
-        BEGIN{IGNORECASE=1}
-        $0 ~ p {print; exit}
-      ')"
-		[ -z "$url" ] && {
-			msg_error "asset not found for pattern: $pattern"
-			rm -rf "$tmpd"
-			return 250
-		}
-		filename="${url##*/}"
-		download_with_progress "$url" "$tmpd/$filename" || {
-			rm -rf "$tmpd"
-			return 250
-		}
-		# unpack archive (Zip or tarball)
-		case "$filename" in
-		*.zip)
-			need_tool unzip || {
-				rm -rf "$tmpd"
-				return 127
-			}
-			mkdir -p "$tmpd/unp"
-			unzip -q "$tmpd/$filename" -d "$tmpd/unp"
-			;;
-		*.tar.gz | *.tgz | *.tar.xz | *.tar.zst | *.tar.bz2)
-			mkdir -p "$tmpd/unp"
-			tar -xf "$tmpd/$filename" -C "$tmpd/unp"
-			;;
-		*)
-			msg_error "unsupported archive: $filename"
-			rm -rf "$tmpd"
-			return 251
-			;;
-		esac
-		# top-level folder strippen
-		if [ "$(find "$tmpd/unp" -mindepth 1 -maxdepth 1 -type d | wc -l)" -eq 1 ] && [ -z "$(find "$tmpd/unp" -mindepth 1 -maxdepth 1 -type f | head -n1)" ]; then
-			unpack="$(find "$tmpd/unp" -mindepth 1 -maxdepth 1 -type d)"
-			(cd "$unpack" && tar -cf - .) | (cd "$target" && tar -xf -) || {
-				msg_error "copy failed"
-				rm -rf "$tmpd"
-				return 252
-			}
-		else
-			(cd "$tmpd/unp" && tar -cf - .) | (cd "$target" && tar -xf -) || {
-				msg_error "copy failed"
-				rm -rf "$tmpd"
-				return 252
-			}
-		fi
-		;;
-	singlefile)
-		[ -n "$pattern" ] || {
-			msg_error "singlefile requires asset pattern"
-			rm -rf "$tmpd"
-			return 65
-		}
-		url="$(printf '%s' "$json" | jq -r '.assets[].browser_download_url' | awk -v p="$pattern" '
-        BEGIN{IGNORECASE=1}
-        $0 ~ p {print; exit}
-      ')"
-		[ -z "$url" ] && {
-			msg_error "asset not found for pattern: $pattern"
-			rm -rf "$tmpd"
-			return 250
-		}
-		filename="${url##*/}"
-		download_with_progress "$url" "$target/$app" || {
-			rm -rf "$tmpd"
-			return 250
-		}
-		chmod +x "$target/$app"
-		;;
-	*)
-		msg_error "Unknown mode: $mode"
-		rm -rf "$tmpd"
-		return 65
-		;;
-	esac
-
-	echo "$version" >"$vfile"
-	ensure_usr_local_bin_persist
-	rm -rf "$tmpd"
-	msg_ok "Deployed $app ($version) → $target"
-}
-
-# ------------------------------
-# yq (mikefarah) – Alpine
-# ------------------------------
-setup_yq() {
-	# prefer apk, unless FORCE_GH=1
-	if [ "${FORCE_GH:-0}" != "1" ] && apk info -e yq >/dev/null 2>&1; then
-		msg_info "Updating yq via apk"
-		apk add --no-cache --upgrade yq >/dev/null 2>&1 || true
-		msg_ok "yq ready ($(yq --version 2>/dev/null))"
-		return 0
-	fi
-
-	need_tool curl || return 127
-	local arch bin url tmp
-	case "$(uname -m)" in
-	x86_64) arch="amd64" ;;
-	aarch64) arch="arm64" ;;
-	*)
-		msg_error "Unsupported arch for yq: $(uname -m)"
-		return 238
-		;;
-	esac
-	url="https://github.com/mikefarah/yq/releases/latest/download/yq_linux_${arch}"
-	tmp="$(mktemp)"
-	download_with_progress "$url" "$tmp" || return 250
-	/usr/bin/install -m 0755 "$tmp" /usr/local/bin/yq
-	rm -f "$tmp"
-	msg_ok "Setup yq ($(yq --version 2>/dev/null))"
-}
-
-# ------------------------------
-# Adminer – Alpine
-# ------------------------------
-setup_adminer() {
-	need_tool curl || return 127
-	msg_info "Setup Adminer (Alpine)"
-	mkdir -p /var/www/localhost/htdocs/adminer
-	curl -fsSL https://github.com/vrana/adminer/releases/latest/download/adminer.php \
-		-o /var/www/localhost/htdocs/adminer/index.php || {
-		msg_error "Adminer download failed"
-		return 250
-	}
-	msg_ok "Adminer at /adminer (served by your webserver)"
-}
-
-# ------------------------------
-# uv – Alpine (musl tarball)
-# optional: PYTHON_VERSION="3.12"
-# ------------------------------
-setup_uv() {
-	need_tool curl tar || return 127
-	local UV_BIN="/usr/local/bin/uv"
-	local arch tarball url tmpd ver installed
-
-	case "$(uname -m)" in
-	x86_64) arch="x86_64-unknown-linux-musl" ;;
-	aarch64) arch="aarch64-unknown-linux-musl" ;;
-	*)
-		msg_error "Unsupported arch for uv: $(uname -m)"
-		return 238
-		;;
-	esac
-
-	ver="$(curl -fsSL https://api.github.com/repos/astral-sh/uv/releases/latest | jq -r '.tag_name' 2>/dev/null)"
-	ver="${ver#v}"
-	[ -z "$ver" ] && {
-		msg_error "uv: cannot determine latest version"
-		return 250
-	}
-
-	if has "$UV_BIN"; then
-		installed="$($UV_BIN -V 2>/dev/null | awk '{print $2}')"
-		[ "$installed" = "$ver" ] && {
-			msg_ok "uv $ver already installed"
-			return 0
-		}
-		msg_info "Updating uv $installed → $ver"
-	else
-		msg_info "Setup uv $ver"
-	fi
-
-	tmpd="$(mktemp -d)" || return 252
-	tarball="uv-${arch}.tar.gz"
-	url="https://github.com/astral-sh/uv/releases/download/v${ver}/${tarball}"
-
-	download_with_progress "$url" "$tmpd/uv.tar.gz" || {
-		rm -rf "$tmpd"
-		return 250
-	}
-	tar -xzf "$tmpd/uv.tar.gz" -C "$tmpd" || {
-		msg_error "uv: extract failed"
-		rm -rf "$tmpd"
-		return 251
-	}
-
-	# tar contains ./uv
-	if [ -x "$tmpd/uv" ]; then
-		/usr/bin/install -m 0755 "$tmpd/uv" "$UV_BIN"
-	else
-		# fallback: in subfolder
-		/usr/bin/install -m 0755 "$tmpd"/*/uv "$UV_BIN" 2>/dev/null || {
-			msg_error "uv binary not found in tar"
-			rm -rf "$tmpd"
-			return 252
-		}
-	fi
-	rm -rf "$tmpd"
-	ensure_usr_local_bin_persist
-	msg_ok "Setup uv $ver"
-
-	if [ -n "${PYTHON_VERSION:-}" ]; then
-		local match
-		match="$(uv python list --only-downloads 2>/dev/null | awk -v maj="$PYTHON_VERSION" '
-      $0 ~ "^cpython-"maj"\\." { print $0 }' | awk -F- '{print $2}' | sort -V | tail -n1)"
-		[ -z "$match" ] && {
-			msg_error "No matching Python for $PYTHON_VERSION"
-			return 250
-		}
-		if ! uv python list | grep -q "cpython-${match}-linux"; then
-			msg_info "Installing Python $match via uv"
-			uv python install "$match" || {
-				msg_error "uv python install failed"
-				return 150
-			}
-			msg_ok "Python $match installed (uv)"
-		fi
-	fi
-}
-
-# ------------------------------
-# Java – Alpine (OpenJDK)
-# JAVA_VERSION: 17|21 (Default 21)
-# ------------------------------
-setup_java() {
-	local JAVA_VERSION="${JAVA_VERSION:-21}" pkg
-	case "$JAVA_VERSION" in
-	17) pkg="openjdk17-jdk" ;;
-	21 | *) pkg="openjdk21-jdk" ;;
-	esac
-	msg_info "Setup Java (OpenJDK $JAVA_VERSION)"
-	apk add --no-cache "$pkg" >/dev/null 2>&1 || {
-		msg_error "apk add $pkg failed"
-		return 100
-	}
-	# set JAVA_HOME
-	local prof="/etc/profile.d/20-java.sh"
-	if [ ! -f "$prof" ]; then
-		echo 'export JAVA_HOME=$(dirname $(dirname $(readlink -f $(command -v java))))' >"$prof"
-		echo 'case ":$PATH:" in *:$JAVA_HOME/bin:*) ;; *) export PATH="$JAVA_HOME/bin:$PATH";; esac' >>"$prof"
-		chmod +x "$prof"
-	fi
-	msg_ok "Java ready: $(java -version 2>&1 | head -n1)"
-}
-
-# ------------------------------
-# Go – Alpine (apk prefers, else tarball)
-# ------------------------------
-setup_go() {
-	if [ -z "${GO_VERSION:-}" ]; then
-		msg_info "Setup Go (apk)"
-		apk add --no-cache go >/dev/null 2>&1 || {
-			msg_error "apk add go failed"
-			return 100
-		}
-		msg_ok "Go ready: $(go version 2>/dev/null)"
-		return 0
-	fi
-
-	need_tool curl tar || return 127
-	local ARCH TARBALL URL TMP
-	case "$(uname -m)" in
-	x86_64) ARCH="amd64" ;;
-	aarch64) ARCH="arm64" ;;
-	*)
-		msg_error "Unsupported arch for Go: $(uname -m)"
-		return 238
-		;;
-	esac
-	TARBALL="go${GO_VERSION}.linux-${ARCH}.tar.gz"
-	URL="https://go.dev/dl/${TARBALL}"
-	msg_info "Setup Go $GO_VERSION (tarball)"
-	TMP="$(mktemp)"
-	download_with_progress "$URL" "$TMP" || return 250
-	rm -rf /usr/local/go
-	tar -C /usr/local -xzf "$TMP" || {
-		msg_error "extract go failed"
-		rm -f "$TMP"
-		return 251
-	}
-	rm -f "$TMP"
-	ln -sf /usr/local/go/bin/go /usr/local/bin/go
-	ln -sf /usr/local/go/bin/gofmt /usr/local/bin/gofmt
-	ensure_usr_local_bin_persist
-	msg_ok "Go ready: $(go version 2>/dev/null)"
-}
-
-# ------------------------------
-# Composer – Alpine
-# uses php83-cli + openssl + phar
-# ------------------------------
-setup_composer() {
-	local COMPOSER_BIN="/usr/local/bin/composer"
-	if ! has php; then
-		# prefers php83
-		msg_info "Installing PHP CLI for Composer"
-		apk add --no-cache php83-cli php83-openssl php83-phar php83-iconv >/dev/null 2>&1 || {
-			# Fallback to generic php if 83 not available
-			apk add --no-cache php-cli php-openssl php-phar php-iconv >/dev/null 2>&1 || {
-				msg_error "Failed to install php-cli for composer"
-				return 100
-			}
-		}
-		msg_ok "PHP CLI ready: $(php -v | head -n1)"
-	fi
-
-	if [ -x "$COMPOSER_BIN" ]; then
-		msg_info "Updating Composer"
-	else
-		msg_info "Setup Composer"
-	fi
-
-	need_tool curl || return 127
-	curl -fsSL https://getcomposer.org/installer -o /tmp/composer-setup.php || {
-		msg_error "composer installer download failed"
-		return 250
-	}
-	php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer >/dev/null 2>&1 || {
-		msg_error "composer install failed"
-		return 150
-	}
-	rm -f /tmp/composer-setup.php
-	ensure_usr_local_bin_persist
-	msg_ok "Composer ready: $(composer --version 2>/dev/null)"
-}
--- a/scripts/core/api.func
+++ b/scripts/core/api.func
--- a/scripts/core/build.func
+++ b/scripts/core/build.func
--- a/scripts/core/cloud-init.func
+++ b/scripts/core/cloud-init.func
@@ -1,708 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: community-scripts ORG
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/branch/main/LICENSE
-# Revision: 1
-
-# ==============================================================================
-# CLOUD-INIT.FUNC - VM CLOUD-INIT CONFIGURATION LIBRARY
-# ==============================================================================
-#
-# Universal helper library for Cloud-Init configuration in Proxmox VMs.
-# Provides functions for:
-#
-#   - Native Proxmox Cloud-Init setup (user, password, network, SSH keys)
-#   - Interactive configuration dialogs (whiptail)
-#   - IP address retrieval via qemu-guest-agent
-#   - Cloud-Init status monitoring and waiting
-#
-# Usage:
-#   source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/cloud-init.func)
-#   setup_cloud_init "$VMID" "$STORAGE" "$HN" "yes"
-#
-# Compatible with: Debian, Ubuntu, and all Cloud-Init enabled distributions
-# ==============================================================================
-
-# ==============================================================================
-# SECTION 1: CONFIGURATION DEFAULTS
-# ==============================================================================
-# These can be overridden before sourcing this library
-
-# Disable 'unbound variable' errors for this library (restored at end)
-_OLD_SET_STATE=$(set +o | grep -E 'set -(e|u|o)')
-set +u
-
-CLOUDINIT_DEFAULT_USER="${CLOUDINIT_DEFAULT_USER:-root}"
-CLOUDINIT_DNS_SERVERS="${CLOUDINIT_DNS_SERVERS:-1.1.1.1 8.8.8.8}"
-CLOUDINIT_SEARCH_DOMAIN="${CLOUDINIT_SEARCH_DOMAIN:-local}"
-CLOUDINIT_SSH_KEYS="${CLOUDINIT_SSH_KEYS:-}" # Empty by default - user must explicitly provide keys
-
-# ==============================================================================
-# SECTION 2: SSH KEY DISCOVERY AND SELECTION
-# ==============================================================================
-
-# ------------------------------------------------------------------------------
-# _ci_ssh_extract_keys_from_file - Extracts valid SSH public keys from a file
-# ------------------------------------------------------------------------------
-function _ci_ssh_extract_keys_from_file() {
-	local file="$1"
-	[[ -f "$file" && -r "$file" ]] || return 0
-	grep -E '^(ssh-(rsa|ed25519|dss|ecdsa)|ecdsa-sha2-)' "$file" 2>/dev/null || true
-}
-
-# ------------------------------------------------------------------------------
-# _ci_ssh_discover_files - Scans standard paths for SSH keys
-# ------------------------------------------------------------------------------
-function _ci_ssh_discover_files() {
-	local -a cand=()
-	shopt -s nullglob
-	cand+=(/root/.ssh/authorized_keys /root/.ssh/authorized_keys2)
-	cand+=(/root/.ssh/*.pub)
-	cand+=(/etc/ssh/authorized_keys /etc/ssh/authorized_keys.d/*)
-	shopt -u nullglob
-	printf '%s\0' "${cand[@]}"
-}
-
-# ------------------------------------------------------------------------------
-# _ci_ssh_build_choices - Builds whiptail checklist from SSH key files
-#
-# Sets: CI_SSH_CHOICES (array), CI_SSH_COUNT (int), CI_SSH_MAPFILE (path)
-# ------------------------------------------------------------------------------
-function _ci_ssh_build_choices() {
-	local -a files=("$@")
-	CI_SSH_CHOICES=()
-	CI_SSH_COUNT=0
-	CI_SSH_MAPFILE="$(mktemp)"
-	local id key typ fp cmt base
-
-	for f in "${files[@]}"; do
-		[[ -f "$f" && -r "$f" ]] || continue
-		base="$(basename -- "$f")"
-		# Skip known_hosts and private keys
-		case "$base" in
-		known_hosts | known_hosts.* | config) continue ;;
-		id_*) [[ "$f" != *.pub ]] && continue ;;
-		esac
-
-		while IFS= read -r key; do
-			[[ -n "$key" ]] || continue
-
-			typ=""
-			fp=""
-			cmt=""
-			read -r _typ _b64 _cmt <<<"$key"
-			typ="${_typ:-key}"
-			cmt="${_cmt:-}"
-
-			# Get fingerprint via ssh-keygen if available
-			if command -v ssh-keygen >/dev/null 2>&1; then
-				fp="$(printf '%s\n' "$key" | ssh-keygen -lf - 2>/dev/null | awk '{print $2}')"
-			fi
-
-			# Shorten long comments
-			[[ ${#cmt} -gt 40 ]] && cmt="${cmt:0:37}..."
-
-			CI_SSH_COUNT=$((CI_SSH_COUNT + 1))
-			id="K${CI_SSH_COUNT}"
-			echo "${id}|${key}" >>"$CI_SSH_MAPFILE"
-			CI_SSH_CHOICES+=("$id" "[$typ] ${fp:+$fp }${cmt:+$cmt }— ${base}" "OFF")
-		done < <(_ci_ssh_extract_keys_from_file "$f")
-	done
-}
-
-# ------------------------------------------------------------------------------
-# configure_cloudinit_ssh_keys - Interactive SSH key selection for Cloud-Init
-#
-# Usage: configure_cloudinit_ssh_keys
-# Sets: CLOUDINIT_SSH_KEYS (path to temporary file with selected keys)
-# ------------------------------------------------------------------------------
-function configure_cloudinit_ssh_keys() {
-	local backtitle="Proxmox VE Helper Scripts"
-	local ssh_key_mode
-
-	# Create temp file for selected keys
-	CLOUDINIT_SSH_KEYS_TEMP="$(mktemp)"
-	: >"$CLOUDINIT_SSH_KEYS_TEMP"
-
-	# Discover keys and build choices
-	IFS=$'\0' read -r -d '' -a _def_files < <(_ci_ssh_discover_files && printf '\0')
-	_ci_ssh_build_choices "${_def_files[@]}"
-	local default_key_count="$CI_SSH_COUNT"
-
-	if [[ "$default_key_count" -gt 0 ]]; then
-		ssh_key_mode=$(whiptail --backtitle "$backtitle" --title "SSH KEY SOURCE" --menu \
-			"Provision SSH keys for Cloud-Init VM:" 14 72 4 \
-			"found" "Select from detected keys (${default_key_count})" \
-			"manual" "Paste a single public key" \
-			"folder" "Scan another folder (path or glob)" \
-			"none" "No SSH keys (password auth only)" 3>&1 1>&2 2>&3) || return 1
-	else
-		ssh_key_mode=$(whiptail --backtitle "$backtitle" --title "SSH KEY SOURCE" --menu \
-			"No host keys detected. Choose:" 12 72 3 \
-			"manual" "Paste a single public key" \
-			"folder" "Scan another folder (path or glob)" \
-			"none" "No SSH keys (password auth only)" 3>&1 1>&2 2>&3) || return 1
-	fi
-
-	case "$ssh_key_mode" in
-	found)
-		# Show checklist with individual keys
-		local selection
-		selection=$(whiptail --backtitle "$backtitle" --title "SELECT SSH KEYS" \
-			--checklist "Select one or more keys to import:" 20 140 10 "${CI_SSH_CHOICES[@]}" 3>&1 1>&2 2>&3) || return 1
-
-		for tag in $selection; do
-			tag="${tag%\"}"
-			tag="${tag#\"}"
-			local line
-			line=$(grep -E "^${tag}\|" "$CI_SSH_MAPFILE" | head -n1 | cut -d'|' -f2-)
-			[[ -n "$line" ]] && printf '%s\n' "$line" >>"$CLOUDINIT_SSH_KEYS_TEMP"
-		done
-		local imported
-		imported=$(wc -l <"$CLOUDINIT_SSH_KEYS_TEMP")
-		echo -e "${ROOTSSH:-  🔑  }${BOLD}${DGN}SSH Keys: ${BGN}${imported} key(s) selected${CL}"
-		;;
-	manual)
-		local pubkey
-		pubkey=$(whiptail --backtitle "$backtitle" --title "PASTE SSH PUBLIC KEY" \
-			--inputbox "Paste your SSH public key (ssh-rsa, ssh-ed25519, etc.):" 10 76 3>&1 1>&2 2>&3) || return 1
-		if [[ -n "$pubkey" ]]; then
-			echo "$pubkey" >"$CLOUDINIT_SSH_KEYS_TEMP"
-			echo -e "${ROOTSSH:-  🔑  }${BOLD}${DGN}SSH Keys: ${BGN}1 key added manually${CL}"
-		else
-			echo -e "${ROOTSSH:-  🔑  }${BOLD}${DGN}SSH Keys: ${BGN}none (empty input)${CL}"
-			CLOUDINIT_SSH_KEYS=""
-			rm -f "$CLOUDINIT_SSH_KEYS_TEMP" "$CI_SSH_MAPFILE" 2>/dev/null
-			return 0
-		fi
-		;;
-	folder)
-		local glob_path
-		glob_path=$(whiptail --backtitle "$backtitle" --title "SCAN FOLDER/GLOB" \
-			--inputbox "Enter a folder or glob to scan (e.g. /root/.ssh/*.pub):" 10 72 3>&1 1>&2 2>&3) || return 1
-		if [[ -n "$glob_path" ]]; then
-			shopt -s nullglob
-			local -a _scan_files=($glob_path)
-			shopt -u nullglob
-			if [[ "${#_scan_files[@]}" -gt 0 ]]; then
-				_ci_ssh_build_choices "${_scan_files[@]}"
-				if [[ "$CI_SSH_COUNT" -gt 0 ]]; then
-					local folder_selection
-					folder_selection=$(whiptail --backtitle "$backtitle" --title "SELECT FOLDER KEYS" \
-						--checklist "Select key(s) to import:" 20 140 10 "${CI_SSH_CHOICES[@]}" 3>&1 1>&2 2>&3) || return 1
-					for tag in $folder_selection; do
-						tag="${tag%\"}"
-						tag="${tag#\"}"
-						local line
-						line=$(grep -E "^${tag}\|" "$CI_SSH_MAPFILE" | head -n1 | cut -d'|' -f2-)
-						[[ -n "$line" ]] && printf '%s\n' "$line" >>"$CLOUDINIT_SSH_KEYS_TEMP"
-					done
-					local imported
-					imported=$(wc -l <"$CLOUDINIT_SSH_KEYS_TEMP")
-					echo -e "${ROOTSSH:-  🔑  }${BOLD}${DGN}SSH Keys: ${BGN}${imported} key(s) from folder${CL}"
-				else
-					whiptail --backtitle "$backtitle" --msgbox "No keys found in: $glob_path" 8 60
-				fi
-			else
-				whiptail --backtitle "$backtitle" --msgbox "Path/glob returned no files." 8 60
-			fi
-		fi
-		;;
-	none | *)
-		echo -e "${ROOTSSH:-  🔑  }${BOLD}${DGN}SSH Keys: ${BGN}none (password auth only)${CL}"
-		CLOUDINIT_SSH_KEYS=""
-		rm -f "$CLOUDINIT_SSH_KEYS_TEMP" "$CI_SSH_MAPFILE" 2>/dev/null
-		return 0
-		;;
-	esac
-
-	# Cleanup mapfile
-	rm -f "$CI_SSH_MAPFILE" 2>/dev/null
-
-	# Set the variable for setup_cloud_init to use
-	if [[ -s "$CLOUDINIT_SSH_KEYS_TEMP" ]]; then
-		CLOUDINIT_SSH_KEYS="$CLOUDINIT_SSH_KEYS_TEMP"
-	else
-		CLOUDINIT_SSH_KEYS=""
-		rm -f "$CLOUDINIT_SSH_KEYS_TEMP"
-	fi
-
-	return 0
-}
-
-# ==============================================================================
-# SECTION 3: HELPER FUNCTIONS
-# ==============================================================================
-
-# ------------------------------------------------------------------------------
-# _ci_msg - Internal message helper with fallback
-# ------------------------------------------------------------------------------
-function _ci_msg_info() { msg_info "$1" 2>/dev/null || echo "[INFO] $1"; }
-function _ci_msg_ok() { msg_ok "$1" 2>/dev/null || echo "[OK] $1"; }
-function _ci_msg_warn() { msg_warn "$1" 2>/dev/null || echo "[WARN] $1"; }
-function _ci_msg_error() { msg_error "$1" 2>/dev/null || echo "[ERROR] $1"; }
-
-# ------------------------------------------------------------------------------
-# validate_ip_cidr - Validate IP address in CIDR format
-# Usage: validate_ip_cidr "192.168.1.100/24" && echo "Valid"
-# Returns: 0 if valid, 1 if invalid
-# ------------------------------------------------------------------------------
-function validate_ip_cidr() {
-	local ip_cidr="$1"
-	# Match: 0-255.0-255.0-255.0-255/0-32
-	if [[ "$ip_cidr" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}/([0-9]|[1-2][0-9]|3[0-2])$ ]]; then
-		# Validate each octet is 0-255
-		local ip="${ip_cidr%/*}"
-		IFS='.' read -ra octets <<<"$ip"
-		for octet in "${octets[@]}"; do
-			((octet > 255)) && return 1
-		done
-		return 0
-	fi
-	return 1
-}
-
-# ------------------------------------------------------------------------------
-# validate_ip - Validate plain IP address (no CIDR)
-# Usage: validate_ip "192.168.1.1" && echo "Valid"
-# ------------------------------------------------------------------------------
-function validate_ip() {
-	local ip="$1"
-	if [[ "$ip" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; then
-		IFS='.' read -ra octets <<<"$ip"
-		for octet in "${octets[@]}"; do
-			((octet > 255)) && return 1
-		done
-		return 0
-	fi
-	return 1
-}
-
-# ==============================================================================
-# SECTION 3: MAIN CLOUD-INIT FUNCTIONS
-# ==============================================================================
-
-# ------------------------------------------------------------------------------
-# setup_cloud_init - Configures Proxmox Native Cloud-Init
-# ------------------------------------------------------------------------------
-# Parameters:
-#   $1 - VMID (required)
-#   $2 - Storage name (required)
-#   $3 - Hostname (optional, default: vm-<vmid>)
-#   $4 - Enable Cloud-Init (yes/no, default: no)
-#   $5 - User (optional, default: root)
-#   $6 - Network mode (dhcp/static, default: dhcp)
-#   $7 - Static IP (optional, format: 192.168.1.100/24)
-#   $8 - Gateway (optional)
-#   $9 - Nameservers (optional, default: 1.1.1.1 8.8.8.8)
-#
-# Returns: 0 on success, 1 on failure
-# Exports: CLOUDINIT_USER, CLOUDINIT_PASSWORD, CLOUDINIT_CRED_FILE
-# ==============================================================================
-function setup_cloud_init() {
-	local vmid="$1"
-	local storage="$2"
-	local hostname="${3:-vm-${vmid}}"
-	local enable="${4:-no}"
-	local ciuser="${5:-$CLOUDINIT_DEFAULT_USER}"
-	local network_mode="${6:-dhcp}"
-	local static_ip="${7:-}"
-	local gateway="${8:-}"
-	local nameservers="${9:-$CLOUDINIT_DNS_SERVERS}"
-
-	# Skip if not enabled
-	if [ "$enable" != "yes" ]; then
-		return 0
-	fi
-
-	# Validate static IP if provided
-	if [ "$network_mode" = "static" ]; then
-		if [ -n "$static_ip" ] && ! validate_ip_cidr "$static_ip"; then
-			_ci_msg_error "Invalid static IP format: $static_ip (expected: x.x.x.x/xx)"
-			return 65
-		fi
-		if [ -n "$gateway" ] && ! validate_ip "$gateway"; then
-			_ci_msg_error "Invalid gateway IP format: $gateway"
-			return 65
-		fi
-	fi
-
-	_ci_msg_info "Configuring Cloud-Init"
-
-	# Create Cloud-Init drive (try ide2 first, then scsi1 as fallback)
-	if ! qm set "$vmid" --ide2 "${storage}:cloudinit" >/dev/null 2>&1; then
-		qm set "$vmid" --scsi1 "${storage}:cloudinit" >/dev/null 2>&1
-	fi
-
-	# Set user
-	qm set "$vmid" --ciuser "$ciuser" >/dev/null
-
-	# Generate and set secure random password
-	local cipassword=$(openssl rand -base64 16)
-	qm set "$vmid" --cipassword "$cipassword" >/dev/null
-
-	# Add SSH keys only if explicitly provided (not auto-imported from host)
-	if [ -n "${CLOUDINIT_SSH_KEYS:-}" ] && [ -f "$CLOUDINIT_SSH_KEYS" ]; then
-		qm set "$vmid" --sshkeys "$CLOUDINIT_SSH_KEYS" >/dev/null 2>&1 || true
-		_ci_msg_info "SSH keys imported from: $CLOUDINIT_SSH_KEYS"
-	fi
-
-	# Configure network
-	if [ "$network_mode" = "static" ] && [ -n "$static_ip" ] && [ -n "$gateway" ]; then
-		qm set "$vmid" --ipconfig0 "ip=${static_ip},gw=${gateway}" >/dev/null
-	else
-		qm set "$vmid" --ipconfig0 "ip=dhcp" >/dev/null
-	fi
-
-	# Set DNS servers
-	qm set "$vmid" --nameserver "$nameservers" >/dev/null
-
-	# Set search domain
-	qm set "$vmid" --searchdomain "$CLOUDINIT_SEARCH_DOMAIN" >/dev/null
-
-	# Enable package upgrades on first boot (if supported by Proxmox version)
-	qm set "$vmid" --ciupgrade 1 >/dev/null 2>&1 || true
-
-	# Save credentials to file (with restrictive permissions)
-	local cred_file="/tmp/${hostname}-${vmid}-cloud-init-credentials.txt"
-	umask 077
-	cat >"$cred_file" <<EOF
-╔══════════════════════════════════════════════════════════════════╗
-║  ⚠️  SECURITY WARNING: DELETE THIS FILE AFTER NOTING CREDENTIALS  ║
-╚══════════════════════════════════════════════════════════════════╝
-
-Cloud-Init Credentials
-────────────────────────────────────────
-VM ID:    ${vmid}
-Hostname: ${hostname}
-Created:  $(date)
-
-Username: ${ciuser}
-Password: ${cipassword}
-
-Network:  ${network_mode}$([ "$network_mode" = "static" ] && echo " (IP: ${static_ip}, GW: ${gateway})" || echo " (DHCP)")
-DNS:      ${nameservers}
-
-────────────────────────────────────────
-SSH Access (if keys configured):
-  ssh ${ciuser}@<vm-ip>
-
-Proxmox UI Configuration:
-  VM ${vmid} > Cloud-Init > Edit
-  - User, Password, SSH Keys
-  - Network (IP Config)
-  - DNS, Search Domain
-
-────────────────────────────────────────
-🗑️  To delete this file:
-  rm -f ${cred_file}
-────────────────────────────────────────
-EOF
-	chmod 600 "$cred_file"
-
-	_ci_msg_ok "Cloud-Init configured (User: ${ciuser})"
-
-	# Export for use in calling script (DO NOT display password here - will be shown in summary)
-	export CLOUDINIT_USER="$ciuser"
-	export CLOUDINIT_PASSWORD="$cipassword"
-	export CLOUDINIT_CRED_FILE="$cred_file"
-
-	return 0
-}
-
-# ==============================================================================
-# SECTION 4: INTERACTIVE CONFIGURATION
-# ==============================================================================
-
-# ------------------------------------------------------------------------------
-# configure_cloud_init_interactive - Whiptail dialog for Cloud-Init setup
-# ------------------------------------------------------------------------------
-# Prompts user for Cloud-Init configuration choices
-# Returns configuration via exported variables:
-#   - CLOUDINIT_ENABLE (yes/no)
-#   - CLOUDINIT_USER
-#   - CLOUDINIT_NETWORK_MODE (dhcp/static)
-#   - CLOUDINIT_IP (if static)
-#   - CLOUDINIT_GW (if static)
-#   - CLOUDINIT_DNS
-# ------------------------------------------------------------------------------
-function configure_cloud_init_interactive() {
-	local default_user="${1:-root}"
-
-	# Check if whiptail is available
-	if ! command -v whiptail >/dev/null 2>&1; then
-		echo "Warning: whiptail not available, skipping interactive configuration"
-		export CLOUDINIT_ENABLE="no"
-		return 127
-	fi
-
-	# Ask if user wants to enable Cloud-Init
-	if ! (whiptail --backtitle "Proxmox VE Helper Scripts" --title "CLOUD-INIT" \
-		--yesno "Enable Cloud-Init for VM configuration?\n\nCloud-Init allows automatic configuration of:\n• User accounts and passwords\n• SSH keys\n• Network settings (DHCP/Static)\n• DNS configuration\n\nYou can also configure these settings later in Proxmox UI." 16 68); then
-		export CLOUDINIT_ENABLE="no"
-		return 0
-	fi
-
-	export CLOUDINIT_ENABLE="yes"
-
-	# Username
-	if CLOUDINIT_USER=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox \
-		"Cloud-Init Username" 8 58 "$default_user" --title "USERNAME" 3>&1 1>&2 2>&3); then
-		export CLOUDINIT_USER="${CLOUDINIT_USER:-$default_user}"
-	else
-		export CLOUDINIT_USER="$default_user"
-	fi
-
-	# Network configuration
-	if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "NETWORK MODE" \
-		--yesno "Use DHCP for network configuration?\n\nSelect 'No' for static IP configuration." 10 58); then
-		export CLOUDINIT_NETWORK_MODE="dhcp"
-	else
-		export CLOUDINIT_NETWORK_MODE="static"
-
-		# Static IP with validation
-		while true; do
-			if CLOUDINIT_IP=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox \
-				"Static IP Address (CIDR format)\nExample: 192.168.1.100/24" 9 58 "" --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
-				if validate_ip_cidr "$CLOUDINIT_IP"; then
-					export CLOUDINIT_IP
-					break
-				else
-					whiptail --backtitle "Proxmox VE Helper Scripts" --title "INVALID IP" \
-						--msgbox "Invalid IP format: $CLOUDINIT_IP\n\nPlease use CIDR format: x.x.x.x/xx\nExample: 192.168.1.100/24" 10 50
-				fi
-			else
-				_ci_msg_warn "Static IP required, falling back to DHCP"
-				export CLOUDINIT_NETWORK_MODE="dhcp"
-				break
-			fi
-		done
-
-		# Gateway with validation
-		if [ "$CLOUDINIT_NETWORK_MODE" = "static" ]; then
-			while true; do
-				if CLOUDINIT_GW=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox \
-					"Gateway IP Address\nExample: 192.168.1.1" 8 58 "" --title "GATEWAY" 3>&1 1>&2 2>&3); then
-					if validate_ip "$CLOUDINIT_GW"; then
-						export CLOUDINIT_GW
-						break
-					else
-						whiptail --backtitle "Proxmox VE Helper Scripts" --title "INVALID GATEWAY" \
-							--msgbox "Invalid gateway format: $CLOUDINIT_GW\n\nPlease use format: x.x.x.x\nExample: 192.168.1.1" 10 50
-					fi
-				else
-					_ci_msg_warn "Gateway required, falling back to DHCP"
-					export CLOUDINIT_NETWORK_MODE="dhcp"
-					break
-				fi
-			done
-		fi
-	fi
-
-	# DNS Servers
-	if CLOUDINIT_DNS=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox \
-		"DNS Servers (space-separated)" 8 58 "1.1.1.1 8.8.8.8" --title "DNS SERVERS" 3>&1 1>&2 2>&3); then
-		export CLOUDINIT_DNS="${CLOUDINIT_DNS:-1.1.1.1 8.8.8.8}"
-	else
-		export CLOUDINIT_DNS="1.1.1.1 8.8.8.8"
-	fi
-
-	return 0
-}
-
-# ==============================================================================
-# SECTION 5: UTILITY FUNCTIONS
-# ==============================================================================
-
-# ------------------------------------------------------------------------------
-# display_cloud_init_info - Show Cloud-Init summary after setup
-# ------------------------------------------------------------------------------
-function display_cloud_init_info() {
-	local vmid="$1"
-	local hostname="${2:-}"
-
-	if [ -n "$CLOUDINIT_CRED_FILE" ] && [ -f "$CLOUDINIT_CRED_FILE" ]; then
-		if [ -n "${INFO:-}" ]; then
-			echo -e "\n${INFO}${BOLD:-}${GN:-} Cloud-Init Configuration:${CL:-}"
-			echo -e "${TAB:-  }${DGN:-}User: ${BGN:-}${CLOUDINIT_USER:-root}${CL:-}"
-			echo -e "${TAB:-  }${DGN:-}Password: ${BGN:-}${CLOUDINIT_PASSWORD}${CL:-}"
-			echo -e "${TAB:-  }${DGN:-}Credentials: ${BL:-}${CLOUDINIT_CRED_FILE}${CL:-}"
-			echo -e "${TAB:-  }${RD:-}⚠️  Delete credentials file after noting password!${CL:-}"
-			echo -e "${TAB:-  }${YW:-}💡 Configure in Proxmox UI: VM ${vmid} > Cloud-Init${CL:-}"
-		else
-			echo ""
-			echo "[INFO] Cloud-Init Configuration:"
-			echo "  User: ${CLOUDINIT_USER:-root}"
-			echo "  Password: ${CLOUDINIT_PASSWORD}"
-			echo "  Credentials: ${CLOUDINIT_CRED_FILE}"
-			echo "  ⚠️  Delete credentials file after noting password!"
-			echo "  Configure in Proxmox UI: VM ${vmid} > Cloud-Init"
-		fi
-	fi
-}
-
-# ------------------------------------------------------------------------------
-# cleanup_cloud_init_credentials - Remove credentials file
-# ------------------------------------------------------------------------------
-# Usage: cleanup_cloud_init_credentials
-# Call this after user has noted/saved the credentials
-# ------------------------------------------------------------------------------
-function cleanup_cloud_init_credentials() {
-	if [ -n "$CLOUDINIT_CRED_FILE" ] && [ -f "$CLOUDINIT_CRED_FILE" ]; then
-		rm -f "$CLOUDINIT_CRED_FILE"
-		_ci_msg_ok "Credentials file removed: $CLOUDINIT_CRED_FILE"
-		unset CLOUDINIT_CRED_FILE
-		return 0
-	fi
-	return 1
-}
-
-# ------------------------------------------------------------------------------
-# has_cloud_init - Check if VM has Cloud-Init configured
-# ------------------------------------------------------------------------------
-function has_cloud_init() {
-	local vmid="$1"
-	qm config "$vmid" 2>/dev/null | grep -qE "(ide2|scsi1):.*cloudinit"
-}
-
-# ------------------------------------------------------------------------------
-# regenerate_cloud_init - Regenerate Cloud-Init configuration
-# ------------------------------------------------------------------------------
-function regenerate_cloud_init() {
-	local vmid="$1"
-
-	if has_cloud_init "$vmid"; then
-		_ci_msg_info "Regenerating Cloud-Init configuration"
-		qm cloudinit update "$vmid" >/dev/null 2>&1 || true
-		_ci_msg_ok "Cloud-Init configuration regenerated"
-		return 0
-	else
-		_ci_msg_warn "VM $vmid does not have Cloud-Init configured"
-		return 1
-	fi
-}
-
-# ------------------------------------------------------------------------------
-# get_vm_ip - Get VM IP address via qemu-guest-agent
-# ------------------------------------------------------------------------------
-function get_vm_ip() {
-	local vmid="$1"
-	local timeout="${2:-30}"
-
-	local elapsed=0
-	while [ $elapsed -lt $timeout ]; do
-		local vm_ip=$(qm guest cmd "$vmid" network-get-interfaces 2>/dev/null |
-			jq -r '.[] | select(.name != "lo") | ."ip-addresses"[]? | select(."ip-address-type" == "ipv4") | ."ip-address"' 2>/dev/null | head -1)
-
-		if [ -n "$vm_ip" ]; then
-			echo "$vm_ip"
-			return 0
-		fi
-
-		sleep 2
-		elapsed=$((elapsed + 2))
-	done
-
-	return 7
-}
-
-# ------------------------------------------------------------------------------
-# wait_for_cloud_init - Wait for Cloud-Init to complete (requires SSH access)
-# ------------------------------------------------------------------------------
-function wait_for_cloud_init() {
-	local vmid="$1"
-	local timeout="${2:-300}"
-	local vm_ip="${3:-}"
-
-	# Get IP if not provided
-	if [ -z "$vm_ip" ]; then
-		vm_ip=$(get_vm_ip "$vmid" 60)
-	fi
-
-	if [ -z "$vm_ip" ]; then
-		_ci_msg_warn "Unable to determine VM IP address"
-		return 7
-	fi
-
-	_ci_msg_info "Waiting for Cloud-Init to complete on ${vm_ip}"
-
-	local elapsed=0
-	while [ $elapsed -lt $timeout ]; do
-		if timeout 10 ssh -o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
-			"${CLOUDINIT_USER:-root}@${vm_ip}" "cloud-init status --wait" 2>/dev/null; then
-			_ci_msg_ok "Cloud-Init completed successfully"
-			return 0
-		fi
-		sleep 10
-		elapsed=$((elapsed + 10))
-	done
-
-	_ci_msg_warn "Cloud-Init did not complete within ${timeout}s"
-	return 150
-}
-
-# ==============================================================================
-# SECTION 6: EXPORTS
-# ==============================================================================
-# Export all functions for use in other scripts
-
-export -f setup_cloud_init 2>/dev/null || true
-export -f configure_cloud_init_interactive 2>/dev/null || true
-export -f display_cloud_init_info 2>/dev/null || true
-export -f cleanup_cloud_init_credentials 2>/dev/null || true
-export -f has_cloud_init 2>/dev/null || true
-export -f regenerate_cloud_init 2>/dev/null || true
-export -f get_vm_ip 2>/dev/null || true
-export -f wait_for_cloud_init 2>/dev/null || true
-export -f validate_ip_cidr 2>/dev/null || true
-export -f validate_ip 2>/dev/null || true
-
-# Restore previous shell options if they were saved
-if [ -n "${_OLD_SET_STATE:-}" ]; then
-	eval "$_OLD_SET_STATE"
-fi
-
-# ==============================================================================
-# SECTION 7: EXAMPLES & DOCUMENTATION
-# ==============================================================================
-: <<'EXAMPLES'
-
-# Example 1: Simple DHCP setup (most common)
-setup_cloud_init "$VMID" "$STORAGE" "$HN" "yes"
-
-# Example 2: Static IP setup
-setup_cloud_init "$VMID" "$STORAGE" "myserver" "yes" "root" "static" "192.168.1.100/24" "192.168.1.1"
-
-# Example 3: Interactive configuration in advanced_settings()
-configure_cloud_init_interactive "admin"
-if [ "$CLOUDINIT_ENABLE" = "yes" ]; then
-  setup_cloud_init "$VMID" "$STORAGE" "$HN" "yes" "$CLOUDINIT_USER" \
-    "$CLOUDINIT_NETWORK_MODE" "$CLOUDINIT_IP" "$CLOUDINIT_GW" "$CLOUDINIT_DNS"
-fi
-
-# Example 4: Display info after VM creation
-display_cloud_init_info "$VMID" "$HN"
-
-# Example 5: Check if VM has Cloud-Init
-if has_cloud_init "$VMID"; then
-    echo "Cloud-Init is configured"
-fi
-
-# Example 6: Wait for Cloud-Init to complete after VM start
-if [ "$START_VM" = "yes" ]; then
-    qm start "$VMID"
-    sleep 30
-    wait_for_cloud_init "$VMID" 300
-fi
-
-# Example 7: Cleanup credentials file after user has noted password
-display_cloud_init_info "$VMID" "$HN"
-read -p "Have you saved the credentials? (y/N): " -r
-[[ $REPLY =~ ^[Yy]$ ]] && cleanup_cloud_init_credentials
-
-# Example 8: Validate IP before using
-if validate_ip_cidr "192.168.1.100/24"; then
-  echo "Valid IP/CIDR"
-fi
-
-EXAMPLES
--- a/scripts/core/config-file.func
+++ b/scripts/core/config-file.func
@@ -0,0 +1,699 @@
+config_file() {
+  CONFIG_FILE="/opt/community-scripts/.settings"
+
+  if [[ -f "/opt/community-scripts/${NSAPP}.conf" ]]; then
+    CONFIG_FILE="/opt/community-scripts/${NSAPP}.conf"
+  fi
+
+  if CONFIG_FILE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set absolute path to config file" 8 58 "$CONFIG_FILE" --title "CONFIG FILE" 3>&1 1>&2 2>&3); then
+    if [[ ! -f "$CONFIG_FILE" ]]; then
+      echo -e "${CROSS}${RD}Config file not found, exiting script!.${CL}"
+      exit
+    else
+      echo -e "${INFO}${BOLD}${DGN}Using config File: ${BGN}$CONFIG_FILE${CL}"
+      source "$CONFIG_FILE"
+    fi
+  fi
+  if [[ -n "${CT_ID-}" ]]; then
+    if [[ "$CT_ID" =~ ^([0-9]{3,4})-([0-9]{3,4})$ ]]; then
+      MIN_ID=${BASH_REMATCH[1]}
+      MAX_ID=${BASH_REMATCH[2]}
+      if ((MIN_ID >= MAX_ID)); then
+        msg_error "Invalid Container ID range. The first number must be smaller than the second number, was ${CT_ID}"
+        exit
+      fi
+
+      LIST_OF_IDS=$(pvesh get /cluster/resources --type vm --output-format json 2>/dev/null | grep -oP '"vmid":\s*\K\d+') || true
+      if [[ -n "$LIST_OF_IDS" ]]; then
+        for ((ID = MIN_ID; ID <= MAX_ID; ID++)); do
+          if ! grep -q "^$ID$" <<<"$LIST_OF_IDS"; then
+            CT_ID=$ID
+            break
+          fi
+        done
+      fi
+      echo -e "${CONTAINERID}${BOLD}${DGN}Container ID: ${BGN}$CT_ID${CL}"
+
+    elif [[ "$CT_ID" =~ ^[0-9]+$ ]]; then
+      LIST_OF_IDS=$(pvesh get /cluster/resources --type vm --output-format json 2>/dev/null | grep -oP '"vmid":\s*\K\d+') || true
+      if [[ -n "$LIST_OF_IDS" ]]; then
+
+        if ! grep -q "^$CT_ID$" <<<"$LIST_OF_IDS"; then
+          echo -e "${CONTAINERID}${BOLD}${DGN}Container ID: ${BGN}$CT_ID${CL}"
+        else
+          msg_error "Container ID $CT_ID already exists"
+          exit
+        fi
+      else
+        echo -e "${CONTAINERID}${BOLD}${DGN}Container ID: ${BGN}$CT_ID${CL}"
+      fi
+    else
+      msg_error "Invalid Container ID format. Needs to be 0000-9999 or 0-9999, was ${CT_ID}"
+      exit
+    fi
+  else
+    if CT_ID=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Container ID" 8 58 "$NEXTID" --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+      if [ -z "$CT_ID" ]; then
+        CT_ID="$NEXTID"
+        echo -e "${CONTAINERID}${BOLD}${DGN}Container ID: ${BGN}$CT_ID${CL}"
+      else
+        echo -e "${CONTAINERID}${BOLD}${DGN}Container ID: ${BGN}$CT_ID${CL}"
+      fi
+    else
+      exit_script
+    fi
+
+  fi
+  if [[ -n "${CT_TYPE-}" ]]; then
+    if [[ "$CT_TYPE" -eq 0 ]]; then
+      CT_TYPE_DESC="Privileged"
+    elif [[ "$CT_TYPE" -eq 1 ]]; then
+      CT_TYPE_DESC="Unprivileged"
+    else
+      msg_error "Unknown setting for CT_TYPE, should be 1 or 0, was ${CT_TYPE}"
+      exit
+    fi
+    echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}"
+  else
+    if CT_TYPE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
+      "1" "Unprivileged" ON \
+      "0" "Privileged" OFF \
+      3>&1 1>&2 2>&3); then
+      if [ -n "$CT_TYPE" ]; then
+        CT_TYPE_DESC="Unprivileged"
+        if [ "$CT_TYPE" -eq 0 ]; then
+          CT_TYPE_DESC="Privileged"
+        fi
+        echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}"
+      fi
+    else
+      exit_script
+    fi
+  fi
+
+  if [[ -n "${PW-}" ]]; then
+    if [[ "$PW" == "none" ]]; then
+      PW=""
+    else
+      if [[ "$PW" == *" "* ]]; then
+        msg_error "Password cannot be empty"
+        exit
+      elif [[ ${#PW} -lt 5 ]]; then
+        msg_error "Password must be at least 5 characters long"
+        exit
+      else
+        echo -e "${VERIFYPW}${BOLD}${DGN}Root Password: ${BGN}********${CL}"
+      fi
+      PW="-password $PW"
+    fi
+  else
+    while true; do
+      if PW1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --passwordbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD (leave blank for automatic login)" 3>&1 1>&2 2>&3); then
+        if [[ -n "$PW1" ]]; then
+          if [[ "$PW1" == *" "* ]]; then
+            whiptail --msgbox "Password cannot contain spaces. Please try again." 8 58
+          elif [ ${#PW1} -lt 5 ]; then
+            whiptail --msgbox "Password must be at least 5 characters long. Please try again." 8 58
+          else
+            if PW2=$(whiptail --backtitle "Proxmox VE Helper Scripts" --passwordbox "\nVerify Root Password" 9 58 --title "PASSWORD VERIFICATION" 3>&1 1>&2 2>&3); then
+              if [[ "$PW1" == "$PW2" ]]; then
+                PW="-password $PW1"
+                echo -e "${VERIFYPW}${BOLD}${DGN}Root Password: ${BGN}********${CL}"
+                break
+              else
+                whiptail --msgbox "Passwords do not match. Please try again." 8 58
+              fi
+            else
+              exit_script
+            fi
+          fi
+        else
+          PW1="Automatic Login"
+          PW=""
+          echo -e "${VERIFYPW}${BOLD}${DGN}Root Password: ${BGN}$PW1${CL}"
+          break
+        fi
+      else
+        exit_script
+      fi
+    done
+  fi
+
+  if [[ -n "${HN-}" ]]; then
+    echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}$HN${CL}"
+  else
+    if CT_NAME=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Hostname" 8 58 "$NSAPP" --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+      if [ -z "$CT_NAME" ]; then
+        HN="$NSAPP"
+      else
+        HN=$(echo "${CT_NAME,,}" | tr -d ' ')
+      fi
+      echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}$HN${CL}"
+    else
+      exit_script
+    fi
+  fi
+
+  if [[ -n "${DISK_SIZE-}" ]]; then
+    if [[ "$DISK_SIZE" =~ ^-?[0-9]+$ ]]; then
+      echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}${DISK_SIZE} GB${CL}"
+    else
+      msg_error "DISK_SIZE must be an integer, was ${DISK_SIZE}"
+      exit
+    fi
+  else
+    if DISK_SIZE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Disk Size in GB" 8 58 "$var_disk" --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+      if [ -z "$DISK_SIZE" ]; then
+        DISK_SIZE="$var_disk"
+        echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}${DISK_SIZE} GB${CL}"
+      else
+        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+          echo -e "{INFO}${HOLD}${RD} DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+          advanced_settings
+        fi
+        echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}${DISK_SIZE} GB${CL}"
+      fi
+    else
+      exit_script
+    fi
+  fi
+
+  if [[ -n "${CORE_COUNT-}" ]]; then
+    if [[ "$CORE_COUNT" =~ ^-?[0-9]+$ ]]; then
+      echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}${CORE_COUNT}${CL}"
+    else
+      msg_error "CORE_COUNT must be an integer, was ${CORE_COUNT}"
+      exit
+    fi
+  else
+    if CORE_COUNT=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Allocate CPU Cores" 8 58 "$var_cpu" --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+      if [ -z "$CORE_COUNT" ]; then
+        CORE_COUNT="$var_cpu"
+        echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}$CORE_COUNT${CL}"
+      else
+        echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}$CORE_COUNT${CL}"
+      fi
+    else
+      exit_script
+    fi
+  fi
+
+  if [[ -n "${RAM_SIZE-}" ]]; then
+    if [[ "$RAM_SIZE" =~ ^-?[0-9]+$ ]]; then
+      echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}${RAM_SIZE} MiB${CL}"
+    else
+      msg_error "RAM_SIZE must be an integer, was ${RAM_SIZE}"
+      exit
+    fi
+  else
+    if RAM_SIZE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Allocate RAM in MiB" 8 58 "$var_ram" --title "RAM" 3>&1 1>&2 2>&3); then
+      if [ -z "$RAM_SIZE" ]; then
+        RAM_SIZE="$var_ram"
+        echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}${RAM_SIZE} MiB${CL}"
+      else
+        echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}${RAM_SIZE} MiB${CL}"
+      fi
+    else
+      exit_script
+    fi
+  fi
+
+  IFACE_FILEPATH_LIST="/etc/network/interfaces"$'\n'$(find "/etc/network/interfaces.d/" -type f)
+  BRIDGES=""
+  OLD_IFS=$IFS
+  IFS=$'\n'
+
+  for iface_filepath in ${IFACE_FILEPATH_LIST}; do
+
+    iface_indexes_tmpfile=$(mktemp -q -u '.iface-XXXX')
+    (grep -Pn '^\s*iface' "${iface_filepath}" | cut -d':' -f1 && wc -l "${iface_filepath}" | cut -d' ' -f1) | awk 'FNR==1 {line=$0; next} {print line":"$0-1; line=$0}' >"${iface_indexes_tmpfile}" || true
+
+    if [ -f "${iface_indexes_tmpfile}" ]; then
+
+      while read -r pair; do
+        start=$(echo "${pair}" | cut -d':' -f1)
+        end=$(echo "${pair}" | cut -d':' -f2)
+        if awk "NR >= ${start} && NR <= ${end}" "${iface_filepath}" | grep -qP '^\s*(bridge[-_](ports|stp|fd|vlan-aware|vids)|ovs_type\s+OVSBridge)\b'; then
+          iface_name=$(sed "${start}q;d" "${iface_filepath}" | awk '{print $2}')
+          BRIDGES="${iface_name}"$'\n'"${BRIDGES}"
+        fi
+
+      done <"${iface_indexes_tmpfile}"
+      rm -f "${iface_indexes_tmpfile}"
+    fi
+
+  done
+  IFS=$OLD_IFS
+  BRIDGES=$(echo "$BRIDGES" | grep -v '^\s*$' | sort | uniq)
+
+  if [[ -n "${BRG-}" ]]; then
+    if echo "$BRIDGES" | grep -q "${BRG}"; then
+      echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}$BRG${CL}"
+    else
+      msg_error "Bridge '${BRG}' does not exist in /etc/network/interfaces or /etc/network/interfaces.d/sdn"
+      exit
+    fi
+  else
+    BRG=$(whiptail --backtitle "Proxmox VE Helper Scripts" --menu "Select network bridge:" 15 40 6 $(echo "$BRIDGES" | awk '{print $0, "Bridge"}') 3>&1 1>&2 2>&3)
+    if [ -z "$BRG" ]; then
+      exit_script
+    else
+      echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}$BRG${CL}"
+    fi
+  fi
+
+  local ip_cidr_regex='^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})/([0-9]{1,2})$'
+  local ip_regex='^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$'
+
+  if [[ -n ${NET-} ]]; then
+    if [ "$NET" == "dhcp" ]; then
+      echo -e "${NETWORK}${BOLD}${DGN}IP Address: ${BGN}DHCP${CL}"
+      echo -e "${GATEWAY}${BOLD}${DGN}Gateway IP Address: ${BGN}Default${CL}"
+      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 [[ "$GATE" =~ $ip_regex ]]; then
+          echo -e "${GATEWAY}${BOLD}${DGN}Gateway IP Address: ${BGN}$GATE${CL}"
+          GATE=",gw=$GATE"
+        else
+          msg_error "Invalid IP Address format for Gateway. Needs to be 0.0.0.0, was ${GATE}"
+          exit
+        fi
+
+      else
+        while true; do
+          GATE1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Enter gateway IP address" 8 58 --title "Gateway IP" 3>&1 1>&2 2>&3)
+          if [ -z "$GATE1" ]; then
+            whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox "Gateway IP address cannot be empty" 8 58
+          elif [[ ! "$GATE1" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; then
+            whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox "Invalid IP address format" 8 58
+          else
+            GATE=",gw=$GATE1"
+            echo -e "${GATEWAY}${BOLD}${DGN}Gateway IP Address: ${BGN}$GATE1${CL}"
+            break
+          fi
+        done
+      fi
+    elif [[ "$NET" == *-* ]]; then
+      IFS="-" read -r ip_start ip_end <<<"$NET"
+
+      if [[ ! "$ip_start" =~ $ip_cidr_regex ]] || [[ ! "$ip_end" =~ $ip_cidr_regex ]]; then
+        msg_error "Invalid IP range format, was $NET should be 0.0.0.0/0-0.0.0.0/0"
+        exit 1
+      fi
+
+      ip1="${ip_start%%/*}"
+      ip2="${ip_end%%/*}"
+      cidr="${ip_start##*/}"
+
+      ip_to_int() {
+        local IFS=.
+        read -r i1 i2 i3 i4 <<<"$1"
+        echo $(((i1 << 24) + (i2 << 16) + (i3 << 8) + i4))
+      }
+
+      int_to_ip() {
+        local ip=$1
+        echo "$(((ip >> 24) & 0xFF)).$(((ip >> 16) & 0xFF)).$(((ip >> 8) & 0xFF)).$((ip & 0xFF))"
+      }
+
+      start_int=$(ip_to_int "$ip1")
+      end_int=$(ip_to_int "$ip2")
+
+      for ((ip_int = start_int; ip_int <= end_int; ip_int++)); do
+        ip=$(int_to_ip $ip_int)
+        msg_info "Checking IP: $ip"
+        if ! ping -c 2 -W 1 "$ip" >/dev/null 2>&1; then
+          NET="$ip/$cidr"
+          msg_ok "Using free IP Address: ${BGN}$NET${CL}"
+          sleep 3
+          break
+        fi
+      done
+      if [[ "$NET" == *-* ]]; then
+        msg_error "No free IP found in range"
+        exit 1
+      fi
+      if [ -n "$GATE" ]; then
+        if [[ "$GATE" =~ $ip_regex ]]; then
+          echo -e "${GATEWAY}${BOLD}${DGN}Gateway IP Address: ${BGN}$GATE${CL}"
+          GATE=",gw=$GATE"
+        else
+          msg_error "Invalid IP Address format for Gateway. Needs to be 0.0.0.0, was ${GATE}"
+          exit
+        fi
+      else
+        while true; do
+          GATE1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Enter gateway IP address" 8 58 --title "Gateway IP" 3>&1 1>&2 2>&3)
+          if [ -z "$GATE1" ]; then
+            whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox "Gateway IP address cannot be empty" 8 58
+          elif [[ ! "$GATE1" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; then
+            whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox "Invalid IP address format" 8 58
+          else
+            GATE=",gw=$GATE1"
+            echo -e "${GATEWAY}${BOLD}${DGN}Gateway IP Address: ${BGN}$GATE1${CL}"
+            break
+          fi
+        done
+      fi
+    else
+      msg_error "Invalid IP Address format. Needs to be 0.0.0.0/0 or a range like 10.0.0.1/24-10.0.0.10/24, was ${NET}"
+      exit
+    fi
+  else
+    while true; do
+      NET=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Static IPv4 CIDR Address (/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3)
+      exit_status=$?
+      if [ $exit_status -eq 0 ]; then
+        if [ "$NET" = "dhcp" ]; then
+          echo -e "${NETWORK}${BOLD}${DGN}IP Address: ${BGN}$NET${CL}"
+          break
+        else
+          if [[ "$NET" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}/([0-9]|[1-2][0-9]|3[0-2])$ ]]; then
+            echo -e "${NETWORK}${BOLD}${DGN}IP Address: ${BGN}$NET${CL}"
+            break
+          else
+            whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox "$NET is an invalid IPv4 CIDR address. Please enter a valid IPv4 CIDR address or 'dhcp'" 8 58
+          fi
+        fi
+      else
+        exit_script
+      fi
+    done
+    if [ "$NET" != "dhcp" ]; then
+      while true; do
+        GATE1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Enter gateway IP address" 8 58 --title "Gateway IP" 3>&1 1>&2 2>&3)
+        if [ -z "$GATE1" ]; then
+          whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox "Gateway IP address cannot be empty" 8 58
+        elif [[ ! "$GATE1" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; then
+          whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox "Invalid IP address format" 8 58
+        else
+          GATE=",gw=$GATE1"
+          echo -e "${GATEWAY}${BOLD}${DGN}Gateway IP Address: ${BGN}$GATE1${CL}"
+          break
+        fi
+      done
+    else
+      GATE=""
+      echo -e "${GATEWAY}${BOLD}${DGN}Gateway IP Address: ${BGN}Default${CL}"
+    fi
+  fi
+
+  if [ "$var_os" == "alpine" ]; then
+    APT_CACHER=""
+    APT_CACHER_IP=""
+  else
+    if [[ -n "${APT_CACHER_IP-}" ]]; then
+      if [[ ! $APT_CACHER_IP == "none" ]]; then
+        APT_CACHER="yes"
+        echo -e "${NETWORK}${BOLD}${DGN}APT-CACHER IP Address: ${BGN}$APT_CACHER_IP${CL}"
+      else
+        APT_CACHER=""
+        echo -e "${NETWORK}${BOLD}${DGN}APT-Cacher IP Address: ${BGN}No${CL}"
+      fi
+    else
+      if APT_CACHER_IP=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set APT-Cacher IP (leave blank for none)" 8 58 --title "APT-Cacher IP" 3>&1 1>&2 2>&3); then
+        APT_CACHER="${APT_CACHER_IP:+yes}"
+        echo -e "${NETWORK}${BOLD}${DGN}APT-Cacher IP Address: ${BGN}${APT_CACHER_IP:-Default}${CL}"
+        if [[ -n $APT_CACHER_IP ]]; then
+          APT_CACHER_IP="none"
+        fi
+      else
+        exit_script
+      fi
+    fi
+  fi
+
+  if [[ -n "${MTU-}" ]]; then
+    if [[ "$MTU" =~ ^-?[0-9]+$ ]]; then
+      echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}$MTU${CL}"
+      MTU=",mtu=$MTU"
+    else
+      msg_error "MTU must be an integer, was ${MTU}"
+      exit
+    fi
+  else
+    if MTU1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Interface MTU Size (leave blank for default [The MTU of your selected vmbr, default is 1500])" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
+      if [ -z "$MTU1" ]; then
+        MTU1="Default"
+        MTU=""
+      else
+        MTU=",mtu=$MTU1"
+      fi
+      echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}$MTU1${CL}"
+    else
+      exit_script
+    fi
+  fi
+
+  if [[ "$IPV6_METHOD" == "static" ]]; then
+    if [[ -n "$IPV6STATIC" ]]; then
+      IP6=",ip6=${IPV6STATIC}"
+      echo -e "${NETWORK}${BOLD}${DGN}IPv6 Address: ${BGN}${IPV6STATIC}${CL}"
+    else
+      msg_error "IPV6_METHOD is set to static but IPV6STATIC is empty"
+      exit
+    fi
+  elif [[ "$IPV6_METHOD" == "auto" ]]; then
+    IP6=",ip6=auto"
+    echo -e "${NETWORK}${BOLD}${DGN}IPv6 Address: ${BGN}auto${CL}"
+  else
+    IP6=""
+    echo -e "${NETWORK}${BOLD}${DGN}IPv6 Address: ${BGN}none${CL}"
+  fi
+
+  if [[ -n "${SD-}" ]]; then
+    if [[ "$SD" == "none" ]]; then
+      SD=""
+      echo -e "${SEARCH}${BOLD}${DGN}DNS Search Domain: ${BGN}Host${CL}"
+    else
+      # Strip prefix if present for config file storage
+      local SD_VALUE="$SD"
+      [[ "$SD" =~ ^-searchdomain= ]] && SD_VALUE="${SD#-searchdomain=}"
+      echo -e "${SEARCH}${BOLD}${DGN}DNS Search Domain: ${BGN}$SD_VALUE${CL}"
+      SD="-searchdomain=$SD_VALUE"
+    fi
+  else
+    if SD=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
+      if [ -z "$SD" ]; then
+        SX=Host
+        SD=""
+      else
+        SX=$SD
+        SD="-searchdomain=$SD"
+      fi
+      echo -e "${SEARCH}${BOLD}${DGN}DNS Search Domain: ${BGN}$SX${CL}"
+    else
+      exit_script
+    fi
+  fi
+
+  if [[ -n "${NS-}" ]]; then
+    if [[ $NS == "none" ]]; then
+      NS=""
+      echo -e "${NETWORK}${BOLD}${DGN}DNS Server IP Address: ${BGN}Host${CL}"
+    else
+      # Strip prefix if present for config file storage
+      local NS_VALUE="$NS"
+      [[ "$NS" =~ ^-nameserver= ]] && NS_VALUE="${NS#-nameserver=}"
+      if [[ "$NS_VALUE" =~ $ip_regex ]]; then
+        echo -e "${NETWORK}${BOLD}${DGN}DNS Server IP Address: ${BGN}$NS_VALUE${CL}"
+        NS="-nameserver=$NS_VALUE"
+      else
+        msg_error "Invalid IP Address format for DNS Server. Needs to be 0.0.0.0, was ${NS_VALUE}"
+        exit
+      fi
+    fi
+  else
+    if NX=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+      if [ -z "$NX" ]; then
+        NX=Host
+        NS=""
+      else
+        NS="-nameserver=$NX"
+      fi
+      echo -e "${NETWORK}${BOLD}${DGN}DNS Server IP Address: ${BGN}$NX${CL}"
+    else
+      exit_script
+    fi
+  fi
+
+  if [[ -n "${MAC-}" ]]; then
+    if [[ "$MAC" == "none" ]]; then
+      MAC=""
+      echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}Host${CL}"
+    else
+      # Strip prefix if present for config file storage
+      local MAC_VALUE="$MAC"
+      [[ "$MAC" =~ ^,hwaddr= ]] && MAC_VALUE="${MAC#,hwaddr=}"
+      if [[ "$MAC_VALUE" =~ ^([A-Fa-f0-9]{2}:){5}[A-Fa-f0-9]{2}$ ]]; then
+        echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}$MAC_VALUE${CL}"
+        MAC=",hwaddr=$MAC_VALUE"
+      else
+        msg_error "MAC Address must be in the format xx:xx:xx:xx:xx:xx, was ${MAC_VALUE}"
+        exit
+      fi
+    fi
+  else
+    if MAC1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a MAC Address(leave blank for generated MAC)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
+      if [ -z "$MAC1" ]; then
+        MAC1="Default"
+        MAC=""
+      else
+        MAC=",hwaddr=$MAC1"
+        echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}$MAC1${CL}"
+      fi
+    else
+      exit_script
+    fi
+  fi
+
+  if [[ -n "${VLAN-}" ]]; then
+    if [[ "$VLAN" == "none" ]]; then
+      VLAN=""
+      echo -e "${VLANTAG}${BOLD}${DGN}Vlan: ${BGN}Host${CL}"
+    else
+      # Strip prefix if present for config file storage
+      local VLAN_VALUE="$VLAN"
+      [[ "$VLAN" =~ ^,tag= ]] && VLAN_VALUE="${VLAN#,tag=}"
+      if [[ "$VLAN_VALUE" =~ ^-?[0-9]+$ ]]; then
+        echo -e "${VLANTAG}${BOLD}${DGN}Vlan: ${BGN}$VLAN_VALUE${CL}"
+        VLAN=",tag=$VLAN_VALUE"
+      else
+        msg_error "VLAN must be an integer, was ${VLAN_VALUE}"
+        exit
+      fi
+    fi
+  else
+    if VLAN1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Vlan(leave blank for no VLAN)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
+      if [ -z "$VLAN1" ]; then
+        VLAN1="Default"
+        VLAN=""
+      else
+        VLAN=",tag=$VLAN1"
+      fi
+      echo -e "${VLANTAG}${BOLD}${DGN}Vlan: ${BGN}$VLAN1${CL}"
+    else
+      exit_script
+    fi
+  fi
+
+  if [[ -n "${TAGS-}" ]]; then
+    if [[ "$TAGS" == *"DEFAULT"* ]]; then
+      TAGS="${TAGS//DEFAULT/}"
+      TAGS="${TAGS//;/}"
+      TAGS="$TAGS;${var_tags:-}"
+      echo -e "${NETWORK}${BOLD}${DGN}Tags: ${BGN}$TAGS${CL}"
+    fi
+  else
+    TAGS="community-scripts;"
+    if ADV_TAGS=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Custom Tags?[If you remove all, there will be no tags!]" 8 58 "${TAGS}" --title "Advanced Tags" 3>&1 1>&2 2>&3); then
+      if [ -n "${ADV_TAGS}" ]; then
+        ADV_TAGS=$(echo "$ADV_TAGS" | tr -d '[:space:]')
+        TAGS="${ADV_TAGS}"
+      else
+        TAGS=";"
+      fi
+      echo -e "${NETWORK}${BOLD}${DGN}Tags: ${BGN}$TAGS${CL}"
+    else
+      exit_script
+    fi
+  fi
+
+  if [[ -n "${SSH-}" ]]; then
+    if [[ "$SSH" == "yes" ]]; then
+      echo -e "${ROOTSSH}${BOLD}${DGN}Root SSH Access: ${BGN}$SSH${CL}"
+      if [[ ! -z "$SSH_AUTHORIZED_KEY" ]]; then
+        echo -e "${ROOTSSH}${BOLD}${DGN}SSH Authorized Key: ${BGN}********************${CL}"
+      else
+        echo -e "${ROOTSSH}${BOLD}${DGN}SSH Authorized Key: ${BGN}None${CL}"
+      fi
+    elif [[ "$SSH" == "no" ]]; then
+      echo -e "${ROOTSSH}${BOLD}${DGN}Root SSH Access: ${BGN}$SSH${CL}"
+    else
+      msg_error "SSH needs to be 'yes' or 'no', was ${SSH}"
+      exit
+    fi
+  else
+    SSH_AUTHORIZED_KEY="$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "SSH Authorized key for root (leave empty for none)" 8 58 --title "SSH Key" 3>&1 1>&2 2>&3)"
+    if [[ -z "${SSH_AUTHORIZED_KEY}" ]]; then
+      SSH_AUTHORIZED_KEY=""
+    fi
+    if [[ "$PW" == -password* || -n "$SSH_AUTHORIZED_KEY" ]]; then
+      if (whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+        SSH="yes"
+      else
+        SSH="no"
+      fi
+      echo -e "${ROOTSSH}${BOLD}${DGN}Root SSH Access: ${BGN}$SSH${CL}"
+    else
+      SSH="no"
+      echo -e "${ROOTSSH}${BOLD}${DGN}Root SSH Access: ${BGN}$SSH${CL}"
+    fi
+  fi
+
+  if [[ -n "$ENABLE_FUSE" ]]; then
+    if [[ "$ENABLE_FUSE" == "yes" ]]; then
+      echo -e "${FUSE}${BOLD}${DGN}Enable FUSE: ${BGN}Yes${CL}"
+    elif [[ "$ENABLE_FUSE" == "no" ]]; then
+      echo -e "${FUSE}${BOLD}${DGN}Enable FUSE: ${BGN}No${CL}"
+    else
+      msg_error "Enable FUSE needs to be 'yes' or 'no', was ${ENABLE_FUSE}"
+      exit
+    fi
+  else
+    if (whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "FUSE" --yesno "Enable FUSE?" 10 58); then
+      ENABLE_FUSE="yes"
+    else
+      ENABLE_FUSE="no"
+    fi
+    echo -e "${FUSE}${BOLD}${DGN}Enable FUSE: ${BGN}$ENABLE_FUSE${CL}"
+  fi
+
+  if [[ -n "$ENABLE_TUN" ]]; then
+    if [[ "$ENABLE_TUN" == "yes" ]]; then
+      echo -e "${FUSE}${BOLD}${DGN}Enable TUN: ${BGN}Yes${CL}"
+    elif [[ "$ENABLE_TUN" == "no" ]]; then
+      echo -e "${FUSE}${BOLD}${DGN}Enable TUN: ${BGN}No${CL}"
+    else
+      msg_error "Enable TUN needs to be 'yes' or 'no', was ${ENABLE_TUN}"
+      exit
+    fi
+  else
+    if (whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "TUN" --yesno "Enable TUN?" 10 58); then
+      ENABLE_TUN="yes"
+    else
+      ENABLE_TUN="no"
+    fi
+    echo -e "${FUSE}${BOLD}${DGN}Enable TUN: ${BGN}$ENABLE_TUN${CL}"
+  fi
+
+  if [[ -n "${VERBOSE-}" ]]; then
+    if [[ "$VERBOSE" == "yes" ]]; then
+      echo -e "${SEARCH}${BOLD}${DGN}Verbose Mode: ${BGN}$VERBOSE${CL}"
+    elif [[ "$VERBOSE" == "no" ]]; then
+      echo -e "${SEARCH}${BOLD}${DGN}Verbose Mode: ${BGN}No${CL}"
+    else
+      msg_error "Verbose Mode needs to be 'yes' or 'no', was ${VERBOSE}"
+      exit
+    fi
+  else
+    if (whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+      VERBOSE="yes"
+    else
+      VERBOSE="no"
+    fi
+    echo -e "${SEARCH}${BOLD}${DGN}Verbose Mode: ${BGN}$VERBOSE${CL}"
+  fi
+
+  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "ADVANCED SETTINGS WITH CONFIG FILE COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
+    echo -e "${CREATING}${BOLD}${RD}Creating a ${APP} LXC using the above settings${CL}"
+  else
+    clear
+    header_info
+    echo -e "${INFO}${HOLD} ${GN}Using Config File on node $PVEHOST_NAME${CL}"
+    config_file
+  fi
+}
--- a/scripts/core/core.func
+++ b/scripts/core/core.func
--- a/scripts/core/create_lxc.sh
+++ b/scripts/core/create_lxc.sh
@@ -0,0 +1,380 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2025 tteck
+# Author: tteck (tteckster)
+# Co-Author: MickLesk
+# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+
+# This sets verbose mode if the global variable is set to "yes"
+# if [ "$VERBOSE" == "yes" ]; then set -x; fi
+
+source "$(dirname "$0")/core.func"
+
+
+# This sets error handling options and defines the error_handler function to handle errors
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+trap on_exit EXIT
+trap on_interrupt INT
+trap on_terminate TERM
+
+function on_exit() {
+  local exit_code="$?"
+  [[ -n "${lockfile:-}" && -e "$lockfile" ]] && rm -f "$lockfile"
+  exit "$exit_code"
+}
+
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  printf "\e[?25h"
+  echo -e "\n${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}\n"
+  exit "$exit_code"
+}
+
+function on_interrupt() {
+  echo -e "\n${RD}Interrupted by user (SIGINT)${CL}"
+  exit 130
+}
+
+function on_terminate() {
+  echo -e "\n${RD}Terminated by signal (SIGTERM)${CL}"
+  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=()
+  while IFS= read -r line; do
+    local STORAGE_NAME
+    STORAGE_NAME=$(awk '{print $1}' <<<"$line")
+    [[ -z "$STORAGE_NAME" ]] && continue
+    VALID_STORAGES+=("$STORAGE_NAME")
+  done < <(pvesm status -content "$CONTENT" 2>/dev/null | awk 'NR>1')
+
+  [[ ${#VALID_STORAGES[@]} -gt 0 ]]
+}
+
+# This function selects a storage pool for a given content type (e.g., rootdir, vztmpl).
+function select_storage() {
+  local CLASS=$1 CONTENT CONTENT_LABEL
+
+  case $CLASS in
+  container)
+    CONTENT='rootdir'
+    CONTENT_LABEL='Container'
+    ;;
+  template)
+    CONTENT='vztmpl'
+    CONTENT_LABEL='Container template'
+    ;;
+  iso)
+    CONTENT='iso'
+    CONTENT_LABEL='ISO image'
+    ;;
+  images)
+    CONTENT='images'
+    CONTENT_LABEL='VM Disk image'
+    ;;
+  backup)
+    CONTENT='backup'
+    CONTENT_LABEL='Backup'
+    ;;
+  snippets)
+    CONTENT='snippets'
+    CONTENT_LABEL='Snippets'
+    ;;
+  *)
+    msg_error "Invalid storage class '$CLASS'"
+    return 1
+    ;;
+  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 STORAGE_MAP
+  local -a MENU
+  local COL_WIDTH=0
+
+  while read -r TAG TYPE _ TOTAL USED FREE _; do
+    [[ -n "$TAG" && -n "$TYPE" ]] || continue
+    local STORAGE_NAME="$TAG"
+    local DISPLAY="${STORAGE_NAME} (${TYPE})"
+    local USED_FMT=$(numfmt --to=iec --from-unit=K --format %.1f <<<"$USED")
+    local FREE_FMT=$(numfmt --to=iec --from-unit=K --format %.1f <<<"$FREE")
+    local INFO="Free: ${FREE_FMT}B  Used: ${USED_FMT}B"
+    STORAGE_MAP["$DISPLAY"]="$STORAGE_NAME"
+    MENU+=("$DISPLAY" "$INFO" "OFF")
+    ((${#DISPLAY} > COL_WIDTH)) && COL_WIDTH=${#DISPLAY}
+  done < <(pvesm status -content "$CONTENT" | awk 'NR>1')
+
+  if [ ${#MENU[@]} -eq 0 ]; then
+    msg_error "No storage found for content type '$CONTENT'."
+    return 2
+  fi
+
+  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" \
+      --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")
+
+    if [[ -z "$DISPLAY_SELECTED" || -z "${STORAGE_MAP[$DISPLAY_SELECTED]+_}" ]]; then
+      whiptail --msgbox "No valid storage selected. Please try again." 8 58
+      continue
+    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
+}
+
+# Test if required variables are set
+[[ "${CTID:-}" ]] || {
+  msg_error "You need to set 'CTID' variable."
+  exit 203
+}
+[[ "${PCT_OSTYPE:-}" ]] || {
+  msg_error "You need to set 'PCT_OSTYPE' variable."
+  exit 204
+}
+
+# Test if ID is valid
+[ "$CTID" -ge "100" ] || {
+  msg_error "ID cannot be less than 100."
+  exit 205
+}
+
+# Test if ID is in use
+if qm status "$CTID" &>/dev/null || pct status "$CTID" &>/dev/null; then
+  echo -e "ID '$CTID' is already in use."
+  unset CTID
+  msg_error "Cannot use ID that is already in use."
+  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_info "Checking template storage"
+while true; do
+  if select_storage template; then
+    TEMPLATE_STORAGE="$STORAGE_RESULT"
+    TEMPLATE_STORAGE_INFO="$STORAGE_INFO"
+    msg_ok "Storage ${BL}$TEMPLATE_STORAGE${CL} ($TEMPLATE_STORAGE_INFO) [Template]"
+    break
+  fi
+done
+
+while true; do
+  if select_storage container; then
+    CONTAINER_STORAGE="$STORAGE_RESULT"
+    CONTAINER_STORAGE_INFO="$STORAGE_INFO"
+    msg_ok "Storage ${BL}$CONTAINER_STORAGE${CL} ($CONTAINER_STORAGE_INFO) [Container]"
+    break
+  fi
+done
+
+# Check free space on selected container storage
+STORAGE_FREE=$(pvesm status | awk -v s="$CONTAINER_STORAGE" '$1 == s { print $6 }')
+REQUIRED_KB=$((${PCT_DISK_SIZE:-8} * 1024 * 1024))
+if [ "$STORAGE_FREE" -lt "$REQUIRED_KB" ]; then
+  msg_error "Not enough space on '$CONTAINER_STORAGE'. Needed: ${PCT_DISK_SIZE:-8}G."
+  exit 214
+fi
+
+# Check Cluster Quorum if in Cluster
+if [ -f /etc/pve/corosync.conf ]; then
+  msg_info "Checking cluster quorum"
+  if ! pvecm status | awk -F':' '/^Quorate/ { exit ($2 ~ /Yes/) ? 0 : 1 }'; then
+
+    msg_error "Cluster is not quorate. Start all nodes or configure quorum device (QDevice)."
+    exit 210
+  fi
+  msg_ok "Cluster is quorate"
+fi
+
+# Update LXC template list
+TEMPLATE_SEARCH="${PCT_OSTYPE}-${PCT_OSVERSION:-}"
+case "$PCT_OSTYPE" in
+debian | ubuntu)
+  TEMPLATE_PATTERN="-standard_"
+  ;;
+alpine | fedora | rocky | centos)
+  TEMPLATE_PATTERN="-default_"
+  ;;
+*)
+  TEMPLATE_PATTERN=""
+  ;;
+esac
+
+# 1. Check local templates first
+msg_info "Searching for template '$TEMPLATE_SEARCH'"
+mapfile -t TEMPLATES < <(
+  pveam list "$TEMPLATE_STORAGE" |
+    awk -v s="$TEMPLATE_SEARCH" -v p="$TEMPLATE_PATTERN" '$1 ~ s && $1 ~ p {print $1}' |
+    sed 's/.*\///' | sort -t - -k 2 -V
+)
+
+if [ ${#TEMPLATES[@]} -gt 0 ]; then
+  TEMPLATE_SOURCE="local"
+else
+  msg_info "No local template found, checking online repository"
+  pveam update >/dev/null 2>&1
+  mapfile -t TEMPLATES < <(
+    pveam update >/dev/null 2>&1 &&
+      pveam available -section system |
+      sed -n "s/.*\($TEMPLATE_SEARCH.*$TEMPLATE_PATTERN.*\)/\1/p" |
+        sort -t - -k 2 -V
+  )
+  TEMPLATE_SOURCE="online"
+fi
+
+TEMPLATE="${TEMPLATES[-1]}"
+TEMPLATE_PATH="$(pvesm path $TEMPLATE_STORAGE:vztmpl/$TEMPLATE 2>/dev/null ||
+  echo "/var/lib/vz/template/cache/$TEMPLATE")"
+msg_ok "Template ${BL}$TEMPLATE${CL} [$TEMPLATE_SOURCE]"
+
+# 4. Validate template (exists & not corrupted)
+TEMPLATE_VALID=1
+
+if [ ! -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
+  msg_warn "Template $TEMPLATE is missing or 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"
+      exit 208
+    fi
+    sleep $((attempt * 5))
+  done
+fi
+
+msg_info "Creating LXC Container"
+# Check and fix subuid/subgid
+grep -q "root:100000:65536" /etc/subuid || echo "root:100000:65536" >>/etc/subuid
+grep -q "root:100000:65536" /etc/subgid || echo "root:100000:65536" >>/etc/subgid
+
+# Combine all options
+PCT_OPTIONS=(${PCT_OPTIONS[@]:-${DEFAULT_PCT_OPTIONS[@]}})
+[[ " ${PCT_OPTIONS[@]} " =~ " -rootfs " ]] || PCT_OPTIONS+=(-rootfs "$CONTAINER_STORAGE:${PCT_DISK_SIZE:-8}")
+
+# Secure creation of the LXC container with lock and template check
+lockfile="/tmp/template.${TEMPLATE}.lock"
+exec 9>"$lockfile" || {
+  msg_error "Failed to create lock file '$lockfile'."
+  exit 200
+}
+flock -w 60 9 || {
+  msg_error "Timeout while waiting for template lock"
+  exit 211
+}
+
+if ! pct create "$CTID" "${TEMPLATE_STORAGE}:vztmpl/${TEMPLATE}" "${PCT_OPTIONS[@]}" &>/dev/null; then
+  msg_error "Container creation failed. Checking if template is corrupted or incomplete."
+
+  if [[ ! -s "$TEMPLATE_PATH" || "$(stat -c%s "$TEMPLATE_PATH")" -lt 1000000 ]]; then
+    msg_error "Template file too small or missing – re-downloading."
+    rm -f "$TEMPLATE_PATH"
+  elif ! zstdcat "$TEMPLATE_PATH" | tar -tf - &>/dev/null; then
+    msg_error "Template appears to be corrupted – re-downloading."
+    rm -f "$TEMPLATE_PATH"
+  else
+    msg_error "Template is valid, but container creation still failed."
+    exit 209
+  fi
+
+  # Retry download
+  for attempt in {1..3}; do
+    msg_info "Attempt $attempt: Re-downloading template..."
+    if timeout 120 pveam download "$TEMPLATE_STORAGE" "$TEMPLATE" >/dev/null; then
+      msg_ok "Template re-download successful."
+      break
+    fi
+    if [ "$attempt" -eq 3 ]; then
+      msg_error "Three failed attempts. Aborting."
+      exit 208
+    fi
+    sleep $((attempt * 5))
+  done
+
+  sleep 1 # I/O-Sync-Delay
+  msg_ok "Re-downloaded LXC Template"
+fi
+
+if ! pct list | awk '{print $1}' | grep -qx "$CTID"; then
+  msg_error "Container ID $CTID not listed in 'pct list' – unexpected failure."
+  exit 215
+fi
+
+if ! grep -q '^rootfs:' "/etc/pve/lxc/$CTID.conf"; then
+  msg_error "RootFS entry missing in container config – storage not correctly assigned."
+  exit 216
+fi
+
+if grep -q '^hostname:' "/etc/pve/lxc/$CTID.conf"; then
+  CT_HOSTNAME=$(grep '^hostname:' "/etc/pve/lxc/$CTID.conf" | awk '{print $2}')
+  if [[ ! "$CT_HOSTNAME" =~ ^[a-z0-9-]+$ ]]; then
+    msg_warn "Hostname '$CT_HOSTNAME' contains invalid characters – may cause issues with networking or DNS."
+  fi
+fi
+
+msg_ok "LXC Container ${BL}$CTID${CL} ${GN}was successfully created."
--- a/scripts/core/error-handler.func
+++ b/scripts/core/error-handler.func
@@ -1,647 +0,0 @@
-#!/usr/bin/env bash
-# ------------------------------------------------------------------------------
-# ERROR HANDLER - ERROR & SIGNAL MANAGEMENT
-# ------------------------------------------------------------------------------
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: MickLesk (CanbiZ)
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# ------------------------------------------------------------------------------
-#
-# Provides comprehensive error handling and signal management for all scripts.
-# Includes:
-#   - Exit code explanations (shell, package managers, databases, custom codes)
-#   - Error handler with detailed logging
-#   - Signal handlers (EXIT, INT, TERM)
-#   - Initialization function for trap setup
-#
-# Usage:
-#   source <(curl -fsSL .../error-handler.func)
-#   catch_errors
-#
-# ------------------------------------------------------------------------------
-
-# ==============================================================================
-# SECTION 1: EXIT CODE EXPLANATIONS
-# ==============================================================================
-
-# ------------------------------------------------------------------------------
-# explain_exit_code()
-#
-# - Canonical version is defined in api.func (sourced before this file)
-# - This section only provides a fallback if api.func was not loaded
-# - See api.func SECTION 1 for the authoritative exit code mappings
-# ------------------------------------------------------------------------------
-if ! declare -f explain_exit_code &>/dev/null; then
-	explain_exit_code() {
-		local code="$1"
-		case "$code" in
-		1) echo "General error / Operation not permitted" ;;
-		2) echo "Misuse of shell builtins (e.g. syntax error)" ;;
-		3) echo "General syntax or argument error" ;;
-		10) echo "Docker / privileged mode required (unsupported environment)" ;;
-		4) echo "curl: Feature not supported or protocol error" ;;
-		5) echo "curl: Could not resolve proxy" ;;
-		6) echo "curl: DNS resolution failed (could not resolve host)" ;;
-		7) echo "curl: Failed to connect (network unreachable / host down)" ;;
-		8) echo "curl: Server reply error (FTP/SFTP or apk untrusted key)" ;;
-		16) echo "curl: HTTP/2 framing layer error" ;;
-		18) echo "curl: Partial file (transfer not completed)" ;;
-		22) echo "curl: HTTP error returned (404, 429, 500+)" ;;
-		23) echo "curl: Write error (disk full or permissions)" ;;
-		24) echo "curl: Write to local file failed" ;;
-		25) echo "curl: Upload failed" ;;
-		26) echo "curl: Read error on local file (I/O)" ;;
-		27) echo "curl: Out of memory (memory allocation failed)" ;;
-		28) echo "curl: Operation timeout (network slow or server not responding)" ;;
-		30) echo "curl: FTP port command failed" ;;
-		32) echo "curl: FTP SIZE command failed" ;;
-		33) echo "curl: HTTP range error" ;;
-		34) echo "curl: HTTP post error" ;;
-		35) echo "curl: SSL/TLS handshake failed (certificate error)" ;;
-		36) echo "curl: FTP bad download resume" ;;
-		39) echo "curl: LDAP search failed" ;;
-		44) echo "curl: Internal error (bad function call order)" ;;
-		45) echo "curl: Interface error (failed to bind to specified interface)" ;;
-		46) echo "curl: Bad password entered" ;;
-		47) echo "curl: Too many redirects" ;;
-		48) echo "curl: Unknown command line option specified" ;;
-		51) echo "curl: SSL peer certificate or SSH host key verification failed" ;;
-		52) echo "curl: Empty reply from server (got nothing)" ;;
-		55) echo "curl: Failed sending network data" ;;
-		56) echo "curl: Receive error (connection reset by peer)" ;;
-		57) echo "curl: Unrecoverable poll/select error (system I/O failure)" ;;
-		59) echo "curl: Couldn't use specified SSL cipher" ;;
-		61) echo "curl: Bad/unrecognized transfer encoding" ;;
-		63) echo "curl: Maximum file size exceeded" ;;
-		75) echo "Temporary failure (retry later)" ;;
-		78) echo "curl: Remote file not found (404 on FTP/file)" ;;
-		79) echo "curl: SSH session error (key exchange/auth failed)" ;;
-		92) echo "curl: HTTP/2 stream error (protocol violation)" ;;
-		95) echo "curl: HTTP/3 layer error" ;;
-		64) echo "Usage error (wrong arguments)" ;;
-		65) echo "Data format error (bad input data)" ;;
-		66) echo "Input file not found (cannot open input)" ;;
-		67) echo "User not found (addressee unknown)" ;;
-		68) echo "Host not found (hostname unknown)" ;;
-		69) echo "Service unavailable" ;;
-		70) echo "Internal software error" ;;
-		71) echo "System error (OS-level failure)" ;;
-		72) echo "Critical OS file missing" ;;
-		73) echo "Cannot create output file" ;;
-		74) echo "I/O error" ;;
-		76) echo "Remote protocol error" ;;
-		77) echo "Permission denied" ;;
-		100) echo "APT: Package manager error (broken packages / dependency problems)" ;;
-		101) echo "APT: Configuration error (bad sources.list, malformed config)" ;;
-		102) echo "APT: Lock held by another process (dpkg/apt still running)" ;;
-
-		# --- Script Validation & Setup (103-123) ---
-		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: 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" ;;
-		110) echo "Proxmox: Failed to apply default.vars" ;;
-		111) echo "Proxmox: App defaults file not available" ;;
-		112) echo "Proxmox: Invalid install menu option" ;;
-		113) echo "LXC: Under-provisioned — user aborted update" ;;
-		114) echo "LXC: Storage too low — user aborted update" ;;
-		115) echo "Download: install.func download failed or incomplete" ;;
-		116) echo "Proxmox: Default bridge vmbr0 not found" ;;
-		117) echo "LXC: Container did not reach running state" ;;
-		118) echo "LXC: No IP assigned to container after timeout" ;;
-		119) echo "Proxmox: No valid storage for rootdir content" ;;
-		120) echo "Proxmox: No valid storage for vztmpl content" ;;
-		121) echo "LXC: Container network not ready (no IP after retries)" ;;
-		122) echo "LXC: No internet connectivity — user declined to continue" ;;
-		123) echo "LXC: Local IP detection failed" ;;
-		124) echo "Command timed out (timeout command)" ;;
-		125) echo "Command failed to start (Docker daemon or execution error)" ;;
-		126) echo "Command invoked cannot execute (permission problem?)" ;;
-		127) echo "Command not found" ;;
-		128) echo "Invalid argument to exit" ;;
-		129) echo "Killed by SIGHUP (terminal closed / hangup)" ;;
-		130) echo "Aborted by user (SIGINT)" ;;
-		131) echo "Killed by SIGQUIT (core dumped)" ;;
-		132) echo "Killed by SIGILL (illegal CPU instruction)" ;;
-		134) echo "Process aborted (SIGABRT - possibly Node.js heap overflow)" ;;
-		137) echo "Killed (SIGKILL / Out of memory?)" ;;
-		139) echo "Segmentation fault (core dumped)" ;;
-		141) echo "Broken pipe (SIGPIPE - output closed prematurely)" ;;
-		143) echo "Terminated (SIGTERM)" ;;
-		144) echo "Killed by signal 16 (SIGUSR1 / SIGSTKFLT)" ;;
-		146) echo "Killed by signal 18 (SIGTSTP)" ;;
-		150) echo "Systemd: Service failed to start" ;;
-		151) echo "Systemd: Service unit not found" ;;
-		152) echo "Permission denied (EACCES)" ;;
-		153) echo "Build/compile failed (make/gcc/cmake)" ;;
-		154) echo "Node.js: Native addon build failed (node-gyp)" ;;
-		160) echo "Python: Virtualenv / uv environment missing or broken" ;;
-		161) echo "Python: Dependency resolution failed" ;;
-		162) echo "Python: Installation aborted (permissions or EXTERNALLY-MANAGED)" ;;
-		170) echo "PostgreSQL: Connection failed (server not running / wrong socket)" ;;
-		171) echo "PostgreSQL: Authentication failed (bad user/password)" ;;
-		172) echo "PostgreSQL: Database does not exist" ;;
-		173) echo "PostgreSQL: Fatal error in query / syntax" ;;
-		180) echo "MySQL/MariaDB: Connection failed (server not running / wrong socket)" ;;
-		181) echo "MySQL/MariaDB: Authentication failed (bad user/password)" ;;
-		182) echo "MySQL/MariaDB: Database does not exist" ;;
-		183) echo "MySQL/MariaDB: Fatal error in query / syntax" ;;
-		190) echo "MongoDB: Connection failed (server not running)" ;;
-		191) echo "MongoDB: Authentication failed (bad user/password)" ;;
-		192) echo "MongoDB: Database not found" ;;
-		193) echo "MongoDB: Fatal query error" ;;
-		200) echo "Proxmox: Failed to create lock file" ;;
-		203) echo "Proxmox: Missing CTID variable" ;;
-		204) echo "Proxmox: Missing PCT_OSTYPE variable" ;;
-		205) echo "Proxmox: Invalid CTID (<100)" ;;
-		206) echo "Proxmox: CTID already in use" ;;
-		207) echo "Proxmox: Password contains unescaped special characters" ;;
-		208) echo "Proxmox: Invalid configuration (DNS/MAC/Network format)" ;;
-		209) echo "Proxmox: Container creation failed" ;;
-		210) echo "Proxmox: Cluster not quorate" ;;
-		211) echo "Proxmox: Timeout waiting for template lock" ;;
-		212) echo "Proxmox: Storage type 'iscsidirect' does not support containers (VMs only)" ;;
-		213) echo "Proxmox: Storage type does not support 'rootdir' content" ;;
-		214) echo "Proxmox: Not enough storage space" ;;
-		215) echo "Proxmox: Container created but not listed (ghost state)" ;;
-		216) echo "Proxmox: RootFS entry missing in config" ;;
-		217) echo "Proxmox: Storage not accessible" ;;
-		218) echo "Proxmox: Template file corrupted or incomplete" ;;
-		219) echo "Proxmox: CephFS does not support containers - use RBD" ;;
-		220) echo "Proxmox: Unable to resolve template path" ;;
-		221) echo "Proxmox: Template file not readable" ;;
-		222) echo "Proxmox: Template download failed" ;;
-		223) echo "Proxmox: Template not available after download" ;;
-		224) echo "Proxmox: PBS storage is for backups only" ;;
-		225) echo "Proxmox: No template available for OS/Version" ;;
-		231) echo "Proxmox: LXC stack upgrade failed" ;;
-
-		# --- Tools & Addon Scripts (232-238) ---
-		232) echo "Tools: Wrong execution environment (run on PVE host, not inside LXC)" ;;
-		233) echo "Tools: Application not installed (update prerequisite missing)" ;;
-		234) echo "Tools: No LXC containers found or available" ;;
-		235) echo "Tools: Backup or restore operation failed" ;;
-		236) echo "Tools: Required hardware not detected" ;;
-		237) echo "Tools: Dependency package installation failed" ;;
-		238) echo "Tools: OS or distribution not supported for this addon" ;;
-
-		239) echo "npm/Node.js: Unexpected runtime error or dependency failure" ;;
-		243) echo "Node.js: Out of memory (JavaScript heap out of memory)" ;;
-		245) echo "Node.js: Invalid command-line option" ;;
-		246) echo "Node.js: Internal JavaScript Parse Error" ;;
-		247) echo "Node.js: Fatal internal error" ;;
-		248) echo "Node.js: Invalid C++ addon / N-API failure" ;;
-		249) echo "npm/pnpm/yarn: Unknown fatal error" ;;
-
-		# --- Application Install/Update Errors (250-254) ---
-		250) echo "App: Download failed or version not determined" ;;
-		251) echo "App: File extraction failed (corrupt or incomplete archive)" ;;
-		252) echo "App: Required file or resource not found" ;;
-		253) echo "App: Data migration required — update aborted" ;;
-		254) echo "App: User declined prompt or input timed out" ;;
-
-		255) echo "DPKG: Fatal internal error" ;;
-		*) echo "Unknown error" ;;
-		esac
-	}
-fi
-
-# ==============================================================================
-# SECTION 2: ERROR HANDLERS
-# ==============================================================================
-
-# ------------------------------------------------------------------------------
-# error_handler()
-#
-# - Main error handler triggered by ERR trap
-# - Arguments: exit_code, command, line_number
-# - Behavior:
-#   * Returns silently if exit_code is 0 (success)
-#   * Sources explain_exit_code() for detailed error description
-#   * Displays error message with:
-#     - Line number where error occurred
-#     - Exit code with explanation
-#     - Command that failed
-#   * Shows last 20 lines of SILENT_LOGFILE if available
-#   * Copies log to container /root for later inspection
-#   * Exits with original exit code
-# ------------------------------------------------------------------------------
-error_handler() {
-	local exit_code=${1:-$?}
-	local command=${2:-${BASH_COMMAND:-unknown}}
-	local line_number=${BASH_LINENO[0]:-unknown}
-
-	command="${command//\$STD/}"
-
-	if [[ "$exit_code" -eq 0 ]]; then
-		return 0
-	fi
-
-	# Stop spinner and restore cursor FIRST — before any output
-	# This prevents spinner text overlapping with error messages
-	if declare -f stop_spinner >/dev/null 2>&1; then
-		stop_spinner 2>/dev/null || true
-	fi
-	printf "\e[?25h"
-
-	local explanation
-	explanation="$(explain_exit_code "$exit_code")"
-
-	# ALWAYS report failure to API immediately - don't wait for container checks
-	# This ensures we capture failures that occur before/after container exists
-	if declare -f post_update_to_api &>/dev/null; then
-		post_update_to_api "failed" "$exit_code" 2>/dev/null || true
-	else
-		# Container context: post_update_to_api not available (api.func not sourced)
-		# Send status directly via curl so container failures are never lost
-		_send_abort_telemetry "$exit_code" 2>/dev/null || true
-	fi
-
-	# Use msg_error if available, fallback to echo
-	if declare -f msg_error >/dev/null 2>&1; then
-		msg_error "in line ${line_number}: exit code ${exit_code} (${explanation}): while executing command ${command}"
-	else
-		echo -e "\n${RD}[ERROR]${CL} in line ${RD}${line_number}${CL}: exit code ${RD}${exit_code}${CL} (${explanation}): while executing command ${YWB}${command}${CL}\n"
-	fi
-
-	if [[ -n "${DEBUG_LOGFILE:-}" ]]; then
-		{
-			echo "------ ERROR ------"
-			echo "Timestamp : $(date '+%Y-%m-%d %H:%M:%S')"
-			echo "Exit Code : $exit_code ($explanation)"
-			echo "Line      : $line_number"
-			echo "Command   : $command"
-			echo "-------------------"
-		} >>"$DEBUG_LOGFILE"
-	fi
-
-	# Get active log file (BUILD_LOG or INSTALL_LOG)
-	local active_log=""
-	if declare -f get_active_logfile >/dev/null 2>&1; then
-		active_log="$(get_active_logfile)"
-	elif [[ -n "${SILENT_LOGFILE:-}" ]]; then
-		active_log="$SILENT_LOGFILE"
-	fi
-
-	# If active_log points to a container-internal path that doesn't exist on host,
-	# fall back to BUILD_LOG (host-side log)
-	if [[ -n "$active_log" && ! -s "$active_log" && -n "${BUILD_LOG:-}" && -s "${BUILD_LOG}" ]]; then
-		active_log="$BUILD_LOG"
-	fi
-
-	# Show last log lines if available
-	if [[ -n "$active_log" && -s "$active_log" ]]; then
-		echo -e "\n${TAB}--- Last 20 lines of log ---"
-		tail -n 20 "$active_log"
-		echo -e "${TAB}-----------------------------------\n"
-	fi
-
-	# Detect context: Container (INSTALL_LOG set + inside container /root) vs Host
-	if [[ -n "${INSTALL_LOG:-}" && -f "${INSTALL_LOG:-}" && -d /root ]]; then
-		# CONTAINER CONTEXT: Copy log and create flag file for host
-		local container_log="/root/.install-${SESSION_ID:-error}.log"
-		cp "${INSTALL_LOG}" "$container_log" 2>/dev/null || true
-
-		# Create error flag file with exit code for host detection
-		echo "$exit_code" >"/root/.install-${SESSION_ID:-error}.failed" 2>/dev/null || true
-		# Log path is shown by host as combined log - no need to show container path
-	else
-		# HOST CONTEXT: Show local log path and offer container cleanup
-		if [[ -n "$active_log" && -s "$active_log" ]]; then
-			if declare -f msg_custom >/dev/null 2>&1; then
-				msg_custom "📋" "${YW}" "Full log: ${active_log}"
-			else
-				echo -e "${YW}Full log:${CL} ${BL}${active_log}${CL}"
-			fi
-		fi
-
-		# Offer to remove container if it exists (build errors after container creation)
-		if [[ -n "${CTID:-}" ]] && command -v pct &>/dev/null && pct status "$CTID" &>/dev/null; then
-			echo ""
-			if declare -f msg_custom >/dev/null 2>&1; then
-				echo -en "${TAB}❓${TAB}${YW}Remove broken container ${CTID}? (Y/n) [auto-remove in 60s]: ${CL}"
-			else
-				echo -en "${YW}Remove broken container ${CTID}? (Y/n) [auto-remove in 60s]: ${CL}"
-			fi
-
-			# Read user response
-			local response=""
-			if read -t 60 -r response; then
-				if [[ -z "$response" || "$response" =~ ^[Yy]$ ]]; then
-					echo ""
-					if declare -f msg_info >/dev/null 2>&1; then
-						msg_info "Removing container ${CTID}"
-					else
-						echo -e "${YW}Removing container ${CTID}${CL}"
-					fi
-					pct stop "$CTID" &>/dev/null || true
-					pct destroy "$CTID" &>/dev/null || true
-					if declare -f msg_ok >/dev/null 2>&1; then
-						msg_ok "Container ${CTID} removed"
-					else
-						echo -e "${GN}✔${CL} Container ${CTID} removed"
-					fi
-				elif [[ "$response" =~ ^[Nn]$ ]]; then
-					echo ""
-					if declare -f msg_warn >/dev/null 2>&1; then
-						msg_warn "Container ${CTID} kept for debugging"
-					else
-						echo -e "${YW}Container ${CTID} kept for debugging${CL}"
-					fi
-				fi
-			else
-				# Timeout - auto-remove
-				echo ""
-				if declare -f msg_info >/dev/null 2>&1; then
-					msg_info "No response - removing container ${CTID}"
-				else
-					echo -e "${YW}No response - removing container ${CTID}${CL}"
-				fi
-				pct stop "$CTID" &>/dev/null || true
-				pct destroy "$CTID" &>/dev/null || true
-				if declare -f msg_ok >/dev/null 2>&1; then
-					msg_ok "Container ${CTID} removed"
-				else
-					echo -e "${GN}✔${CL} Container ${CTID} removed"
-				fi
-			fi
-
-			# Force one final status update attempt after cleanup
-			# This ensures status is updated even if the first attempt failed (e.g., HTTP 400)
-			if declare -f post_update_to_api &>/dev/null; then
-				post_update_to_api "failed" "$exit_code" "force"
-			fi
-		fi
-	fi
-
-	exit "$exit_code"
-}
-
-# ==============================================================================
-# SECTION 3: TELEMETRY & CLEANUP HELPERS FOR SIGNAL HANDLERS
-# ==============================================================================
-
-# ------------------------------------------------------------------------------
-# _send_abort_telemetry()
-#
-# - Sends failure/abort status to telemetry API
-# - Works in BOTH host context (post_update_to_api available) and
-#   container context (only curl available, api.func not sourced)
-# - Container context is critical: without this, container-side failures
-#   and signal exits are never reported, leaving records stuck in
-#   "installing" or "configuring" forever
-# - Arguments: $1 = exit_code
-# ------------------------------------------------------------------------------
-_send_abort_telemetry() {
-	local exit_code="${1:-1}"
-	# Try full API function first (host context - api.func sourced)
-	if declare -f post_update_to_api &>/dev/null; then
-		post_update_to_api "failed" "$exit_code" 2>/dev/null || true
-		return
-	fi
-	# Fallback: direct curl (container context - api.func NOT sourced)
-	# This is the ONLY way containers can report failures to telemetry
-	command -v curl &>/dev/null || return 0
-	[[ "${DIAGNOSTICS:-no}" == "no" ]] && return 0
-	[[ -z "${RANDOM_UUID:-}" ]] && return 0
-
-	# Collect last 200 log lines for error diagnosis (best-effort)
-	# Container context has no get_full_log(), so we gather as much as possible
-	local error_text=""
-	local logfile=""
-	if [[ -n "${INSTALL_LOG:-}" && -s "${INSTALL_LOG}" ]]; then
-		logfile="${INSTALL_LOG}"
-	elif [[ -n "${SILENT_LOGFILE:-}" && -s "${SILENT_LOGFILE}" ]]; then
-		logfile="${SILENT_LOGFILE}"
-	fi
-
-	if [[ -n "$logfile" ]]; then
-		error_text=$(tail -n 200 "$logfile" 2>/dev/null | sed 's/\x1b\[[0-9;]*[a-zA-Z]//g; s/\\/\\\\/g; s/"/\\"/g; s/\r//g' | tr '\n' '|' | sed 's/|$//' | head -c 16384 | tr -d '\000-\010\013\014\016-\037\177') || true
-	fi
-
-	# Prepend exit code explanation header (like build_error_string does on host)
-	local explanation=""
-	if declare -f explain_exit_code &>/dev/null; then
-		explanation=$(explain_exit_code "$exit_code" 2>/dev/null) || true
-	fi
-	if [[ -n "$explanation" && -n "$error_text" ]]; then
-		error_text="exit_code=${exit_code} | ${explanation}|---|${error_text}"
-	elif [[ -n "$explanation" && -z "$error_text" ]]; then
-		error_text="exit_code=${exit_code} | ${explanation}"
-	fi
-
-	# Calculate duration if start time is available
-	local duration=""
-	if [[ -n "${DIAGNOSTICS_START_TIME:-}" ]]; then
-		duration=$(($(date +%s) - DIAGNOSTICS_START_TIME))
-	fi
-
-	# Categorize error if function is available (may not be in minimal container context)
-	local error_category=""
-	if declare -f categorize_error &>/dev/null; then
-		error_category=$(categorize_error "$exit_code" 2>/dev/null) || true
-	fi
-
-	# Build JSON payload with error context
-	local payload
-	payload="{\"random_id\":\"${RANDOM_UUID}\",\"execution_id\":\"${EXECUTION_ID:-${RANDOM_UUID}}\",\"type\":\"${TELEMETRY_TYPE:-lxc}\",\"nsapp\":\"${NSAPP:-${app:-unknown}}\",\"status\":\"failed\",\"exit_code\":${exit_code}"
-	[[ -n "$error_text" ]] && payload="${payload},\"error\":\"${error_text}\""
-	[[ -n "$error_category" ]] && payload="${payload},\"error_category\":\"${error_category}\""
-	[[ -n "$duration" ]] && payload="${payload},\"duration\":${duration}"
-	payload="${payload}}"
-
-	local api_url="${TELEMETRY_URL:-https://telemetry.community-scripts.org/telemetry}"
-
-	# 2 attempts (retry once on failure) — original had no retry
-	local attempt
-	for attempt in 1 2; do
-		if curl -fsS -m 5 -X POST "$api_url" \
-			-H "Content-Type: application/json" \
-			-d "$payload" &>/dev/null; then
-			return 0
-		fi
-		[[ $attempt -eq 1 ]] && sleep 1
-	done
-	return 0
-}
-
-# ------------------------------------------------------------------------------
-# _stop_container_if_installing()
-#
-# - Stops the LXC container if we're in the install phase
-# - Prevents orphaned container processes when the host exits due to a signal
-#   (SSH disconnect, Ctrl+C, SIGTERM) — without this, the container keeps
-#   running and may send "configuring" status AFTER the host already sent
-#   "failed", leaving records permanently stuck in "configuring"
-# - Only acts when:
-#   * CONTAINER_INSTALLING flag is set (during lxc-attach in build_container)
-#   * CTID is set (container was created)
-#   * pct command is available (we're on the Proxmox host, not inside a container)
-# - Does NOT destroy the container — just stops it for potential debugging
-# ------------------------------------------------------------------------------
-_stop_container_if_installing() {
-	[[ "${CONTAINER_INSTALLING:-}" == "true" ]] || return 0
-	[[ -n "${CTID:-}" ]] || return 0
-	command -v pct &>/dev/null || return 0
-	pct stop "$CTID" 2>/dev/null || true
-}
-
-# ==============================================================================
-# SECTION 4: SIGNAL HANDLERS
-# ==============================================================================
-
-# ------------------------------------------------------------------------------
-# on_exit()
-#
-# - EXIT trap handler — runs on EVERY script termination
-# - Catches orphaned "installing"/"configuring" records:
-#   * If post_to_api sent "installing" but post_update_to_api never ran
-#   * Reports final status to prevent records stuck forever
-# - Best-effort log collection for failed installs
-# - Stops orphaned container processes on failure
-# - Cleans up lock files
-# ------------------------------------------------------------------------------
-on_exit() {
-	local exit_code=$?
-
-	# Report orphaned telemetry records
-	# Two scenarios handled:
-	# 1. POST_TO_API_DONE=true but POST_UPDATE_DONE=false: Record was created but
-	#    never got a final status update → send abort/done now.
-	# 2. POST_TO_API_DONE=false but DIAGNOSTICS=yes: Initial post failed (server
-	#    unreachable/timeout), but the server has fallback create-on-update logic,
-	#    so a status update can still create the record. Worth one last try.
-	if [[ "${POST_UPDATE_DONE:-}" != "true" ]]; then
-		if [[ "${POST_TO_API_DONE:-}" == "true" || "${DIAGNOSTICS:-no}" == "yes" ]]; then
-			if [[ $exit_code -ne 0 ]]; then
-				_send_abort_telemetry "$exit_code"
-			elif [[ "${INSTALL_COMPLETE:-}" == "true" ]] && declare -f post_update_to_api >/dev/null 2>&1; then
-				# Only report success if the install was explicitly marked complete.
-				# Without this guard, early bailouts (e.g. user cancelled) with exit 0
-				# would be falsely reported as successful installations.
-				post_update_to_api "done" "0" 2>/dev/null || true
-			fi
-		fi
-	fi
-
-	# Best-effort log collection on failure (non-critical, telemetry already sent)
-	if [[ $exit_code -ne 0 ]] && declare -f ensure_log_on_host >/dev/null 2>&1; then
-		ensure_log_on_host 2>/dev/null || true
-	fi
-
-	# Stop orphaned container if we're in the install phase and exiting with error
-	if [[ $exit_code -ne 0 ]]; then
-		_stop_container_if_installing
-	fi
-
-	[[ -n "${lockfile:-}" && -e "$lockfile" ]] && rm -f "$lockfile"
-	exit "$exit_code"
-}
-
-# ------------------------------------------------------------------------------
-# on_interrupt()
-#
-# - SIGINT (Ctrl+C) trap handler
-# - Reports status FIRST (time-critical: container may be dying)
-# - Stops orphaned container to prevent "configuring" ghost records
-# - Exits with code 130 (128 + SIGINT=2)
-# ------------------------------------------------------------------------------
-on_interrupt() {
-	# Stop spinner and restore cursor before any output
-	if declare -f stop_spinner >/dev/null 2>&1; then
-		stop_spinner 2>/dev/null || true
-	fi
-	printf "\e[?25h" 2>/dev/null || true
-
-	_send_abort_telemetry "130"
-	_stop_container_if_installing
-	if declare -f msg_error >/dev/null 2>&1; then
-		msg_error "Interrupted by user (SIGINT)" 2>/dev/null || true
-	else
-		echo -e "\n${RD}Interrupted by user (SIGINT)${CL}" 2>/dev/null || true
-	fi
-	exit 130
-}
-
-# ------------------------------------------------------------------------------
-# on_terminate()
-#
-# - SIGTERM trap handler
-# - Reports status FIRST (time-critical: process being killed)
-# - Stops orphaned container to prevent "configuring" ghost records
-# - Exits with code 143 (128 + SIGTERM=15)
-# ------------------------------------------------------------------------------
-on_terminate() {
-	# Stop spinner and restore cursor before any output
-	if declare -f stop_spinner >/dev/null 2>&1; then
-		stop_spinner 2>/dev/null || true
-	fi
-	printf "\e[?25h" 2>/dev/null || true
-
-	_send_abort_telemetry "143"
-	_stop_container_if_installing
-	if declare -f msg_error >/dev/null 2>&1; then
-		msg_error "Terminated by signal (SIGTERM)" 2>/dev/null || true
-	else
-		echo -e "\n${RD}Terminated by signal (SIGTERM)${CL}" 2>/dev/null || true
-	fi
-	exit 143
-}
-
-# ------------------------------------------------------------------------------
-# on_hangup()
-#
-# - SIGHUP trap handler (SSH disconnect, terminal closed)
-# - CRITICAL: This was previously MISSING from catch_errors(), causing
-#   container processes to become orphans on SSH disconnect — the #1 cause
-#   of records stuck in "installing" and "configuring" states
-# - Reports status via direct curl (terminal is already closed, no output)
-# - Stops orphaned container to prevent ghost records
-# - Exits with code 129 (128 + SIGHUP=1)
-# ------------------------------------------------------------------------------
-on_hangup() {
-	# Stop spinner (no cursor restore needed — terminal is already gone)
-	if declare -f stop_spinner >/dev/null 2>&1; then
-		stop_spinner 2>/dev/null || true
-	fi
-
-	_send_abort_telemetry "129"
-	_stop_container_if_installing
-	exit 129
-}
-
-# ==============================================================================
-# SECTION 5: INITIALIZATION
-# ==============================================================================
-
-# ------------------------------------------------------------------------------
-# catch_errors()
-#
-# - Initializes error handling and signal traps
-# - Enables strict error handling:
-#   * set -Ee: Exit on error, inherit ERR trap in functions
-#   * set -o pipefail: Pipeline fails if any command fails
-#   * set -u: (optional) Exit on undefined variable (if STRICT_UNSET=1)
-# - Sets up traps:
-#   * ERR  → error_handler (script errors)
-#   * EXIT → on_exit      (any termination — cleanup + orphan detection)
-#   * INT  → on_interrupt  (Ctrl+C)
-#   * TERM → on_terminate  (kill / systemd stop)
-#   * HUP  → on_hangup     (SSH disconnect / terminal closed)
-# - Call this function early in every script
-# ------------------------------------------------------------------------------
-catch_errors() {
-	set -Ee -o pipefail
-	if [ "${STRICT_UNSET:-0}" = "1" ]; then
-		set -u
-	fi
-
-	trap 'error_handler' ERR
-	trap on_exit EXIT
-	trap on_interrupt INT
-	trap on_terminate TERM
-	trap on_hangup HUP
-}
--- a/scripts/core/install.func
+++ b/scripts/core/install.func
@@ -1,396 +1,136 @@
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: tteck (tteckster)
-# Co-Author: MickLesk
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-
-# ==============================================================================
-# INSTALL.FUNC - CONTAINER INSTALLATION & SETUP
-# ==============================================================================
-#
-# This file provides installation functions executed inside LXC containers
-# after creation. Handles:
-#
-#   - Network connectivity verification (IPv4/IPv6)
-#   - OS updates and package installation
-#   - DNS resolution checks
-#   - MOTD and SSH configuration
-#   - Container customization and auto-login
-#
-# Usage:
-#   - Sourced by <app>-install.sh scripts
-#   - Executes via pct exec inside container
-#   - Requires internet connectivity
-#
-# ==============================================================================
-
-# ==============================================================================
-# SECTION 1: INITIALIZATION
-# ==============================================================================
+# Copyright (c) 2021-2025 michelroegl-brunner
+# Author: michelroegl-brunner
+# License: MIT
+# https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE

 if ! command -v curl >/dev/null 2>&1; then
-	printf "\r\e[2K%b" '\033[93m Setup Source \033[m' >&2
-	apt update >/dev/null 2>&1
-	apt install -y curl >/dev/null 2>&1
+  printf "\r\e[2K%b" '\033[93m Setup Source \033[m' >&2
+  apt-get update >/dev/null 2>&1
+  apt-get install -y curl >/dev/null 2>&1
 fi
-source "$(dirname "${BASH_SOURCE[0]}")/core.func"
-source "$(dirname "${BASH_SOURCE[0]}")/error-handler.func"
+# core.func is included in FUNCTIONS_FILE_PATH
 load_functions
-catch_errors
-
-# Persist diagnostics setting inside container (exported from build.func)
-# so addon scripts running later can find the user's choice
-if [[ ! -f /usr/local/community-scripts/diagnostics ]]; then
-	mkdir -p /usr/local/community-scripts
-	echo "DIAGNOSTICS=${DIAGNOSTICS:-no}" >/usr/local/community-scripts/diagnostics
-fi
-
-# Get LXC IP address (must be called INSIDE container, after network is up)
-get_lxc_ip
-
-# ------------------------------------------------------------------------------
-# post_progress_to_api()
-#
-# - Lightweight progress ping from inside the container
-# - Updates the existing telemetry record status
-# - Arguments:
-#   * $1: status (optional, default: "configuring")
-# - Signals that the installation is actively progressing (not stuck)
-# - Fire-and-forget: never blocks or fails the script
-# - Only executes if DIAGNOSTICS=yes and RANDOM_UUID is set
-# ------------------------------------------------------------------------------
-post_progress_to_api() {
-	command -v curl &>/dev/null || return 0
-	[[ "${DIAGNOSTICS:-no}" == "no" ]] && return 0
-	[[ -z "${RANDOM_UUID:-}" ]] && return 0
-
-	local progress_status="${1:-configuring}"
-
-	curl -fsS -m 5 -X POST "https://telemetry.community-scripts.org/telemetry" \
-		-H "Content-Type: application/json" \
-		-d "{\"random_id\":\"${RANDOM_UUID}\",\"execution_id\":\"${EXECUTION_ID:-${RANDOM_UUID}}\",\"type\":\"lxc\",\"nsapp\":\"${app:-unknown}\",\"status\":\"${progress_status}\"}" &>/dev/null || true
-}
-
-# ==============================================================================
-# SECTION 2: NETWORK & CONNECTIVITY
-# ==============================================================================
-
-# ------------------------------------------------------------------------------
-# verb_ip6()
-#
-# - Configures IPv6 based on DISABLEIPV6 variable
-# - If DISABLEIPV6=yes: disables IPv6 via sysctl
-# - Sets verbose mode via set_std_mode()
-# ------------------------------------------------------------------------------
+# This function enables IPv6 if it's not disabled and sets verbose mode
 verb_ip6() {
-	set_std_mode # Set STD mode based on VERBOSE
+  set_std_mode # Set STD mode based on VERBOSE

-	if [ "${IPV6_METHOD:-}" = "disable" ]; then
-		msg_info "Disabling IPv6 (this may affect some services)"
-		mkdir -p /etc/sysctl.d
-		$STD tee /etc/sysctl.d/99-disable-ipv6.conf >/dev/null <<EOF
-# Disable IPv6 (set by community-scripts)
-net.ipv6.conf.all.disable_ipv6 = 1
-net.ipv6.conf.default.disable_ipv6 = 1
-net.ipv6.conf.lo.disable_ipv6 = 1
-EOF
-		$STD sysctl -p /etc/sysctl.d/99-disable-ipv6.conf
-		msg_ok "Disabled IPv6"
-	fi
+  if [ "$DISABLEIPV6" == "yes" ]; then
+    echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf
+    $STD sysctl -p
+  fi
 }

-# ------------------------------------------------------------------------------
-# setting_up_container()
-#
-# - Verifies network connectivity via hostname -I
-# - Retries up to RETRY_NUM times with RETRY_EVERY seconds delay
-# - Removes Python EXTERNALLY-MANAGED restrictions
-# - Disables systemd-networkd-wait-online.service for faster boot
-# - Exits with error if network unavailable after retries
-# ------------------------------------------------------------------------------
+# This function sets error handling options and defines the error_handler function to handle errors
+catch_errors() {
+  set -Eeuo pipefail
+  trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+}
+
+# This function handles errors
+error_handler() {
+  printf "\e[?25h"
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message"
+  if [[ "$line_number" -eq 51 ]]; then
+    echo -e "The silent function has suppressed the error, run the script with verbose mode enabled, which will provide more detailed output.\n"
+    post_update_to_api "failed" "No error message, script ran in silent mode"
+  else
+    post_update_to_api "failed" "${command}"
+  fi
+}
+
+# This function sets up the Container OS by generating the locale, setting the timezone, and checking the network connection
 setting_up_container() {
-	msg_info "Setting up Container OS"
-
-	# Fix Debian 13 LXC template bug where / is owned by nobody
-	# Only attempt in privileged containers (unprivileged cannot chown /)
-	if [[ "$(stat -c '%U' /)" != "root" ]]; then
-		(chown root:root / 2>/dev/null) || true
-	fi
-
-	for ((i = RETRY_NUM; i > 0; i--)); do
-		if [ "$(hostname -I)" != "" ]; then
-			break
-		fi
-		echo 1>&2 -en "${CROSS}${RD} No Network! "
-		sleep $RETRY_EVERY
-	done
-	if [ "$(hostname -I)" = "" ]; then
-		echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
-		echo -e "${NETWORK}Check Network Settings"
-		exit 121
-	fi
-	rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
-	systemctl disable -q --now systemd-networkd-wait-online.service
-	msg_ok "Set up Container OS"
-	#msg_custom "${CM}" "${GN}" "Network Connected: ${BL}$(hostname -I)"
-	msg_ok "Network Connected: ${BL}$(hostname -I)"
-	post_progress_to_api
+  msg_info "Setting up Container OS"
+  for ((i = RETRY_NUM; i > 0; i--)); do
+    if [ "$(hostname -I)" != "" ]; then
+      break
+    fi
+    echo 1>&2 -en "${CROSS}${RD} No Network! "
+    sleep $RETRY_EVERY
+  done
+  if [ "$(hostname -I)" = "" ]; then
+    echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
+    echo -e "${NETWORK}Check Network Settings"
+    exit 1
+  fi
+  rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
+  systemctl disable -q --now systemd-networkd-wait-online.service
+  msg_ok "Set up Container OS"
+  #msg_custom "${CM}" "${GN}" "Network Connected: ${BL}$(hostname -I)"
+  msg_ok "Network Connected: ${BL}$(hostname -I)"
 }

-# ------------------------------------------------------------------------------
-# network_check()
-#
-# - Comprehensive network connectivity check for IPv4 and IPv6
-# - Tests connectivity to multiple DNS servers:
-#   * IPv4: 1.1.1.1 (Cloudflare), 8.8.8.8 (Google), 9.9.9.9 (Quad9)
-#   * IPv6: 2606:4700:4700::1111, 2001:4860:4860::8888, 2620:fe::fe
-# - Verifies DNS resolution for GitHub and Community-Scripts domains
-# - Prompts user to continue if no internet detected
-# - Uses fatal() on DNS resolution failure for critical hosts
-# ------------------------------------------------------------------------------
+# This function checks the network connection by pinging a known IP address and prompts the user to continue if the internet is not connected
+# This function checks the network connection by pinging a known IP address and prompts the user to continue if the internet is not connected
 network_check() {
-	set +e
-	trap - ERR
-	ipv4_connected=false
-	ipv6_connected=false
-	sleep 1
+  set +e
+  trap - ERR
+  ipv4_connected=false
+  ipv6_connected=false
+  sleep 1

-	# Check IPv4 connectivity to Google, Cloudflare & Quad9 DNS servers.
-	if ping -c 1 -W 1 1.1.1.1 &>/dev/null || ping -c 1 -W 1 8.8.8.8 &>/dev/null || ping -c 1 -W 1 9.9.9.9 &>/dev/null; then
-		msg_ok "IPv4 Internet Connected"
-		ipv4_connected=true
-	else
-		msg_error "IPv4 Internet Not Connected"
-	fi
+  # Check IPv4 connectivity to Google, Cloudflare & Quad9 DNS servers.
+  if ping -c 1 -W 1 1.1.1.1 &>/dev/null || ping -c 1 -W 1 8.8.8.8 &>/dev/null || ping -c 1 -W 1 9.9.9.9 &>/dev/null; then
+    msg_ok "IPv4 Internet Connected"
+    ipv4_connected=true
+  else
+    msg_error "IPv4 Internet Not Connected"
+  fi

-	# Check IPv6 connectivity to Google, Cloudflare & Quad9 DNS servers.
-	if ping6 -c 1 -W 1 2606:4700:4700::1111 &>/dev/null || ping6 -c 1 -W 1 2001:4860:4860::8888 &>/dev/null || ping6 -c 1 -W 1 2620:fe::fe &>/dev/null; then
-		msg_ok "IPv6 Internet Connected"
-		ipv6_connected=true
-	else
-		msg_error "IPv6 Internet Not Connected"
-	fi
+  # Check IPv6 connectivity to Google, Cloudflare & Quad9 DNS servers.
+  if ping6 -c 1 -W 1 2606:4700:4700::1111 &>/dev/null || ping6 -c 1 -W 1 2001:4860:4860::8888 &>/dev/null || ping6 -c 1 -W 1 2620:fe::fe &>/dev/null; then
+    msg_ok "IPv6 Internet Connected"
+    ipv6_connected=true
+  else
+    msg_error "IPv6 Internet Not Connected"
+  fi

-	# If both IPv4 and IPv6 checks fail, prompt the user
-	if [[ $ipv4_connected == false && $ipv6_connected == false ]]; then
-		read -r -p "No Internet detected, would you like to continue anyway? <y/N> " prompt
-		if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
-			echo -e "${INFO}${RD}Expect Issues Without Internet${CL}"
-		else
-			echo -e "${NETWORK}Check Network Settings"
-			exit 122
-		fi
-	fi
+  # If both IPv4 and IPv6 checks fail, prompt the user
+  if [[ $ipv4_connected == false && $ipv6_connected == false ]]; then
+    read -r -p "No Internet detected, would you like to continue anyway? <y/N> " prompt
+    if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
+      echo -e "${INFO}${RD}Expect Issues Without Internet${CL}"
+    else
+      echo -e "${NETWORK}Check Network Settings"
+      exit 1
+    fi
+  fi

-	# DNS resolution checks for GitHub-related domains (IPv4 and/or IPv6)
-	GIT_HOSTS=("github.com" "raw.githubusercontent.com" "api.github.com" "git.community-scripts.org")
-	GIT_STATUS="Git DNS:"
-	DNS_FAILED=false
+  # DNS resolution checks for GitHub-related domains (IPv4 and/or IPv6)
+  GIT_HOSTS=("github.com" "raw.githubusercontent.com" "api.github.com" "git.community-scripts.org")
+  GIT_STATUS="Git DNS:"
+  DNS_FAILED=false

-	for HOST in "${GIT_HOSTS[@]}"; do
-		RESOLVEDIP=$(getent hosts "$HOST" | awk '{ print $1 }' | grep -E '(^([0-9]{1,3}\.){3}[0-9]{1,3}$)|(^[a-fA-F0-9:]+$)' | head -n1)
-		if [[ -z "$RESOLVEDIP" ]]; then
-			GIT_STATUS+="$HOST:($DNSFAIL)"
-			DNS_FAILED=true
-		else
-			GIT_STATUS+=" $HOST:($DNSOK)"
-		fi
-	done
+  for HOST in "${GIT_HOSTS[@]}"; do
+    RESOLVEDIP=$(getent hosts "$HOST" | awk '{ print $1 }' | grep -E '(^([0-9]{1,3}\.){3}[0-9]{1,3}$)|(^[a-fA-F0-9:]+$)' | head -n1)
+    if [[ -z "$RESOLVEDIP" ]]; then
+      GIT_STATUS+="$HOST:($DNSFAIL)"
+      DNS_FAILED=true
+    else
+      GIT_STATUS+=" $HOST:($DNSOK)"
+    fi
+  done

-	if [[ "$DNS_FAILED" == true ]]; then
-		fatal "$GIT_STATUS"
-	else
-		msg_ok "$GIT_STATUS"
-	fi
+  if [[ "$DNS_FAILED" == true ]]; then
+    fatal "$GIT_STATUS"
+  else
+    msg_ok "$GIT_STATUS"
+  fi

-	set -e
-	trap 'error_handler' ERR
+  set -e
+  trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
 }

-# ==============================================================================
-# SECTION 3: OS UPDATE & PACKAGE MANAGEMENT
-# ==============================================================================
-
-# ------------------------------------------------------------------------------
-# apt_update_safe()
-#
-# - Runs apt-get update with CDN mirror fallback
-# - On failure, detects distro (Debian/Ubuntu) and tries alternate mirrors
-# - Three-phase approach: global mirrors → primary mirror → regional mirrors
-# - Falls back to manual user prompt if all auto mirrors fail
-# - Detects hash mismatch, SSL errors, and generic apt failures
-# ------------------------------------------------------------------------------
-apt_update_safe() {
-	if $STD apt-get update; then
-		return 0
-	fi
-
-	local failed_mirror
-	failed_mirror=$(grep -m1 -oP '(?<=URIs: https?://)[^/]+' /etc/apt/sources.list.d/debian.sources 2>/dev/null || grep -m1 -oP '(?<=deb https?://)[^/]+' /etc/apt/sources.list 2>/dev/null || echo "unknown")
-	msg_warn "apt-get update failed (${failed_mirror}), trying alternate mirrors..."
-
-	local distro
-	distro=$(. /etc/os-release 2>/dev/null && echo "$ID" || echo "debian")
-
-	local eu_mirrors us_mirrors ap_mirrors
-	if [[ "$distro" == "ubuntu" ]]; then
-		eu_mirrors="de.archive.ubuntu.com fr.archive.ubuntu.com se.archive.ubuntu.com nl.archive.ubuntu.com it.archive.ubuntu.com ch.archive.ubuntu.com mirrors.xtom.de"
-		us_mirrors="us.archive.ubuntu.com archive.ubuntu.com mirrors.edge.kernel.org mirror.csclub.uwaterloo.ca mirrors.ocf.berkeley.edu mirror.math.princeton.edu"
-		ap_mirrors="au.archive.ubuntu.com jp.archive.ubuntu.com kr.archive.ubuntu.com tw.archive.ubuntu.com mirror.aarnet.edu.au"
-	else
-		eu_mirrors="ftp.de.debian.org ftp.fr.debian.org ftp.nl.debian.org ftp.uk.debian.org ftp.ch.debian.org ftp.se.debian.org ftp.it.debian.org ftp.fau.de ftp.halifax.rwth-aachen.de debian.mirror.lrz.de mirror.init7.net debian.ethz.ch mirrors.dotsrc.org debian.mirrors.ovh.net"
-		us_mirrors="ftp.us.debian.org ftp.ca.debian.org debian.csail.mit.edu mirrors.ocf.berkeley.edu mirrors.wikimedia.org debian.osuosl.org mirror.cogentco.com"
-		ap_mirrors="ftp.au.debian.org ftp.jp.debian.org ftp.tw.debian.org ftp.kr.debian.org ftp.hk.debian.org ftp.sg.debian.org mirror.aarnet.edu.au mirror.nitc.ac.in"
-	fi
-
-	local tz regional others
-	tz=$(cat /etc/timezone 2>/dev/null || echo "UTC")
-	case "$tz" in
-	Europe/* | Arctic/*)
-		regional="$eu_mirrors"
-		others="$us_mirrors $ap_mirrors"
-		;;
-	America/*)
-		regional="$us_mirrors"
-		others="$eu_mirrors $ap_mirrors"
-		;;
-	Asia/* | Australia/* | Pacific/*)
-		regional="$ap_mirrors"
-		others="$eu_mirrors $us_mirrors"
-		;;
-	*)
-		regional=""
-		others="$eu_mirrors $us_mirrors $ap_mirrors"
-		;;
-	esac
-
-	echo 'Acquire::By-Hash "no";' >/etc/apt/apt.conf.d/99no-by-hash
-
-	_try_apt_mirror() {
-		local m=$1
-		for src in /etc/apt/sources.list.d/debian.sources /etc/apt/sources.list; do
-			[[ -f "$src" ]] && sed -i "s|URIs: http[s]*://[^/]*/|URIs: http://${m}/|g; s|deb http[s]*://[^/]*/|deb http://${m}/|g" "$src"
-		done
-		rm -rf /var/lib/apt/lists/*
-		local out
-		out=$(apt-get update 2>&1)
-		if echo "$out" | grep -qi "hashsum\|hash sum"; then
-			msg_warn "Mirror ${m} failed (hash mismatch)"
-			return 1
-		elif echo "$out" | grep -qi "SSL\|certificate"; then
-			msg_warn "Mirror ${m} failed (SSL/certificate error)"
-			return 1
-		elif echo "$out" | grep -q "^E:"; then
-			msg_warn "Mirror ${m} failed (apt-get update error)"
-			return 1
-		else
-			msg_ok "CDN set to ${m}: tests passed"
-			return 0
-		fi
-	}
-
-	_scan_reachable() {
-		local result=""
-		for m in $1; do
-			if timeout 2 bash -c "echo >/dev/tcp/$m/80" 2>/dev/null; then
-				result="$result $m"
-			fi
-		done
-		echo "$result" | xargs
-	}
-
-	local apt_ok=false
-
-	# Phase 1: Scan global mirrors first (independent of local CDN issues)
-	local others_ok
-	others_ok=$(_scan_reachable "$others")
-	local others_pick
-	others_pick=$(printf '%s\n' $others_ok | shuf | head -3 | xargs)
-
-	for mirror in $others_pick; do
-		msg_custom "${INFO}" "${YW}" "Attempting mirror: ${mirror}"
-		if _try_apt_mirror "$mirror"; then
-			apt_ok=true
-			break
-		fi
-	done
-
-	# Phase 2: Try primary mirror
-	if [[ "$apt_ok" != true ]]; then
-		local primary
-		if [[ "$distro" == "ubuntu" ]]; then
-			primary="archive.ubuntu.com"
-		else
-			primary="ftp.debian.org"
-		fi
-		if timeout 2 bash -c "echo >/dev/tcp/$primary/80" 2>/dev/null; then
-			msg_custom "${INFO}" "${YW}" "Attempting mirror: ${primary}"
-			if _try_apt_mirror "$primary"; then
-				apt_ok=true
-			fi
-		fi
-	fi
-
-	# Phase 3: Fall back to regional mirrors
-	if [[ "$apt_ok" != true ]]; then
-		local regional_ok
-		regional_ok=$(_scan_reachable "$regional")
-		local regional_pick
-		regional_pick=$(printf '%s\n' $regional_ok | shuf | head -3 | xargs)
-
-		for mirror in $regional_pick; do
-			msg_custom "${INFO}" "${YW}" "Attempting mirror: ${mirror}"
-			if _try_apt_mirror "$mirror"; then
-				apt_ok=true
-				break
-			fi
-		done
-	fi
-
-	# Phase 4: All auto mirrors failed, prompt user
-	if [[ "$apt_ok" != true ]]; then
-		msg_warn "Multiple mirrors failed (possible CDN synchronization issue)."
-		if [[ "$distro" == "ubuntu" ]]; then
-			msg_warn "Find Ubuntu mirrors at: https://launchpad.net/ubuntu/+archivemirrors"
-		else
-			msg_warn "Find Debian mirrors at: https://www.debian.org/mirror/list"
-		fi
-		local custom_mirror
-		while true; do
-			read -rp "  Enter a mirror hostname (or 'skip' to abort): " custom_mirror </dev/tty
-			[[ -z "$custom_mirror" ]] && continue
-			[[ "$custom_mirror" == "skip" ]] && break
-			[[ ! "$custom_mirror" =~ ^[a-zA-Z0-9._-]+$ ]] && {
-				msg_warn "Invalid hostname format."
-				continue
-			}
-			if _try_apt_mirror "$custom_mirror"; then
-				apt_ok=true
-				break
-			fi
-			msg_warn "Mirror '${custom_mirror}' also failed. Try another or type 'skip'."
-		done
-	fi
-
-	if [[ "$apt_ok" != true ]]; then
-		msg_error "All mirrors failed. Check network or try again later."
-		return 1
-	fi
-}
-
-# ------------------------------------------------------------------------------
-# update_os()
-#
-# - Updates container OS via apt-get update and dist-upgrade
-# - Configures APT cacher proxy if CACHER=yes (accelerates package downloads)
-# - Removes Python EXTERNALLY-MANAGED restrictions for pip
-# - Sources tools.func for additional setup functions after update
-# - Uses $STD wrapper to suppress output unless VERBOSE=yes
-# ------------------------------------------------------------------------------
+# This function updates the Container OS by running apt-get update and upgrade
 update_os() {
-	msg_info "Updating Container OS"
-	if [[ "$CACHER" == "yes" ]]; then
-		echo 'Acquire::http::Proxy-Auto-Detect "/usr/local/bin/apt-proxy-detect.sh";' >/etc/apt/apt.conf.d/00aptproxy
-		cat <<EOF >/usr/local/bin/apt-proxy-detect.sh
+  msg_info "Updating Container OS"
+  if [[ "$CACHER" == "yes" ]]; then
+    echo 'Acquire::http::Proxy-Auto-Detect "/usr/local/bin/apt-proxy-detect.sh";' >/etc/apt/apt.conf.d/00aptproxy
+    cat <<EOF >/usr/local/bin/apt-proxy-detect.sh
 #!/bin/bash
 if nc -w1 -z "${CACHER_IP}" 3142; then
  echo -n "http://${CACHER_IP}:3142"
@@ -398,93 +138,70 @@ else
  echo -n "DIRECT"
 fi
 EOF
-		chmod +x /usr/local/bin/apt-proxy-detect.sh
-	fi
-	apt_update_safe
-	$STD apt-get -o Dpkg::Options::="--force-confold" -y dist-upgrade
-	rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
-	msg_ok "Updated Container OS"
-	post_progress_to_api
+    chmod +x /usr/local/bin/apt-proxy-detect.sh
+  fi
+  $STD apt-get update
+  $STD apt-get -o Dpkg::Options::="--force-confold" -y dist-upgrade
+  rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
+  msg_ok "Updated Container OS"

-	source "$(dirname "${BASH_SOURCE[0]}")/tools.func"
+  # tools.func is included in FUNCTIONS_FILE_PATH
 }

-# ==============================================================================
-# SECTION 4: MOTD & SSH CONFIGURATION
-# ==============================================================================
-
-# ------------------------------------------------------------------------------
-# motd_ssh()
-#
-# - Configures Message of the Day (MOTD) with container information
-# - Creates /etc/profile.d/00_lxc-details.sh with:
-#   * Application name
-#   * Warning banner (DEV repository)
-#   * OS name and version
-#   * Hostname and IP address
-#   * GitHub repository link
-# - Disables executable flag on /etc/update-motd.d/* scripts
-# - Enables root SSH access if SSH_ROOT=yes
-# - Configures TERM environment variable for better terminal support
-# ------------------------------------------------------------------------------
+# This function modifies the message of the day (motd) and SSH settings
 motd_ssh() {
-	# Set terminal to 256-color mode
-	grep -qxF "export TERM='xterm-256color'" /root/.bashrc || echo "export TERM='xterm-256color'" >>/root/.bashrc
+  # Set terminal to 256-color mode
+  grep -qxF "export TERM='xterm-256color'" /root/.bashrc || echo "export TERM='xterm-256color'" >>/root/.bashrc

-	PROFILE_FILE="/etc/profile.d/00_lxc-details.sh"
-	echo "echo -e \"\"" >"$PROFILE_FILE"
-	echo -e "echo -e \"${BOLD}${APPLICATION} LXC Container${CL}"\" >>"$PROFILE_FILE"
-	echo -e "echo -e \"${TAB}${GATEWAY}${YW} Provided by: ${GN}community-scripts ORG ${YW}| GitHub: ${GN}https://github.com/community-scripts/ProxmoxVE${CL}\"" >>"$PROFILE_FILE"
-	echo "echo \"\"" >>"$PROFILE_FILE"
-	echo -e "echo -e \"${TAB}${OS}${YW} OS: ${GN}\$(grep ^NAME /etc/os-release | cut -d= -f2 | tr -d '\"') - Version: \$(grep ^VERSION_ID /etc/os-release | cut -d= -f2 | tr -d '\"')${CL}\"" >>"$PROFILE_FILE"
-	echo -e "echo -e \"${TAB}${HOSTNAME}${YW} Hostname: ${GN}\$(hostname)${CL}\"" >>"$PROFILE_FILE"
-	echo -e "echo -e \"${TAB}${INFO}${YW} IP Address: ${GN}\$(hostname -I | awk '{print \$1}')${CL}\"" >>"$PROFILE_FILE"
+  # Get OS information (Debian / Ubuntu)
+  if [ -f "/etc/os-release" ]; then
+    OS_NAME=$(grep ^NAME /etc/os-release | cut -d= -f2 | tr -d '"')
+    OS_VERSION=$(grep ^VERSION_ID /etc/os-release | cut -d= -f2 | tr -d '"')
+  elif [ -f "/etc/debian_version" ]; then
+    OS_NAME="Debian"
+    OS_VERSION=$(cat /etc/debian_version)
+  fi

-	# Disable default MOTD scripts
-	chmod -x /etc/update-motd.d/*
+  PROFILE_FILE="/etc/profile.d/00_lxc-details.sh"
+  echo "echo -e \"\"" >"$PROFILE_FILE"
+  echo -e "echo -e \"${BOLD}${APPLICATION} LXC Container${CL}"\" >>"$PROFILE_FILE"
+  echo -e "echo -e \"${TAB}${GATEWAY}${YW} Provided by: ${GN}community-scripts ORG ${YW}| GitHub: ${GN}https://github.com/community-scripts/ProxmoxVE${CL}\"" >>"$PROFILE_FILE"
+  echo "echo \"\"" >>"$PROFILE_FILE"
+  echo -e "echo -e \"${TAB}${OS}${YW} OS: ${GN}${OS_NAME} - Version: ${OS_VERSION}${CL}\"" >>"$PROFILE_FILE"
+  echo -e "echo -e \"${TAB}${HOSTNAME}${YW} Hostname: ${GN}\$(hostname)${CL}\"" >>"$PROFILE_FILE"
+  echo -e "echo -e \"${TAB}${INFO}${YW} IP Address: ${GN}\$(hostname -I | awk '{print \$1}')${CL}\"" >>"$PROFILE_FILE"

-	if [[ "${SSH_ROOT}" == "yes" ]]; then
-		sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config
-		systemctl restart sshd
-	fi
-	post_progress_to_api
+  # Disable default MOTD scripts
+  chmod -x /etc/update-motd.d/*
+
+  if [[ "${SSH_ROOT}" == "yes" ]]; then
+    sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config
+    systemctl restart sshd
+  fi
 }

-# ==============================================================================
-# SECTION 5: CONTAINER CUSTOMIZATION
-# ==============================================================================
-
-# ------------------------------------------------------------------------------
-# customize()
-#
-# - Customizes container for passwordless root login if PASSWORD is empty
-# - Configures getty for auto-login via /etc/systemd/system/container-getty@1.service.d/override.conf
-# - Creates /usr/bin/update script for easy application updates
-# - Injects SSH authorized keys if SSH_AUTHORIZED_KEY variable is set
-# - Sets proper permissions on SSH directories and key files
-# ------------------------------------------------------------------------------
+# This function customizes the container by modifying the getty service and enabling auto-login for the root user
 customize() {
-	if [[ "$PASSWORD" == "" ]]; then
-		msg_info "Customizing Container"
-		GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
-		mkdir -p "$(dirname "$GETTY_OVERRIDE")"
-		cat <<EOF >"$GETTY_OVERRIDE"
+  if [[ "$PASSWORD" == "" ]]; then
+    msg_info "Customizing Container"
+    GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
+    mkdir -p $(dirname $GETTY_OVERRIDE)
+    cat <<EOF >$GETTY_OVERRIDE
  [Service]
  ExecStart=
  ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM
 EOF
-		systemctl daemon-reload
-		systemctl restart "$(basename "$(dirname "$GETTY_OVERRIDE")" | sed 's/\.d//')"
-		msg_ok "Customized Container"
-	fi
-	echo "bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/${app}.sh)\"" >/usr/bin/update
-	chmod +x /usr/bin/update
+    systemctl daemon-reload
+    systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
+    msg_ok "Customized Container"
+  fi
+  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
-	post_progress_to_api
-}
+  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/scripts/core/tools.func
+++ b/scripts/core/tools.func
--- a/scripts/ct/debian.sh
+++ b/scripts/ct/debian.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 SCRIPT_DIR="$(dirname "$0")" 
 source "$SCRIPT_DIR/../core/build.func"
-# Copyright (c) 2021-2026 tteck
+# Copyright (c) 2021-2025 tteck
 # Author: tteck (tteckster)
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 # Source: https://www.debian.org/
@@ -32,7 +32,6 @@ function update_script() {
  $STD apt update
  $STD apt -y upgrade
  msg_ok "Updated $APP LXC"
-  msg_ok "Updated successfully!"
  exit
 }

@@ -40,5 +39,5 @@ start
 build_container
 description

-msg_ok "Completed successfully!\n"
+msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
--- a/scripts/install/debian-install.sh
+++ b/scripts/install/debian-install.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash

-# Copyright (c) 2021-2026 tteck
+# Copyright (c) 2021-2025 tteck
 # Author: tteck (tteckster)
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 # Source: https://www.debian.org/
@@ -15,4 +15,10 @@ update_os

 motd_ssh
 customize
-cleanup_lxc
+
+msg_info "Cleaning up"
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
+msg_ok "Cleaned"
+
--- a/scripts/json/2fauth.json
+++ b/scripts/json/2fauth.json
@@ -0,0 +1,44 @@
+{
+  "name": "2FAuth",
+  "slug": "2fauth",
+  "categories": [
+    6
+  ],
+  "date_created": "2024-12-20",
+  "type": "ct",
+  "updateable": true,
+  "privileged": false,
+  "interface_port": 80,
+  "documentation": "https://docs.2fauth.app/",
+  "website": "https://2fauth.app/",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/2fauth.webp",
+  "config_path": "cat /opt/2fauth/.env",
+  "description": "2FAuth is a web based self-hosted alternative to One Time Passcode (OTP) generators like Google Authenticator, designed for both mobile and desktop. It aims to ease you perform your 2FA authentication steps whatever the device you handle, with a clean and suitable interface.",
+  "install_methods": [
+    {
+      "type": "default",
+      "script": "ct/2fauth.sh",
+      "resources": {
+        "cpu": 1,
+        "ram": 512,
+        "hdd": 2,
+        "os": "debian",
+        "version": "13"
+      }
+    }
+  ],
+  "default_credentials": {
+    "username": null,
+    "password": null
+  },
+  "notes": [
+    {
+      "text": "Database credentials: `cat ~/2FAuth.creds`",
+      "type": "info"
+    },
+    {
+      "text": "The very first account created is automatically set up as an administrator account.",
+      "type": "info"
+    }
+  ]
+}
--- a/scripts/json/actualbudget.json
+++ b/scripts/json/actualbudget.json
@@ -31,6 +31,5 @@
    "username": null,
    "password": null
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/add-iptag.json
+++ b/scripts/json/add-iptag.json
@@ -48,6 +48,5 @@
      "text": "You can execute the ip tool manually with `iptag-run`",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/add-netbird-lxc.json
+++ b/scripts/json/add-netbird-lxc.json
@@ -44,6 +44,5 @@
      "text": "The script only works in Debian/Ubuntu, not in Alpine!",
      "type": "warning"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/add-tailscale-lxc.json
+++ b/scripts/json/add-tailscale-lxc.json
@@ -40,6 +40,5 @@
      "text": "Execute within the Proxmox host shell",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/adguard.json
+++ b/scripts/json/adguard.json
@@ -47,6 +47,5 @@
      "text": "AdGuard Home can only be updated via the user interface.",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/adventurelog.json
+++ b/scripts/json/adventurelog.json
@@ -40,6 +40,5 @@
      "text": "Use `cat ~/adventurelog.creds` to see login credentials.",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/agentdvr.json
+++ b/scripts/json/agentdvr.json
@@ -31,6 +31,5 @@
    "username": null,
    "password": null
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/all-templates.json
+++ b/scripts/json/all-templates.json
@@ -36,6 +36,5 @@
      "text": "Resource and network settings are adjustable post LXC creation.",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/alpine-it-tools.json
+++ b/scripts/json/alpine-it-tools.json
@@ -42,6 +42,5 @@
    "username": null,
    "password": null
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/alpine-redlib.json
+++ b/scripts/json/alpine-redlib.json
@@ -31,6 +31,5 @@
    "username": null,
    "password": null
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/alpine-tinyauth.json
+++ b/scripts/json/alpine-tinyauth.json
@@ -47,6 +47,5 @@
      "text": "The default credentials are located in `/opt/tinyauth/credentials.txt`.",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/alpine.json
+++ b/scripts/json/alpine.json
@@ -36,6 +36,5 @@
      "text": "To Update Alpine: `apk -U upgrade`",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/apache-cassandra.json
+++ b/scripts/json/apache-cassandra.json
@@ -31,6 +31,5 @@
    "username": null,
    "password": null
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/apache-couchdb.json
+++ b/scripts/json/apache-couchdb.json
@@ -36,6 +36,5 @@
      "text": "Show Login Credentials: `cat CouchDB.creds`",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/apache-guacamole.json
+++ b/scripts/json/apache-guacamole.json
@@ -31,6 +31,5 @@
    "username": "guacadmin",
    "password": "guacadmin"
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/apache-tika.json
+++ b/scripts/json/apache-tika.json
@@ -36,6 +36,5 @@
      "text": "Configuration file is not created at install time. Example is at: `https://cwiki.apache.org/confluence/display/TIKA/TikaServer+in+Tika+2.x`",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/apache-tomcat.json
+++ b/scripts/json/apache-tomcat.json
@@ -36,6 +36,5 @@
      "text": "User can select which Adoptium JDK should be used for the selected Tomcat version (9, 10.1 or 11). ",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/apt-cacher-ng.json
+++ b/scripts/json/apt-cacher-ng.json
@@ -31,6 +31,5 @@
    "username": null,
    "password": null
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/archivebox.json
+++ b/scripts/json/archivebox.json
@@ -31,6 +31,5 @@
    "username": "archivebox",
    "password": "helper-scripts.com"
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/archlinux-vm.json
+++ b/scripts/json/archlinux-vm.json
@@ -36,6 +36,5 @@
      "text": "doesnt work with lvm and lvmthin disks!",
      "type": "warning"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/argus.json
+++ b/scripts/json/argus.json
@@ -31,6 +31,5 @@
    "username": null,
    "password": null
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/aria2.json
+++ b/scripts/json/aria2.json
@@ -36,6 +36,5 @@
      "text": "Within the LXC console, run `cat rpc.secret` to display the rpc-secret. Copy this token and paste it into the Aria2 RPC Secret Token box within the AriaNG Settings. Then, click the reload AriaNG button.",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/asterisk.json
+++ b/scripts/json/asterisk.json
@@ -31,6 +31,5 @@
    "username": null,
    "password": null
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/audiobookshelf.json
+++ b/scripts/json/audiobookshelf.json
@@ -31,6 +31,5 @@
    "username": null,
    "password": null
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/authelia.json
+++ b/scripts/json/authelia.json
@@ -36,6 +36,5 @@
      "text": "During installation, you will have to input your domain (ex. domain.com). Authelia will use auth.domain.com",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/autobrr.json
+++ b/scripts/json/autobrr.json
@@ -31,6 +31,5 @@
    "username": null,
    "password": null
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/autocaliweb.json
+++ b/scripts/json/autocaliweb.json
@@ -31,6 +31,5 @@
    "username": "admin",
    "password": "admin123"
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/babybuddy.json
+++ b/scripts/json/babybuddy.json
@@ -36,6 +36,5 @@
      "text": "for private SSL setup visit: `https://github.com/babybuddy/babybuddy/blob/master/docs/setup/ssl.md`",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/backrest.json
+++ b/scripts/json/backrest.json
@@ -36,6 +36,5 @@
      "type": "info",
      "text": "`cat ~/.ssh/id_ed25519.pub` to view ssh public key. This key is used to authenticate with sftp targets. You can add this key on the sftp server."
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/baikal.json
+++ b/scripts/json/baikal.json
@@ -31,6 +31,5 @@
    "username": "Admin",
    "password": null
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/bar-assistant.json
+++ b/scripts/json/bar-assistant.json
@@ -31,6 +31,5 @@
    "username": null,
    "password": null
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/barcode-buddy.json
+++ b/scripts/json/barcode-buddy.json
@@ -36,6 +36,5 @@
      "text": "After install enable the option \"Use Redis cache\" on the settings page.",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/bazarr.json
+++ b/scripts/json/bazarr.json
@@ -23,7 +23,7 @@
        "ram": 1024,
        "hdd": 4,
        "os": "debian",
-        "version": "13"
+        "version": "12"
      }
    }
  ],
@@ -31,6 +31,5 @@
    "username": null,
    "password": null
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/beszel.json
+++ b/scripts/json/beszel.json
@@ -31,6 +31,5 @@
    "username": null,
    "password": null
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/bitmagnet.json
+++ b/scripts/json/bitmagnet.json
@@ -47,6 +47,5 @@
      "text": "During installation you will be asked to enter your TMDB API key, if you wanna use it. Make sure you have it ready.",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/blocky.json
+++ b/scripts/json/blocky.json
@@ -31,6 +31,5 @@
    "username": null,
    "password": null
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/booklore.json
+++ b/scripts/json/booklore.json
@@ -36,6 +36,5 @@
      "text": "Starting Booklore (Web UI) may take up to 2 minutes after a restart or fresh installation.",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/bookstack.json
+++ b/scripts/json/bookstack.json
@@ -36,6 +36,5 @@
      "text": "Bookstack works only with static ip. If you Change the IP of your LXC, you Need to edit the .env File `nano /opt/bookstack/.env`",
      "type": "warning"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/bunkerweb.json
+++ b/scripts/json/bunkerweb.json
@@ -12,7 +12,7 @@
  "documentation": "https://docs.bunkerweb.io/latest/",
  "website": "https://www.bunkerweb.io/",
  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/bunkerweb.webp",
-  "config_path": "/etc/bunkerweb/variables.env",
+  "config_path": "/opt/bunkerweb/variables.env",
  "description": "BunkerWeb is a security-focused web server that enhances web application protection. It guards against common web vulnerabilities like SQL injection, XSS, and CSRF. It features simple setup and configuration using a YAML file, customizable security rules, and provides detailed logs for traffic monitoring and threat detection.",
  "install_methods": [
    {
@@ -36,6 +36,5 @@
      "text": "WARNING: Installation sources scripts outside of Community Scripts repo. Please check the source before installing.",
      "type": "warning"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/bytestash.json
+++ b/scripts/json/bytestash.json
@@ -31,6 +31,5 @@
    "username": null,
    "password": null
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/caddy.json
+++ b/scripts/json/caddy.json
@@ -55,6 +55,5 @@
      "text": "if you need an external module run: `xcaddy build --with github.com/caddy-dns/cloudflare`",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/casaos.json
+++ b/scripts/json/casaos.json
@@ -40,6 +40,5 @@
      "text": "WARNING: Installation sources scripts outside of Community Scripts repo. Please check the source before installing.",
      "type": "warning"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/changedetection.json
+++ b/scripts/json/changedetection.json
@@ -31,6 +31,5 @@
    "username": null,
    "password": null
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/channels.json
+++ b/scripts/json/channels.json
@@ -36,6 +36,5 @@
      "text": "WARNING: Installation sources scripts outside of Community Scripts repo. Please check the source before installing.",
      "type": "warning"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/checkmk.json
+++ b/scripts/json/checkmk.json
@@ -36,6 +36,5 @@
      "text": "Login Credentials : `cat ~/checkmk.creds`",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/clean-lxcs.json
+++ b/scripts/json/clean-lxcs.json
@@ -36,6 +36,5 @@
      "text": "Execute within the Proxmox shell",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/clean-orphaned-lvm.json
+++ b/scripts/json/clean-orphaned-lvm.json
@@ -36,6 +36,5 @@
      "text": "Execute within the Proxmox shell",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/cleanuparr.json
+++ b/scripts/json/cleanuparr.json
@@ -31,6 +31,5 @@
    "username": null,
    "password": null
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/cloudflare-ddns.json
+++ b/scripts/json/cloudflare-ddns.json
@@ -40,6 +40,5 @@
      "text": "To update the configuration edit `/etc/systemd/system/cloudflare-ddns.service`. After edit please restart with `systemctl restart cloudflare-ddns`",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/cloudflared.json
+++ b/scripts/json/cloudflared.json
@@ -36,6 +36,5 @@
      "text": "With an option to configure cloudflared as a DNS-over-HTTPS (DoH) proxy",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/cloudreve.json
+++ b/scripts/json/cloudreve.json
@@ -36,6 +36,5 @@
      "text": "After Installation: Register your user -> Login -> Dashboard -> Accept Primary URL.",
      "type": "warn"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/cockpit.json
+++ b/scripts/json/cockpit.json
@@ -33,13 +33,8 @@
  },
  "notes": [
    {
-      "text": "Set a root password if using autologin. This will be the Cockpit password. To set root password run `sudo passwd root`",
+      "text": "Set a root password if using autologin. This will be the Cockpit password.`sudo passwd root`",
      "type": "info"
-    },
-    {
-      "text": "If you plan on using 45Drives extension with NFS, you must setup LXC as privileged. Some features of 45Drives don't work on Debian 13, so Debian 12 must be used.",
-      "type": "warning"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/coder-code-server.json
+++ b/scripts/json/coder-code-server.json
@@ -38,6 +38,5 @@
      "text": "Execute within an existing LXC Console",
      "type": "warning"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/commafeed.json
+++ b/scripts/json/commafeed.json
@@ -31,6 +31,5 @@
    "username": "admin",
    "password": "admin"
  },
-  "notes": [],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  "notes": []
 }
--- a/scripts/json/configarr.json
+++ b/scripts/json/configarr.json
@@ -23,7 +23,7 @@
        "ram": 512,
        "hdd": 4,
        "os": "Debian",
-        "version": "13"
+        "version": "12"
      }
    }
  ],
@@ -36,6 +36,5 @@
      "text": "change secrets file /opt/configarr/secrets.yml",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/convertx.json
+++ b/scripts/json/convertx.json
@@ -36,6 +36,5 @@
      "text": "Complete setup via the web interface at http://<container-ip>:3000. Create and secure the admin account immediately.",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/copyparty.json
+++ b/scripts/json/copyparty.json
@@ -36,6 +36,5 @@
      "text": "Execute within the Proxmox shell or in LXC",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/cosmos.json
+++ b/scripts/json/cosmos.json
@@ -37,6 +37,5 @@
      "type": "info",
      "text": "The file `/etc/sysconfig/CosmosCloud` is optional. If you need custom settings, you can create it yourself."
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/crafty-controller.json
+++ b/scripts/json/crafty-controller.json
@@ -36,6 +36,5 @@
      "text": "Show password: `cat ~/crafty-controller.creds`",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/cron-update-lxcs.json
+++ b/scripts/json/cron-update-lxcs.json
@@ -40,6 +40,5 @@
      "text": "To exclude LXCs from updating, edit the crontab using `crontab -e` and add CTID as shown in the example below:\n\n\n\n`0 0 * * 0 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin /bin/bash -c \"$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/tools/pve/update-lxcs-cron.sh)\" -s 103 111 >>/var/log/update-lxcs-cron.log 2>/dev/null`",
      "type": "info"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/cronicle.json
+++ b/scripts/json/cronicle.json
@@ -28,14 +28,13 @@
    }
  ],
  "default_credentials": {
-    "username": "admin",
-    "password": "admin"
+    "username": null,
+    "password": null
  },
  "notes": [
    {
      "text": "Primary and Worker Private Keys Must Match in the config file",
      "type": "warning"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/cross-seed.json
+++ b/scripts/json/cross-seed.json
@@ -36,6 +36,5 @@
      "text": "After the installation cross-seed will fail to start with an empty configuration. To fix this, edit the config file to properly configure cross-seed, then restart by running `systemctl restart cross-seed`.",
      "type": "warning"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/scripts/json/crowdsec.json
+++ b/scripts/json/crowdsec.json
@@ -36,6 +36,5 @@
      "text": "Execute within an existing LXC Console. Debian only!",
      "type": "warning"
    }
-  ],
-  "repository_url": "https://github.com/community-scripts/ProxmoxVE"
+  ]
 }
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .5.8
 .3.0