poznote: serve from src/public docroot

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -5,19 +5,15 @@ body:
   - type: markdown
     attributes:
       value: |
-        ## ⚠️ **IMPORTANT - READ FIRST**
+        ## ⚠️ **IMPORTANT - READ FIRST**  
+        - 🔍 **Search first:** Before submitting, check if the issue has already been reported or resolved in [closed issues](https://github.com/community-scripts/ProxmoxVE/issues?q=is%3Aissue+is%3Aclosed). If found, comment on that issue instead of creating a new one.  
+        Alternatively, check the **[Discussions](https://github.com/community-scripts/ProxmoxVE/discussions)** under the *"Announcement"* or *"Guide"* categories for relevant information.  
+        - 🔎 If you encounter `[ERROR] in line 23: exit code *: while executing command "$@" > /dev/null 2>&1`, rerun the script with verbose mode before submitting the issue.  
+        - 📜 **Read the script:** Familiarize yourself with the script's content and its purpose. This will help you understand the issue better and provide more relevant information
 
-        **1. Reproduce the issue with verbose mode - this is mandatory.**
-        Set `var_verbose=yes` (or *Advanced Settings → Verbose Mode*) and run the script again.
-        Only a verbose log shows what actually failed - a bare `[ERROR] in line 23: exit code *` tells us nothing.
-        **Reports without a verbose log will most likely be closed.**
-
-        **2. Search before you post.**
-        Check the [closed issues](https://github.com/community-scripts/ProxmoxVE/issues?q=is%3Aissue+is%3Aclosed) and the [Discussions](https://github.com/community-scripts/ProxmoxVE/discussions) (*Announcement* / *Guide*). If it is already known, comment there instead of opening a new issue.
-
-        **3. Read the script.**
-        Knowing what it does makes it much easier to describe the problem - and often to solve it yourself.
+        Thank you for taking the time to report an issue! Please provide as much detail as possible to help us address the problem efficiently.  
 
+     
   - type: input
     id: guidelines
     attributes:
@@ -93,34 +89,30 @@ body:
       value: "💡 **Tip:** If you are using Advanced Settings, please test with Default Settings before submitting an issue."
 
   - type: dropdown
-    id: os_distribution
+    id: linux_distribution
     attributes:
-      label: 🖥️ Which Linux distribution is the container running?
+      label: 🖥️ Which Linux distribution are you using?
       options:
-        - Debian
-        - Ubuntu
         - Alpine
-        - Devuan
-        - AlmaLinux
-        - Rocky Linux
-        - CentOS Stream
-        - Fedora
-        - openSUSE
-        - openEuler
+        - Debian 12
+        - Debian 13
+        - Devuan 5
+        - Ubuntu 22.04
+        - Ubuntu 24.04
+        - Ubuntu 25.04
+        - AlmaLinux 9
+        - AlmaLinux 10
+        - Rocky Linux 9
+        - Rocky Linux 10
+        - CentOS Stream 9
+        - Fedora 42
+        - openSUSE 15
+        - openEuler 25
         - Gentoo
         - Other / not listed
     validations:
       required: true
 
-  - type: input
-    id: os_version
-    attributes:
-      label: 🔢 Which version of that distribution?
-      description: "Run `cat /etc/os-release` inside the container if unsure."
-      placeholder: "e.g. 13 (Debian), 24.04 (Ubuntu), 3.22 (Alpine)"
-    validations:
-      required: true
-
   - type: dropdown
     id: host_arm64
     attributes:

CHANGELOG.md

@@ -540,37 +540,16 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
 
 </details>
 
-## 2026-09-12
-
-### 🆕 New Scripts
-
-  - Hammer ([#17189](https://github.com/community-scripts/ProxmoxVE/pull/17189))
-- gotenberg ([#17205](https://github.com/community-scripts/ProxmoxVE/pull/17205))
-
-### 🚀 Updated Scripts
-
-  - #### 🐞 Bug Fixes
-
-    - fix(dispatcharr): add comskip installation and build dependencies [@eXistC](https://github.com/eXistC) ([#16224](https://github.com/community-scripts/ProxmoxVE/pull/16224))
-    - poznote: serve from src/public docroot [@MickLesk](https://github.com/MickLesk) ([#17187](https://github.com/community-scripts/ProxmoxVE/pull/17187))
-    - calibre-web: use calibreweb release identifier to avoid version file collision [@MickLesk](https://github.com/MickLesk) ([#17186](https://github.com/community-scripts/ProxmoxVE/pull/17186))
-
-  - #### ✨ New Features
-
-    - feat(jitsi-meet): optional public setup (FQDN, Let's Encrypt, NAT, secure domain) [@klanghans](https://github.com/klanghans) ([#17132](https://github.com/community-scripts/ProxmoxVE/pull/17132))
-
 ## 2026-09-11
 
 ### 🆕 New Scripts
 
-  - Lemonade-Server ([#17190](https://github.com/community-scripts/ProxmoxVE/pull/17190))
-- OneTimeSecret ([#17097](https://github.com/community-scripts/ProxmoxVE/pull/17097))
+  - OneTimeSecret ([#17097](https://github.com/community-scripts/ProxmoxVE/pull/17097))
 
 ### 🚀 Updated Scripts
 
   - #### 🐞 Bug Fixes
 
-    - update authentik to 2026.8.2 [@thieneret](https://github.com/thieneret) ([#17198](https://github.com/community-scripts/ProxmoxVE/pull/17198))
     - passwordpusher: restore data before running migrations [@MickLesk](https://github.com/MickLesk) ([#17141](https://github.com/community-scripts/ProxmoxVE/pull/17141))
     - paperclip: install the rust toolchain needed by the runner build [@MickLesk](https://github.com/MickLesk) ([#17142](https://github.com/community-scripts/ProxmoxVE/pull/17142))
     - homepage: run next directly instead of through pnpm [@MickLesk](https://github.com/MickLesk) ([#17155](https://github.com/community-scripts/ProxmoxVE/pull/17155))
@@ -584,8 +563,6 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
 
 ### 🧰 Tools
 
-  - Dockhand ([#17191](https://github.com/community-scripts/ProxmoxVE/pull/17191))
-
   - #### 🐞 Bug Fixes
 
     - update-apps: rewrite the retired Gitea base in every container before updating it [@MickLesk](https://github.com/MickLesk) ([#17156](https://github.com/community-scripts/ProxmoxVE/pull/17156))

ct/authentik.sh

@@ -49,7 +49,7 @@ function update_script() {
   RUST_PROFILE="minimal" RUST_TOOLCHAIN="stable" setup_rust
   setup_yq
 
-  AUTHENTIK_VERSION="version/2026.8.2"
+  AUTHENTIK_VERSION="version/2026.8.1"
   # Source: https://github.com/goauthentik/fips/blob/main/Makefile#L26
   XMLSEC_VERSION="1.3.12"
 
@@ -184,12 +184,8 @@ EOF
 
     msg_info "Updating services"
     sed -i 's/authentik Go Server (API Gateway)/authentik Server/g' /etc/systemd/system/authentik-server.service
-    if ! grep -qF -- 'ExecStartPre=/usr/bin/mkdir -p "${TMPDIR}"' /etc/systemd/system/authentik-server.service; then
-	    sed -i '/ExecStart=/i ExecStartPre=/usr/bin/mkdir -p "${TMPDIR}"' /etc/systemd/system/authentik-server.service
-    fi
-    if ! grep -qF -- 'ExecStartPre=/usr/bin/mkdir -p "${TMPDIR}"' /etc/systemd/system/authentik-worker.service; then
-      sed -i '/ExecStart=/i ExecStartPre=/usr/bin/mkdir -p "${TMPDIR}"' /etc/systemd/system/authentik-worker.service
-    fi
+	  sed -i '/ExecStart=/i ExecStartPre=/usr/bin/mkdir -p "${TMPDIR}"' /etc/systemd/system/authentik-server.service
+    sed -i '/ExecStart=/i ExecStartPre=/usr/bin/mkdir -p "${TMPDIR}"' /etc/systemd/system/authentik-worker.service
     systemctl daemon-reload
     msg_ok "Updated services"
 
@@ -228,8 +224,8 @@ for i in {1..10}; do
   sleep 1
 done
 $STD pct exec "$CTID" -- bash -c "mkdir -p /opt/authentik-data/{certs,media,geoip,templates}; \
-  cp /opt/authentik/tests/geoip/GeoLite2-ASN-Test.mmdb /opt/authentik-data/geoip/GeoLite2-ASN.mmdb; \
-  cp /opt/authentik/tests/geoip/GeoLite2-City-Test.mmdb /opt/authentik-data/geoip/GeoLite2-City.mmdb; \
+  cp /opt/authentik/tests/GeoLite2-ASN-Test.mmdb /opt/authentik-data/geoip/GeoLite2-ASN.mmdb; \
+  cp /opt/authentik/tests/GeoLite2-City-Test.mmdb /opt/authentik-data/geoip/GeoLite2-City.mmdb; \
   cp -r /opt/authentik/blueprints /opt/authentik-data/; \
   rm -r /opt/authentik/blueprints; \
   find /opt/authentik-data -path '*/lost+found' -prune -o -exec chown authentik:authentik {} +"

ct/calibre-web.sh

@@ -32,18 +32,14 @@ function update_script() {
     exit
   fi
 
-  if [[ -f /root/.calibre-web && ! -e /root/.calibreweb ]]; then
-    mv /root/.calibre-web /root/.calibreweb
-  fi
-
-  if check_for_gh_release "calibreweb" "janeczku/calibre-web"; then
+  if check_for_gh_release "Calibre-Web" "janeczku/calibre-web"; then
     msg_info "Stopping Service"
     systemctl stop calibre-web
     msg_ok "Stopped Service"
 
     create_backup /opt/calibre-web/data
 
-    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "calibreweb" "janeczku/calibre-web" "prebuild" "latest" "/opt/calibre-web" "calibreweb*.tar.gz"
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "Calibre-Web" "janeczku/calibre-web" "prebuild" "latest" "/opt/calibre-web" "calibreweb*.tar.gz"
     setup_uv
 
     msg_info "Installing Dependencies"

ct/dispatcharr.sh

@@ -106,18 +106,7 @@ EOF
     msg_ok "Migrated Nginx Configuration"
   fi
 
-  ensure_dependencies vlc-bin vlc-plugin-base build-essential autoconf libtool libargtable2-dev libavformat-dev libsdl2-dev libswscale-dev
-
-  if ! command -v comskip &> /dev/null; then
-    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "Comskip" "erikkaashoek/Comskip" "tarball"
-    msg_info "Compiling Comskip"
-    cd /opt/Comskip
-    $STD ./autogen.sh
-    $STD ./configure
-    $STD make
-    $STD make install
-    msg_ok "Compiled and Installed Comskip"
-  fi
+  ensure_dependencies vlc-bin vlc-plugin-base
 
   if check_for_gh_release "Dispatcharr" "Dispatcharr/Dispatcharr"; then
     msg_info "Stopping Services"

ct/gotenberg.sh

@@ -1,75 +0,0 @@
-#!/usr/bin/env bash
-_CS_DEFAULT_URL="https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main"
-_cs_boot="${COMMUNITY_SCRIPTS_CORE_DIR:-$(dirname "${BASH_SOURCE[0]}")/../../core}/core/build.func"
-source "$_cs_boot" 2>/dev/null || source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/build.func")
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: CrazyWolf13
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://github.com/gotenberg/gotenberg
-
-APP="Gotenberg"
-var_tags="${var_tags:-document;pdf}"
-var_cpu="${var_cpu:-2}"
-var_ram="${var_ram:-4096}"
-var_disk="${var_disk:-15}"
-var_os="${var_os:-debian}"
-var_version="${var_version:-13}"
-#var_arm64="${var_arm64:-no}" # unset = ask the user; set yes/no only when verified
-var_unprivileged="${var_unprivileged:-1}"
-
-header_info "$APP"
-variables
-color
-catch_errors
-
-function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
-
-  if [[ ! -f /etc/systemd/system/gotenberg.service ]]; then
-    msg_error "No ${APP} Installation Found!"
-    exit
-  fi
-
-  if check_for_gh_release "gotenberg" "gotenberg/gotenberg"; then
-    msg_info "Stopping Service"
-    systemctl stop gotenberg
-    msg_ok "Stopped Service"
-
-    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "gotenberg" "gotenberg/gotenberg" "tarball" "latest" "/opt/gotenberg"
-
-    GO_VERSION="$(awk '$1=="go"{print $2}' /opt/gotenberg/go.mod | cut -d. -f1,2)" setup_go
-
-    msg_info "Building gotenberg (Patience)"
-    cd /opt/gotenberg
-    export CGO_ENABLED=0
-    $STD go mod download
-    $STD go build -o /usr/local/bin/gotenberg \
-      -ldflags "-s -w -X 'github.com/gotenberg/gotenberg/v8/cmd.Version=$(cat ~/.gotenberg)'" \
-      cmd/gotenberg/main.go
-    msg_ok "Built gotenberg"
-
-    msg_info "Updating unoconverter"
-    UNOCONVERTER_VERSION=$(get_latest_github_release "gotenberg/unoconverter" "false")
-    download_file "https://raw.githubusercontent.com/gotenberg/unoconverter/${UNOCONVERTER_VERSION}/unoconv" /usr/local/bin/unoconverter
-    chmod +x /usr/local/bin/unoconverter
-    msg_ok "Updated unoconverter"
-
-    msg_info "Starting Service"
-    systemctl start gotenberg
-    msg_ok "Started Service"
-    msg_ok "Updated Successfully!"
-  fi
-  exit
-}
-
-start
-build_container
-description
-
-msg_ok "Completed Successfully!\n"
-echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
-echo -e "${INFO}${YW}Gotenberg is a stateless API and has no web interface.${CL}"
-echo -e "${INFO}${YW}Check the health endpoint using the following URL:${CL}"
-echo -e "${GATEWAY}${BGN}http://${IP}:3000/health${CL}"

ct/hammer.sh

@@ -1,58 +0,0 @@
-#!/usr/bin/env bash
-_CS_DEFAULT_URL="https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main"
-_cs_boot="${COMMUNITY_SCRIPTS_CORE_DIR:-$(dirname "${BASH_SOURCE[0]}")/../../core}/core/build.func"
-source "$_cs_boot" 2>/dev/null || source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/build.func")
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: MickLesk (CanbiZ)
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://github.com/Darkrock-Studios/hammer-editor
-
-APP="Hammer"
-var_tags="${var_tags:-writing;sync-server}"
-var_cpu="${var_cpu:-2}"
-var_ram="${var_ram:-2048}"
-var_disk="${var_disk:-8}"
-var_os="${var_os:-debian}"
-var_version="${var_version:-13}"
-var_unprivileged="${var_unprivileged:-1}"
-var_arm64="${var_arm64:-yes}"
-
-header_info "$APP"
-variables
-color
-catch_errors
-
-function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
-
-  if [[ ! -d /opt/hammer ]]; then
-    msg_error "No ${APP} Installation Found!"
-    exit
-  fi
-
-  if check_for_gh_release "hammer" "Darkrock-Studios/hammer-editor"; then
-    msg_info "Stopping Service"
-    systemctl stop hammer
-    msg_ok "Stopped Service"
-
-    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "hammer" "Darkrock-Studios/hammer-editor" "prebuild" "latest" "/opt/hammer" "server.zip"
-    chmod +x /opt/hammer/bin/server
-
-    msg_info "Starting Service"
-    systemctl start hammer
-    msg_ok "Started Service"
-    msg_ok "Updated successfully!"
-  fi
-  exit
-}
-
-start
-build_container
-description
-
-msg_ok "Completed Successfully!\n"
-echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
-echo -e "${INFO}${YW}Access it using the following URL:${CL}"
-echo -e "${GATEWAY}${BGN}http://${IP}:8080${CL}"

ct/headers/gotenberg

@@ -1,6 +0,0 @@
-   ______      __             __                   
-  / ____/___  / /____  ____  / /_  ___  _________ _
- / / __/ __ \/ __/ _ \/ __ \/ __ \/ _ \/ ___/ __ `/
-/ /_/ / /_/ / /_/  __/ / / / /_/ /  __/ /  / /_/ / 
-\____/\____/\__/\___/_/ /_/_.___/\___/_/   \__, /  
-                                          /____/   

ct/headers/hammer

@@ -1,6 +0,0 @@
-    __  __                                   
-   / / / /___ _____ ___  ____ ___  ___  _____
-  / /_/ / __ `/ __ `__ \/ __ `__ \/ _ \/ ___/
- / __  / /_/ / / / / / / / / / / /  __/ /    
-/_/ /_/\__,_/_/ /_/ /_/_/ /_/ /_/\___/_/     
-                                             

ct/headers/lemonade-server

@@ -1,6 +0,0 @@
-    __                                         __          _____                          
-   / /   ___  ____ ___  ____  ____  ____ _____/ /__       / ___/___  ______   _____  _____
-  / /   / _ \/ __ `__ \/ __ \/ __ \/ __ `/ __  / _ \______\__ \/ _ \/ ___/ | / / _ \/ ___/
- / /___/  __/ / / / / / /_/ / / / / /_/ / /_/ /  __/_____/__/ /  __/ /   | |/ /  __/ /    
-/_____/\___/_/ /_/ /_/\____/_/ /_/\__,_/\__,_/\___/     /____/\___/_/    |___/\___/_/     
-                                                                                          

ct/jitsi-meet.sh

@@ -17,14 +17,6 @@ var_version="${var_version:-13}"
 var_arm64="${var_arm64:-yes}"
 var_unprivileged="${var_unprivileged:-1}"
 
-# Optional public setup, read by the install script (all empty = LAN-only install as before).
-# Without the export they never reach the container.
-export var_jitsi_domain="${var_jitsi_domain:-}"
-export var_jitsi_le_email="${var_jitsi_le_email:-}"
-export var_jitsi_public_ip="${var_jitsi_public_ip:-}"
-export var_jitsi_admin_user="${var_jitsi_admin_user:-}"
-export var_jitsi_admin_pass="${var_jitsi_admin_pass:-}"
-
 header_info "$APP"
 variables
 color
@@ -58,7 +50,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW}Access it using the following URL:${CL}"
-echo -e "${GATEWAY}${BGN}https://${var_jitsi_domain:-$IP}${CL}"
-if [[ -n "${var_jitsi_domain}" ]]; then
-  echo -e "${INFO}${YW}Forward TCP 80/443 and UDP 10000 to the container. Secure-domain credentials (if enabled) are in ~/jitsi-meet.creds inside the container.${CL}"
-fi
+echo -e "${GATEWAY}${BGN}https://${IP}${CL}"

ct/lemonade-server.sh

@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-_CS_DEFAULT_URL="https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main"
-_cs_boot="${COMMUNITY_SCRIPTS_CORE_DIR:-$(dirname "${BASH_SOURCE[0]}")/../../core}/core/build.func"
-source "$_cs_boot" 2>/dev/null || source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/build.func")
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: Jamie (jamiej)
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://github.com/lemonade-sdk/lemonade
-
-APP="Lemonade-Server"
-var_tags="${var_tags:-ai}"
-var_cpu="${var_cpu:-4}"
-var_ram="${var_ram:-8192}"
-var_disk="${var_disk:-80}"
-var_os="${var_os:-debian}"
-var_version="${var_version:-13}"
-var_arm64="${var_arm64:-yes}"
-var_unprivileged="${var_unprivileged:-1}"
-var_gpu="${var_gpu:-yes}"
-
-header_info "$APP"
-variables
-color
-catch_errors
-
-function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
-  if ! command -v lemonade &>/dev/null; then
-    msg_error "No ${APP} Installation Found!"
-    exit
-  fi
-
-  if check_for_gh_release "lemonade-server" "lemonade-sdk/lemonade"; then
-    msg_info "Stopping Service"
-    systemctl stop lemond
-    msg_ok "Stopped Service"
-
-    fetch_and_deploy_gh_release "lemonade-server" "lemonade-sdk/lemonade" "binary" "latest" "/tmp" "lemonade-server_*-debian13_$(arch_resolve).deb"
-
-    msg_info "Starting Service"
-    systemctl start lemond
-    msg_ok "Started Service"
-    msg_ok "Updated successfully!"
-  fi
-  exit
-}
-
-start
-build_container
-description
-
-msg_ok "Completed successfully!\n"
-echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
-echo -e "${INFO}${YW}Access it using the following URL:${CL}"
-echo -e "${GATEWAY}${BGN}http://${IP}:13305${CL}"

install/authentik-install.sh

@@ -58,7 +58,7 @@ PG_VERSION="17" setup_postgresql
 PG_DB_NAME="authentik" PG_DB_USER="authentik" PG_DB_GRANT_SUPERUSER="true" setup_postgresql_db
 
 XMLSEC_VERSION="1.3.12"
-AUTHENTIK_VERSION="version/2026.8.2"
+AUTHENTIK_VERSION="version/2026.8.1"
 fetch_and_deploy_gh_release "xmlsec" "lsh123/xmlsec" "tarball" "${XMLSEC_VERSION}" "/opt/xmlsec"
 fetch_and_deploy_gh_release "authentik" "goauthentik/authentik" "tarball" "${AUTHENTIK_VERSION}" "/opt/authentik"
 GO_VERSION="$(grep -m1 '^go ' /opt/authentik/go.mod | awk '{print $2}')" setup_go

install/calibre-web-install.sh

@@ -32,7 +32,7 @@ msg_info "Installing Calibre (for eBook conversion)"
 $STD apt install -y calibre
 msg_ok "Installed Calibre"
 
-fetch_and_deploy_gh_release "calibreweb" "janeczku/calibre-web" "prebuild" "latest" "/opt/calibre-web" "calibreweb*.tar.gz"
+fetch_and_deploy_gh_release "Calibre-Web" "janeczku/calibre-web" "prebuild" "latest" "/opt/calibre-web" "calibreweb*.tar.gz"
 setup_uv
 
 msg_info "Installing Python Dependencies"

install/dispatcharr-install.sh

@@ -25,13 +25,7 @@ $STD apt install -y \
   procps \
   vlc-bin \
   vlc-plugin-base \
-  streamlink \
-  autoconf \
-  libtool \
-  libargtable2-dev \
-  libavformat-dev \
-  libsdl2-dev \
-  libswscale-dev
+  streamlink
 msg_ok "Installed Dependencies"
 
 setup_uv
@@ -39,15 +33,6 @@ NODE_VERSION="24" setup_nodejs
 PG_VERSION="16" setup_postgresql
 PG_DB_NAME="dispatcharr_db" PG_DB_USER="dispatcharr_usr" setup_postgresql_db
 fetch_and_deploy_gh_release "dispatcharr" "Dispatcharr/Dispatcharr" "tarball"
-fetch_and_deploy_gh_release "Comskip" "erikkaashoek/Comskip" "tarball"
-
-msg_info "Compiling Comskip"
-cd /opt/Comskip
-$STD ./autogen.sh
-$STD ./configure
-$STD make
-$STD make install
-msg_ok "Compiled and Installed Comskip"
 
 msg_info "Installing Python Dependencies with uv"
 cd /opt/dispatcharr

install/gotenberg-install.sh

@@ -1,96 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: CrazyWolf13
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://github.com/gotenberg/gotenberg
-
-source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
-color
-verb_ip6
-catch_errors
-setting_up_container
-network_check
-update_os
-
-msg_info "Installing Dependencies"
-$STD apt install -y \
-  chromium \
-  libreoffice-writer \
-  libreoffice-calc \
-  libreoffice-impress \
-  libreoffice-draw \
-  libreoffice-math \
-  python3-uno \
-  python-is-python3 \
-  pdftk-java \
-  qpdf \
-  libimage-exiftool-perl \
-  fonts-crosextra-carlito \
-  fonts-crosextra-caladea \
-  fonts-liberation \
-  fonts-liberation2 \
-  fonts-dejavu \
-  fonts-noto-cjk \
-  fonts-noto-color-emoji \
-  fonts-noto-core
-msg_ok "Installed Dependencies"
-
-fetch_and_deploy_gh_release "pdfcpu" "pdfcpu/pdfcpu" "prebuild" "latest" "/opt/pdfcpu" "pdfcpu_*_Linux_$(arch_resolve "x86_64" "arm64").tar.xz"
-ln -sf "$(find /opt/pdfcpu -type f -name pdfcpu | head -n1)" /usr/local/bin/pdfcpu
-
-msg_info "Installing unoconverter"
-UNOCONVERTER_VERSION=$(get_latest_github_release "gotenberg/unoconverter" "false")
-download_file "https://raw.githubusercontent.com/gotenberg/unoconverter/${UNOCONVERTER_VERSION}/unoconv" /usr/local/bin/unoconverter
-chmod +x /usr/local/bin/unoconverter
-msg_ok "Installed unoconverter"
-
-fetch_and_deploy_gh_release "gotenberg" "gotenberg/gotenberg" "tarball" "latest" "/opt/gotenberg"
-
-GO_VERSION="$(awk '$1=="go"{print $2}' /opt/gotenberg/go.mod | cut -d. -f1,2)" setup_go
-
-msg_info "Building Gotenberg (Patience)"
-cd /opt/gotenberg
-export CGO_ENABLED=0
-$STD go mod download
-$STD go build -o /usr/local/bin/gotenberg \
-  -ldflags "-s -w -X 'github.com/gotenberg/gotenberg/v8/cmd.Version=$(cat ~/.gotenberg)'" \
-  cmd/gotenberg/main.go
-msg_ok "Built Gotenberg"
-
-msg_info "Creating Service"
-cat <<EOF >/etc/systemd/system/gotenberg.service
-[Unit]
-Description=Gotenberg
-Documentation=https://gotenberg.dev
-After=network.target
-
-[Service]
-Type=simple
-User=root
-Environment=LANG=C.UTF-8
-Environment=LC_ALL=C.UTF-8
-Environment=PDFTK_BIN_PATH=/usr/bin/pdftk
-Environment=QPDF_BIN_PATH=/usr/bin/qpdf
-Environment=EXIFTOOL_BIN_PATH=/usr/bin/exiftool
-Environment=PDFCPU_BIN_PATH=/usr/local/bin/pdfcpu
-Environment=CHROMIUM_BIN_PATH=/usr/bin/chromium
-Environment=CHROMIUM_HYPHEN_DATA_DIR_PATH=/opt/gotenberg/build/chromium-hyphen-data
-Environment=LIBREOFFICE_BIN_PATH=/usr/lib/libreoffice/program/soffice.bin
-Environment=UNOCONVERTER_BIN_PATH=/usr/local/bin/unoconverter
-Environment=OTEL_TRACES_EXPORTER=none
-Environment=OTEL_METRICS_EXPORTER=none
-Environment=OTEL_LOGS_EXPORTER=none
-ExecStart=/usr/local/bin/gotenberg --api-port=3000
-Restart=on-failure
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
-EOF
-systemctl enable -q --now gotenberg
-msg_ok "Created Service"
-
-motd_ssh
-customize
-cleanup_lxc

install/hammer-install.sh

@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: MickLesk (CanbiZ)
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://github.com/Darkrock-Studios/hammer-editor
-
-source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
-color
-verb_ip6
-catch_errors
-setting_up_container
-network_check
-update_os
-
-msg_info "Installing Dependencies"
-$STD apt install -y \
-  unzip \
-  fontconfig \
-  libfreetype6
-msg_ok "Installed Dependencies"
-
-JAVA_VERSION="21" setup_java
-
-fetch_and_deploy_gh_release "hammer" "Darkrock-Studios/hammer-editor" "prebuild" "latest" "/opt/hammer" "server.zip"
-
-msg_info "Configuring Hammer Sync Server"
-chmod +x /opt/hammer/bin/server
-mkdir -p /opt/hammer_data
-cat <<EOF >/opt/hammer_data/config.toml
-# Hammer Sync Server configuration
-# Reference: https://github.com/Darkrock-Studios/hammer-editor/blob/develop/docs/HOW-TO-RUN-A-SERVER.md
-# Loaded automatically from the data directory. Apply changes with:
-#   systemctl restart hammer
-
-host = "${LOCAL_IP}"
-port = 8080
-
-# Hammer clients speak https only and will not connect to plain HTTP. Either put
-# a TLS reverse proxy in front of this port, or let Hammer terminate TLS itself
-# with a real certificate (self-signed certs are rejected by the clients).
-#
-# Behind a reverse proxy on this host, restrict the plain port to loopback and
-# set the URL the clients actually use:
-# bindHosts = ["127.0.0.1", "::1"]
-# publicUrl = "https://hammer.example.com"
-#
-# Hammer terminating TLS itself:
-# sslPort = 443
-# [sslCert]
-# certChainPath = "/etc/letsencrypt/live/hammer.example.com/fullchain.pem"
-# privateKeyPath = "/etc/letsencrypt/live/hammer.example.com/privkey.pem"
-# forceHttps = true
-
-# Per-page social share images. fontconfig and libfreetype6 are already installed.
-# richLinkPreviews = true
-
-# communityEnabled = true
-
-# Storage defaults to an in-process PostgreSQL under /opt/hammer_data/pgdata.
-# To use an external PostgreSQL instead:
-# [storage]
-# type = "remote"
-# [storage.remote]
-# host = "db.example.com"
-# port = 5432
-# database = "hammer"
-# user = "hammer"
-# password = "change-me"
-# useSsl = true
-
-# Regenerable render/preview caches, default <data dir>/cache.
-# [cache]
-# directory = "/var/tmp/hammer-cache"
-# maxSizeMb = 200
-EOF
-cat <<EOF >/etc/systemd/system/hammer.service
-[Unit]
-Description=Hammer Sync Server
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-Type=simple
-User=root
-WorkingDirectory=/opt/hammer
-Environment=SERVER_OPTS=-Duser.home=/opt
-ExecStart=/opt/hammer/bin/server
-Restart=always
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
-EOF
-systemctl enable -q --now hammer
-msg_ok "Configured Hammer Sync Server"
-
-motd_ssh
-customize
-cleanup_lxc

install/jitsi-meet-install.sh

@@ -13,29 +13,6 @@ setting_up_container
 network_check
 update_os
 
-# Optional public setup. Leave the hostname empty for a LAN-only install
-# (container IP, self-signed certificate) - the previous default behaviour.
-if [[ -z "${var_jitsi_domain:-}" ]]; then
-  read -rp "${TAB3}Public hostname (FQDN, leave empty to use the container IP): " var_jitsi_domain || true
-fi
-var_jitsi_domain="${var_jitsi_domain:-$LOCAL_IP}"
-
-if [[ "$var_jitsi_domain" != "$LOCAL_IP" ]]; then
-  if [[ -z "${var_jitsi_le_email:-}" ]]; then
-    read -rp "${TAB3}E-mail for Let's Encrypt (leave empty for a self-signed certificate): " var_jitsi_le_email || true
-  fi
-  if [[ -z "${var_jitsi_public_ip:-}" ]]; then
-    read -rp "${TAB3}Public IP behind NAT (leave empty to detect via STUN): " var_jitsi_public_ip || true
-  fi
-  if [[ -z "${var_jitsi_admin_user:-}" ]]; then
-    read -rp "${TAB3}Admin user for secure domain (leave empty to let anyone create rooms): " var_jitsi_admin_user || true
-  fi
-  if [[ -n "${var_jitsi_admin_user:-}" && -z "${var_jitsi_admin_pass:-}" ]]; then
-    read -rsp "${TAB3}Admin password (leave empty to generate): " var_jitsi_admin_pass || true
-    echo
-  fi
-fi
-
 msg_info "Installing Dependencies"
 $STD apt install -y nginx
 msg_ok "Installed Dependencies"
@@ -48,72 +25,11 @@ setup_deb822_repo "jitsi" \
   ""
 
 msg_info "Installing Jitsi Meet"
-echo "jitsi-videobridge2 jitsi-videobridge/jvb-hostname string ${var_jitsi_domain}" | debconf-set-selections
-if [[ -n "${var_jitsi_le_email:-}" ]]; then
-  # acme.sh (used by the packaged Let's Encrypt helper) refuses to install without cron
-  $STD apt install -y cron
-  echo "jitsi-meet-web-config jitsi-meet/cert-choice select Let's Encrypt certificates" | debconf-set-selections
-  echo "jitsi-meet-web-config jitsi-meet/email string ${var_jitsi_le_email}" | debconf-set-selections
-else
-  echo "jitsi-meet-web-config jitsi-meet/cert-choice select Generate a new self-signed certificate" | debconf-set-selections
-fi
-echo "jitsi-meet-web-config jitsi-meet/jaas-choice boolean false" | debconf-set-selections
+echo "jitsi-videobridge2 jitsi-videobridge/jvb-hostname string ${LOCAL_IP}" | debconf-set-selections
+echo "jitsi-meet-web-config jitsi-meet/cert-choice select Generate a new self-signed certificate" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive $STD apt install -y jitsi-meet
 msg_ok "Installed Jitsi Meet"
 
-if [[ -n "${var_jitsi_public_ip:-}" ]]; then
-  msg_info "Configuring NAT mapping"
-  # JVB 2.3+ reads this from jvb.conf; sip-communicator.properties is no longer used
-  cat <<EOF >>/etc/jitsi/videobridge/jvb.conf
-ice4j {
-  harvest {
-    mapping {
-      static-mappings = [
-        { local-address = "${LOCAL_IP}", public-address = "${var_jitsi_public_ip}" }
-      ]
-    }
-  }
-}
-EOF
-  systemctl restart jitsi-videobridge2
-  msg_ok "Configured NAT mapping"
-fi
-
-if [[ -n "${var_jitsi_admin_user:-}" ]]; then
-  msg_info "Configuring Secure Domain"
-  # Only authenticated users may create rooms; guests join via the anonymous domain.
-  # https://jitsi.github.io/handbook/docs/devops-guide/secure-domain/
-  var_jitsi_admin_pass="${var_jitsi_admin_pass:-$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | cut -c1-16)}"
-  sed -i "0,/authentication = \"jitsi-anonymous\"/s//authentication = \"internal_hashed\"/" \
-    "/etc/prosody/conf.avail/${var_jitsi_domain}.cfg.lua"
-  cat <<EOF >>"/etc/prosody/conf.avail/${var_jitsi_domain}.cfg.lua"
-
-VirtualHost "guest.${var_jitsi_domain}"
-    authentication = "anonymous"
-    c2s_require_encryption = false
-EOF
-  cat <<EOF >>/etc/jitsi/jicofo/jicofo.conf
-jicofo {
-  authentication {
-    enabled = true
-    type = XMPP
-    login-url = "${var_jitsi_domain}"
-  }
-}
-EOF
-  sed -i "s|^\s*// anonymousdomain: 'guest.example.com',|    anonymousdomain: 'guest.${var_jitsi_domain}',|" \
-    "/etc/jitsi/meet/${var_jitsi_domain}-config.js"
-  $STD prosodyctl register "${var_jitsi_admin_user}" "${var_jitsi_domain}" "${var_jitsi_admin_pass}"
-  cat <<EOF >~/jitsi-meet.creds
-Jitsi Meet Secure Domain
-Admin User: ${var_jitsi_admin_user}
-Admin Password: ${var_jitsi_admin_pass}
-Add more users: prosodyctl register <name> ${var_jitsi_domain} <password>
-EOF
-  systemctl restart prosody jicofo jitsi-videobridge2
-  msg_ok "Configured Secure Domain"
-fi
-
 motd_ssh
 customize
 cleanup_lxc

install/lemonade-server-install.sh

@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: Jamie (jamiej)
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://github.com/lemonade-sdk/lemonade
-
-source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
-color
-verb_ip6
-catch_errors
-setting_up_container
-network_check
-update_os
-
-setup_deb822_repo \
-  "backports" \
-  "https://ftp-master.debian.org/keys/archive-key-13.asc" \
-  "http://deb.debian.org/debian" \
-  "trixie-backports" \
-  "main"
-
-msg_info "Installing Lemonade Server dependencies"
-$STD apt install -y \
-  fonts-katex \
-  libcpp-httplib0.41 \
-  libmbedcrypto16 \
-  libwebsockets19t64
-msg_ok "Installed Lemonade Server dependencies"
-
-setup_hwaccel
-
-fetch_and_deploy_gh_release "lemonade-server" "lemonade-sdk/lemonade" "binary" "latest" "/tmp" "lemonade-server_*-debian13_$(arch_resolve).deb"
-
-msg_info "Configuring Remote Access"
-systemctl enable -q --now lemond
-for _ in $(seq 1 60); do
-  lemonade status >/dev/null 2>&1 && break
-  sleep 2
-done
-$STD lemonade config set host=0.0.0.0
-systemctl restart lemond
-msg_ok "Configured Remote Access"
-
-motd_ssh
-customize
-cleanup_lxc

tools/addon/dockhand.sh

@@ -1,111 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: MickLesk (CanbiZ)
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://github.com/Finsys/dockhand
-
-if command -v curl >/dev/null 2>&1; then
-  source <(curl -fsSL ${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func)
-  load_functions
-elif command -v wget >/dev/null 2>&1; then
-  source <(wget -qO- ${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func)
-  load_functions
-fi
-source <(curl -fsSL ${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func)
-
-color
-catch_errors
-
-APP="Dockhand"
-APP_TYPE="addon"
-INSTALL_PATH="/opt/dockhand"
-COMPOSE_FILE="${INSTALL_PATH}/docker-compose.yaml"
-DEFAULT_PORT=3000
-
-header_info "$APP"
-
-IP=$(_get_current_ip)
-
-function check_docker() {
-  if ! command -v docker >/dev/null 2>&1; then
-    msg_error "Docker is not installed. This addon requires an existing Docker host/LXC. Exiting."
-    exit 1
-  fi
-  if ! docker compose version >/dev/null 2>&1; then
-    msg_error "Docker Compose plugin is not available. Install it before running this addon. Exiting."
-    exit 1
-  fi
-  msg_ok "Docker $(docker --version | cut -d' ' -f3 | tr -d ',') and Docker Compose are available"
-}
-
-function install_dockhand() {
-  local port="${1:-$DEFAULT_PORT}"
-  check_docker
-
-  msg_info "Creating Compose Project"
-  mkdir -p "$INSTALL_PATH"
-  cat <<EOF >"$COMPOSE_FILE"
-services:
-  dockhand:
-    image: fnsys/dockhand:latest
-    container_name: dockhand
-    restart: unless-stopped
-    ports:
-      - ${port}:3000
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - dockhand_data:/app/data
-
-volumes:
-  dockhand_data:
-EOF
-  msg_ok "Created Compose Project"
-
-  msg_info "Starting ${APP}"
-  cd "$INSTALL_PATH"
-  $STD docker compose up -d
-  msg_ok "Started ${APP}"
-
-  msg_ok "${APP} is reachable at http://${IP}:${port}"
-  echo -e "${TAB}Open the URL and complete the first-run setup wizard to create the admin account."
-}
-
-function update_dockhand() {
-  msg_info "Pulling latest ${APP} image"
-  cd "$INSTALL_PATH"
-  $STD docker compose pull
-  msg_ok "Pulled latest image"
-
-  msg_info "Restarting ${APP}"
-  $STD docker compose up -d --remove-orphans
-  msg_ok "Restarted ${APP}"
-
-  msg_ok "${APP} updated successfully"
-}
-
-function uninstall_dockhand() {
-  msg_info "Removing ${APP}"
-  cd "$INSTALL_PATH"
-  $STD docker compose down --remove-orphans
-  cd /
-  rm -rf "$INSTALL_PATH"
-  msg_ok "${APP} uninstalled (the dockhand_data volume was kept; remove it with: docker volume rm dockhand_data)"
-}
-
-if [[ -f "$COMPOSE_FILE" ]]; then
-  read -r -p "Update (1), Uninstall (2), Cancel (3)? [1/2/3]: " action
-  action="${action//[[:space:]]/}"
-  case "$action" in
-  1) update_dockhand ;;
-  2) uninstall_dockhand ;;
-  3) msg_info "Cancelled" ;;
-  *) msg_error "Invalid input" ;;
-  esac
-else
-  read -r -p "Enter port number (default: ${DEFAULT_PORT}): " PORT_INPUT
-  PORT="${PORT_INPUT:-$DEFAULT_PORT}"
-  read -r -p "Install ${APP}? (y/n): " answer
-  answer="${answer//[[:space:]]/}"
-  [[ "${answer,,}" =~ ^(y|yes)$ ]] && install_dockhand "$PORT" || msg_info "Installation skipped"
-fi

tools/headers/dockhand

@@ -1,6 +0,0 @@
-    ____             __   __                    __
-   / __ \____  _____/ /__/ /_  ____ _____  ____/ /
-  / / / / __ \/ ___/ //_/ __ \/ __ `/ __ \/ __  / 
- / /_/ / /_/ / /__/ ,< / / / / /_/ / / / / /_/ /  
-/_____/\____/\___/_/|_/_/ /_/\__,_/_/ /_/\__,_/   
-                                                  

vm/docker-vm.sh

@@ -2,15 +2,15 @@
 
 # Copyright (c) 2021-2026 community-scripts ORG
 # Author: thost96 (thost96) | michelroegl-brunner | MickLesk
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
 
 # ==============================================================================
 # Docker VM - Creates a Docker-ready Virtual Machine
 # ==============================================================================
 
-COMMUNITY_SCRIPTS_URL="${COMMUNITY_SCRIPTS_URL:-https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main}"
-source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/pve/vm-core.func")
-load_functions
+source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func)
+source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/vm-core.func)
+source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/cloud-init.func) || true
 
 # ==============================================================================
 # SCRIPT VARIABLES
@@ -32,6 +32,8 @@ OS_VERSION=""
 THIN="discard=on,ssd=1,"
 var_arm64="yes"
 
+load_functions
+
 # ==============================================================================
 # ERROR HANDLING & CLEANUP
 # ==============================================================================
@@ -42,70 +44,73 @@ trap 'post_update_to_api "failed" "130"' SIGINT
 trap 'post_update_to_api "failed" "143"' SIGTERM
 trap 'post_update_to_api "failed" "129"; exit 129' SIGHUP
 
+function 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}"
+  post_update_to_api "failed" "${exit_code}"
+  echo -e "\n$error_message\n"
+  cleanup_vmid
+}
+
 # ==============================================================================
 # OS SELECTION FUNCTIONS
 # ==============================================================================
 function select_os() {
-  if [[ "${VM_UNATTENDED:-0}" == "1" ]]; then
-    OS_CHOICE="${VM_OS_VERSION:-debian13}"
-  elif ! OS_CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SELECT OS" --radiolist \
-    "Choose Operating System for Docker VM" 15 68 5 \
+  if OS_CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SELECT OS" --radiolist \
+    "Choose Operating System for Docker VM" 14 68 4 \
     "debian13" "Debian 13 (Trixie) - Latest" ON \
     "debian12" "Debian 12 (Bookworm) - Stable" OFF \
-    "ubuntu2604" "Ubuntu 26.04 LTS (Resolute)" OFF \
     "ubuntu2404" "Ubuntu 24.04 LTS (Noble)" OFF \
     "ubuntu2204" "Ubuntu 22.04 LTS (Jammy)" OFF \
     3>&1 1>&2 2>&3); then
+    case $OS_CHOICE in
+    debian13)
+      OS_TYPE="debian"
+      OS_VERSION="13"
+      OS_CODENAME="trixie"
+      OS_DISPLAY="Debian 13 (Trixie)"
+      ;;
+    debian12)
+      OS_TYPE="debian"
+      OS_VERSION="12"
+      OS_CODENAME="bookworm"
+      OS_DISPLAY="Debian 12 (Bookworm)"
+      ;;
+    ubuntu2404)
+      OS_TYPE="ubuntu"
+      OS_VERSION="24.04"
+      OS_CODENAME="noble"
+      OS_DISPLAY="Ubuntu 24.04 LTS"
+      ;;
+    ubuntu2204)
+      OS_TYPE="ubuntu"
+      OS_VERSION="22.04"
+      OS_CODENAME="jammy"
+      OS_DISPLAY="Ubuntu 22.04 LTS"
+      ;;
+    esac
+    echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}${OS_DISPLAY}${CL}"
+  else
     exit_script
   fi
-
-  case $OS_CHOICE in
-  debian13)
-    OS_TYPE="debian"
-    OS_VERSION="13"
-    OS_CODENAME="trixie"
-    OS_DISPLAY="Debian 13 (Trixie)"
-    ;;
-  debian12)
-    OS_TYPE="debian"
-    OS_VERSION="12"
-    OS_CODENAME="bookworm"
-    OS_DISPLAY="Debian 12 (Bookworm)"
-    ;;
-  ubuntu2604)
-    OS_TYPE="ubuntu"
-    OS_VERSION="26.04"
-    OS_CODENAME="resolute"
-    OS_DISPLAY="Ubuntu 26.04 LTS"
-    ;;
-  ubuntu2404)
-    OS_TYPE="ubuntu"
-    OS_VERSION="24.04"
-    OS_CODENAME="noble"
-    OS_DISPLAY="Ubuntu 24.04 LTS"
-    ;;
-  ubuntu2204)
-    OS_TYPE="ubuntu"
-    OS_VERSION="22.04"
-    OS_CODENAME="jammy"
-    OS_DISPLAY="Ubuntu 22.04 LTS"
-    ;;
-  *)
-    msg_error "Unsupported OS '${OS_CHOICE}' (expected debian13, debian12, ubuntu2604, ubuntu2404 or ubuntu2204)"
-    exit 1
-    ;;
-  esac
-  echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}${OS_DISPLAY}${CL}"
 }
 
 function select_cloud_init() {
-  vm_prompt_cloud_init "root"
-
-  # Ubuntu ships only cloud images; without cloud-init there is no way in.
-  if [ "$OS_TYPE" = "ubuntu" ] && [ "$USE_CLOUD_INIT" != "yes" ]; then
+  if [ "$OS_TYPE" = "ubuntu" ]; then
     USE_CLOUD_INIT="yes"
-    export CLOUDINIT_ENABLE="yes"
-    msg_warn "Ubuntu requires Cloud-Init - enabling it anyway"
+    echo -e "${CLOUD:-${TAB}☁️${TAB}${CL}}${BOLD}${DGN}Cloud-Init: ${BGN}yes (Ubuntu requires Cloud-Init)${CL}"
+    return
+  fi
+
+  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.\n\nNote: Debian without Cloud-Init will use nocloud image with console auto-login." 18 68); then
+    USE_CLOUD_INIT="yes"
+    echo -e "${CLOUD:-${TAB}☁️${TAB}${CL}}${BOLD}${DGN}Cloud-Init: ${BGN}yes${CL}"
+  else
+    USE_CLOUD_INIT="no"
+    echo -e "${CLOUD:-${TAB}☁️${TAB}${CL}}${BOLD}${DGN}Cloud-Init: ${BGN}no${CL}"
   fi
 }
 
@@ -129,14 +134,16 @@ function get_image_url() {
 # SETTINGS FUNCTIONS
 # ==============================================================================
 function default_settings() {
-  vm_apply_machine_type "q35"
   select_os
   select_cloud_init
 
   VMID=$(get_valid_nextid)
+  FORMAT=""
   if [ "$ARCH" = "arm64" ]; then
+    MACHINE=""
     CPU_TYPE=""
   else
+    MACHINE=" -machine q35"
     CPU_TYPE=" -cpu host"
   fi
   DISK_CACHE=""
@@ -151,29 +158,252 @@ function default_settings() {
   START_VM="yes"
   METHOD="default"
 
-  vm_echo_default_settings
+  echo -e "${CONTAINERID}${BOLD}${DGN}Virtual Machine ID: ${BGN}${VMID}${CL}"
+  if [ "$ARCH" = "arm64" ]; then
+    echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}virt (ARM64)${CL}"
+  else
+    echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}Q35 (Modern)${CL}"
+  fi
+  echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}${DISK_SIZE}${CL}"
+  echo -e "${DISKSIZE}${BOLD}${DGN}Disk Cache: ${BGN}None${CL}"
+  echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}${HN}${CL}"
+  echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}$([ "$ARCH" = "arm64" ] && echo "Default" || echo "Host")${CL}"
+  echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}${CORE_COUNT}${CL}"
+  echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}${RAM_SIZE}${CL}"
+  echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}${BRG}${CL}"
+  echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}${MAC}${CL}"
+  echo -e "${VLANTAG}${BOLD}${DGN}VLAN: ${BGN}Default${CL}"
+  echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}Default${CL}"
+  echo -e "${GATEWAY}${BOLD}${DGN}Start VM when completed: ${BGN}yes${CL}"
+  echo -e "${CREATING}${BOLD}${DGN}Creating a Docker VM using the above settings${CL}"
 }
 
 function advanced_settings() {
-  METHOD="advanced"
   select_os
   select_cloud_init
-  vm_prompt_vmid "${VMID:-$(get_valid_nextid)}"
-  vm_prompt_machine_type "q35"
-  vm_prompt_disk_size "10G"
-  vm_prompt_disk_cache "none"
-  vm_prompt_hostname "docker"
-  vm_prompt_cpu_model "host"
-  vm_prompt_cpu_cores "2"
-  vm_prompt_ram "4096"
-  vm_prompt_bridge "vmbr0"
-  vm_prompt_mac "$GEN_MAC"
-  vm_prompt_vlan
-  vm_prompt_mtu
-  vm_prompt_verbose "no"
-  vm_prompt_start_vm "yes"
 
-  if vm_confirm_advanced_settings "Ready to create a Docker VM?"; then
+  # SSH Key selection for Cloud-Init VMs
+  if [ "$USE_CLOUD_INIT" = "yes" ]; then
+    configure_cloudinit_ssh_keys || true
+  fi
+
+  METHOD="advanced"
+  [ -z "${VMID:-}" ] && VMID=$(get_valid_nextid)
+
+  # VM ID
+  while true; do
+    if VMID=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Virtual Machine ID" 8 58 $VMID --title "VIRTUAL MACHINE ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if [ -z "$VMID" ]; then
+        VMID=$(get_valid_nextid)
+      fi
+      if pct status "$VMID" &>/dev/null || qm status "$VMID" &>/dev/null; then
+        echo -e "${CROSS}${RD} ID $VMID is already in use${CL}"
+        sleep 2
+        continue
+      fi
+      echo -e "${CONTAINERID}${BOLD}${DGN}Virtual Machine ID: ${BGN}$VMID${CL}"
+      break
+    else
+      exit_script
+    fi
+  done
+
+  # Machine Type
+  if [ "$ARCH" = "arm64" ]; then
+    FORMAT=""
+    MACHINE=""
+    echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}virt${CL}"
+  elif MACH=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "MACHINE TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+    "q35" "Q35 (Modern, PCIe)" ON \
+    "i440fx" "i440fx (Legacy, PCI)" OFF \
+    3>&1 1>&2 2>&3); then
+    if [ $MACH = q35 ]; then
+      echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}Q35 (Modern)${CL}"
+      FORMAT=""
+      MACHINE=" -machine q35"
+    else
+      echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}i440fx (Legacy)${CL}"
+      FORMAT=",efitype=4m"
+      MACHINE=""
+    fi
+  else
+    exit_script
+  fi
+
+  # Disk Size
+  if DISK_SIZE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Disk Size in GiB (e.g., 10, 20)" 8 58 "$DISK_SIZE" --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+    DISK_SIZE=$(echo "$DISK_SIZE" | tr -d ' ')
+    if [[ "$DISK_SIZE" =~ ^[0-9]+$ ]]; then
+      DISK_SIZE="${DISK_SIZE}G"
+      echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}$DISK_SIZE${CL}"
+    elif [[ "$DISK_SIZE" =~ ^[0-9]+G$ ]]; then
+      echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}$DISK_SIZE${CL}"
+    else
+      echo -e "${DISKSIZE}${BOLD}${RD}Invalid Disk Size. Please use a number (e.g., 10 or 10G).${CL}"
+      exit_script
+    fi
+  else
+    exit_script
+  fi
+
+  # Disk Cache
+  if DISK_CACHE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DISK CACHE" --radiolist "Choose" --cancel-button Exit-Script 10 58 2 \
+    "0" "None (Default)" ON \
+    "1" "Write Through" OFF \
+    3>&1 1>&2 2>&3); then
+    if [ $DISK_CACHE = "1" ]; then
+      echo -e "${DISKSIZE}${BOLD}${DGN}Disk Cache: ${BGN}Write Through${CL}"
+      DISK_CACHE="cache=writethrough,"
+    else
+      echo -e "${DISKSIZE}${BOLD}${DGN}Disk Cache: ${BGN}None${CL}"
+      DISK_CACHE=""
+    fi
+  else
+    exit_script
+  fi
+
+  # Hostname
+  if VM_NAME=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Hostname" 8 58 docker --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+    if [ -z $VM_NAME ]; then
+      HN="docker"
+    else
+      HN=$(echo "${VM_NAME,,}" | tr -cs 'a-z0-9-' '-' | sed 's/^-//;s/-$//')
+      if [ "$HN" != "${VM_NAME,,}" ]; then
+        whiptail --backtitle "Proxmox VE Helper Scripts" --title "HOSTNAME ADJUSTED" --msgbox "Invalid characters detected. Hostname has been adjusted to:\n\n  $HN" 10 58
+      fi
+    fi
+    echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}$HN${CL}"
+  else
+    exit_script
+  fi
+
+  # CPU Model
+  if [ "$ARCH" = "arm64" ]; then
+    CPU_TYPE=""
+    echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}Default${CL}"
+  elif CPU_TYPE1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CPU MODEL" --radiolist "Choose" --cancel-button Exit-Script 10 58 2 \
+    "1" "Host (Recommended)" ON \
+    "0" "KVM64" OFF \
+    3>&1 1>&2 2>&3); then
+    if [ $CPU_TYPE1 = "1" ]; then
+      echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}Host${CL}"
+      CPU_TYPE=" -cpu host"
+    else
+      echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}KVM64${CL}"
+      CPU_TYPE=""
+    fi
+  else
+    exit_script
+  fi
+
+  # CPU Cores
+  while true; do
+    if CORE_COUNT=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Allocate CPU Cores" 8 58 2 --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if [ -z "$CORE_COUNT" ]; then CORE_COUNT="2"; fi
+      if [[ "$CORE_COUNT" =~ ^[1-9][0-9]*$ ]]; then
+        echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}$CORE_COUNT${CL}"
+        break
+      fi
+      whiptail --backtitle "Proxmox VE Helper Scripts" --title "INVALID INPUT" --msgbox "CPU Cores must be a positive integer (e.g., 2)." 8 58
+    else
+      exit_script
+    fi
+  done
+
+  # RAM Size
+  while true; do
+    if RAM_SIZE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Allocate RAM in MiB" 8 58 4096 --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if [ -z "$RAM_SIZE" ]; then RAM_SIZE="4096"; fi
+      if [[ "$RAM_SIZE" =~ ^[1-9][0-9]*$ ]]; then
+        echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}$RAM_SIZE${CL}"
+        break
+      fi
+      whiptail --backtitle "Proxmox VE Helper Scripts" --title "INVALID INPUT" --msgbox "RAM Size must be a positive integer in MiB (e.g., 4096)." 8 58
+    else
+      exit_script
+    fi
+  done
+
+  # Bridge
+  if BRG=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+    if [ -z $BRG ]; then
+      BRG="vmbr0"
+    fi
+    echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}$BRG${CL}"
+  else
+    exit_script
+  fi
+
+  # MAC Address
+  while true; do
+    if MAC1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a MAC Address" 8 58 $GEN_MAC --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if [ -z "$MAC1" ]; then
+        MAC="$GEN_MAC"
+        echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}$MAC${CL}"
+        break
+      fi
+      if [[ "$MAC1" =~ ^([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}$ ]]; then
+        MAC="$MAC1"
+        echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}$MAC${CL}"
+        break
+      fi
+      whiptail --backtitle "Proxmox VE Helper Scripts" --title "INVALID INPUT" --msgbox "Invalid MAC address format. Use XX:XX:XX:XX:XX:XX (e.g., AA:BB:CC:DD:EE:FF)." 8 58
+    else
+      exit_script
+    fi
+  done
+
+  # VLAN
+  while true; do
+    if VLAN1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Vlan (leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if [ -z "$VLAN1" ]; then
+        VLAN1="Default"
+        VLAN=""
+        echo -e "${VLANTAG}${BOLD}${DGN}VLAN: ${BGN}$VLAN1${CL}"
+        break
+      fi
+      if [[ "$VLAN1" =~ ^[0-9]+$ ]] && [ "$VLAN1" -ge 1 ] && [ "$VLAN1" -le 4094 ]; then
+        VLAN=",tag=$VLAN1"
+        echo -e "${VLANTAG}${BOLD}${DGN}VLAN: ${BGN}$VLAN1${CL}"
+        break
+      fi
+      whiptail --backtitle "Proxmox VE Helper Scripts" --title "INVALID INPUT" --msgbox "VLAN must be a number between 1 and 4094, or leave blank for default." 8 58
+    else
+      exit_script
+    fi
+  done
+
+  # MTU
+  while true; do
+    if MTU1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if [ -z "$MTU1" ]; then
+        MTU1="Default"
+        MTU=""
+        echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}$MTU1${CL}"
+        break
+      fi
+      if [[ "$MTU1" =~ ^[0-9]+$ ]] && [ "$MTU1" -ge 576 ] && [ "$MTU1" -le 65520 ]; then
+        MTU=",mtu=$MTU1"
+        echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}$MTU1${CL}"
+        break
+      fi
+      whiptail --backtitle "Proxmox VE Helper Scripts" --title "INVALID INPUT" --msgbox "MTU Size must be a number between 576 and 65520, or leave blank for default." 8 58
+    else
+      exit_script
+    fi
+  done
+
+  # Start VM
+  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "START VIRTUAL MACHINE" --yesno "Start VM when completed?" 10 58); then
+    echo -e "${GATEWAY}${BOLD}${DGN}Start VM when completed: ${BGN}yes${CL}"
+    START_VM="yes"
+  else
+    echo -e "${GATEWAY}${BOLD}${DGN}Start VM when completed: ${BGN}no${CL}"
+    START_VM="no"
+  fi
+
+  # Confirm
+  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create a Docker VM?" --no-button Do-Over 10 58); then
     echo -e "${CREATING}${BOLD}${DGN}Creating a Docker VM using the above advanced settings${CL}"
   else
     header_info
@@ -182,27 +412,81 @@ function advanced_settings() {
   fi
 }
 
+function start_script() {
+  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
+    header_info
+    echo -e "${DEFAULT}${BOLD}${BL}Using Default Settings${CL}"
+    default_settings
+  else
+    header_info
+    echo -e "${ADVANCED}${BOLD}${RD}Using Advanced Settings${CL}"
+    advanced_settings
+  fi
+}
 
 # ==============================================================================
 # MAIN EXECUTION
 # ==============================================================================
 header_info
 
-vm_preflight
+check_root
+arch_check
+pve_check
 
-vm_start_script "Use Default Settings?" 10 58
+if whiptail --backtitle "Proxmox VE Helper Scripts" --title "Docker VM" --yesno "This will create a New Docker VM. Proceed?" 10 58; then
+  :
+else
+  header_info && echo -e "${CROSS}${RD}User exited script${CL}\n" && exit
+fi
+
+start_script
 post_to_api_vm
 
 # ==============================================================================
 # STORAGE SELECTION
 # ==============================================================================
-vm_select_storage "$HN"
+msg_info "Validating Storage"
+while read -r line; do
+  TAG=$(echo $line | awk '{print $1}')
+  TYPE=$(echo $line | awk '{printf "%-10s", $2}')
+  FREE=$(echo $line | numfmt --field 4-6 --from-unit=K --to=iec --format %.2f | awk '{printf( "%9sB", $6)}')
+  ITEM="  Type: $TYPE Free: $FREE "
+  OFFSET=2
+  if [[ $((${#ITEM} + $OFFSET)) -gt ${MSG_MAX_LENGTH:-} ]]; then
+    MSG_MAX_LENGTH=$((${#ITEM} + $OFFSET))
+  fi
+  STORAGE_MENU+=("$TAG" "$ITEM" "OFF")
+done < <(pvesm status -content images | awk 'NR>1')
+
+VALID=$(pvesm status -content images | awk 'NR>1')
+if [ -z "$VALID" ]; then
+  msg_error "Unable to detect a valid storage location."
+  exit
+elif [ $((${#STORAGE_MENU[@]} / 3)) -eq 1 ]; then
+  STORAGE=${STORAGE_MENU[0]}
+else
+  if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID >/dev/null; then kill $SPINNER_PID >/dev/null; fi
+  printf "\e[?25h"
+  while [ -z "${STORAGE:+x}" ]; do
+    STORAGE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "Storage Pools" --radiolist \
+      "Which storage pool would you like to use for ${HN}?\nTo make a selection, use the Spacebar.\n" \
+      16 $(($MSG_MAX_LENGTH + 23)) 6 \
+      "${STORAGE_MENU[@]}" 3>&1 1>&2 2>&3)
+  done
+fi
+msg_ok "Using ${CL}${BL}$STORAGE${CL} ${GN}for Storage Location."
+msg_ok "Virtual Machine ID is ${CL}${BL}$VMID${CL}."
 
 # ==============================================================================
 # PREREQUISITES
 # ==============================================================================
-vm_ensure_virt_customize
-$STD apt-get -qq install lsb-release dhcpcd-base -y 2>/dev/null || true
+if ! command -v virt-customize &>/dev/null; then
+  msg_info "Installing libguestfs-tools"
+  apt-get -qq update >/dev/null
+  apt-get -qq install libguestfs-tools lsb-release -y >/dev/null
+  apt-get -qq install dhcpcd-base -y >/dev/null 2>&1 || true
+  msg_ok "Installed libguestfs-tools"
+fi
 
 # ==============================================================================
 # IMAGE DOWNLOAD
@@ -214,8 +498,13 @@ CACHE_FILE="$CACHE_DIR/$(basename "$URL")"
 mkdir -p "$CACHE_DIR"
 msg_ok "${CL}${BL}${URL}${CL}"
 
-MIN_IMAGE_BYTES=$((100 * 1024 * 1024))
-vm_fetch_image "$URL" "$CACHE_FILE" --cache --min-bytes "$MIN_IMAGE_BYTES" || exit 115
+if [[ ! -s "$CACHE_FILE" ]]; then
+  curl -f#SL -o "$CACHE_FILE" "$URL"
+  echo -en "\e[1A\e[0K"
+  msg_ok "Downloaded ${CL}${BL}$(basename "$CACHE_FILE")${CL}"
+else
+  msg_ok "Using cached image ${CL}${BL}$(basename "$CACHE_FILE")${CL}"
+fi
 
 # ==============================================================================
 # STORAGE TYPE DETECTION
@@ -250,13 +539,6 @@ msg_info "Preparing ${OS_DISPLAY} image with Docker"
 WORK_FILE=$(mktemp --suffix=.qcow2)
 cp "$CACHE_FILE" "$WORK_FILE"
 
-# qm resize only grows the block device. Without cloud-init nothing grows the
-# guest partition, so expand the working copy offline first.
-if [ "${USE_CLOUD_INIT:-no}" != "yes" ]; then
-  msg_info "Expanding the root filesystem to ${DISK_SIZE}"
-  vm_expand_image "$WORK_FILE" "$DISK_SIZE" || true
-fi
-
 export LIBGUESTFS_BACKEND_SETTINGS=dns=8.8.8.8,1.1.1.1
 
 DOCKER_PREINSTALLED="no"
@@ -295,7 +577,9 @@ fi
 
 msg_info "Finalizing image (hostname, SSH config)"
 # Set hostname and prepare for unique machine-id
-vm_prepare_cloud_image "$WORK_FILE" "$HN" || true
+virt-customize -q -a "$WORK_FILE" --hostname "${HN}" >/dev/null 2>&1 || true
+virt-customize -q -a "$WORK_FILE" --run-command "truncate -s 0 /etc/machine-id" >/dev/null 2>&1 || true
+virt-customize -q -a "$WORK_FILE" --run-command "rm -f /var/lib/dbus/machine-id" >/dev/null 2>&1 || true
 
 # Configure SSH for Cloud-Init
 if [ "$USE_CLOUD_INIT" = "yes" ]; then
@@ -432,17 +716,16 @@ msg_ok "Attached EFI and root disk"
 set_description
 
 # Cloud-Init configuration
-msg_info "Configuring Cloud-Init"
-if vm_provision "$VMID"; then
+if [ "$USE_CLOUD_INIT" = "yes" ]; then
+  msg_info "Configuring Cloud-Init"
+  setup_cloud_init "$VMID" "$STORAGE" "$HN" "yes"
   msg_ok "Cloud-Init configured"
-else
-  msg_warn "VM created, but not provisioned"
 fi
 
 # Start VM
 if [ "$START_VM" == "yes" ]; then
   msg_info "Starting Docker VM"
-  $STD qm start $VMID
+  qm start $VMID >/dev/null 2>&1
   msg_ok "Started Docker VM"
 fi