diff --git a/vm/docker-vm.sh b/vm/docker-vm.sh
index 9d77ebd6a..a85a74301 100644
--- a/vm/docker-vm.sh
+++ b/vm/docker-vm.sh
@@ -1,77 +1,46 @@
 #!/usr/bin/env bash
 
 # Copyright (c) 2021-2025 community-scripts ORG
-# Author: thost96 (thost96) | Co-Author: michelroegl-brunner
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Author: thost96 (thost96) | Co-Author: michelroegl-brunner | Refactored: MickLesk
+# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
 
-source /dev/stdin <<<$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/api.func)
-# Load Cloud-Init library for VM configuration
-source /dev/stdin <<<$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/cloud-init.sh) 2>/dev/null || true
+# ==============================================================================
+# Docker VM - Creates a Docker-ready Virtual Machine with optional Portainer
+# ==============================================================================
 
-function header_info() {
-  clear
-  cat <<"EOF"
-    ____             __                _    ____  ___
-   / __ \____  _____/ /_____  _____   | |  / /  |/  /
-  / / / / __ \/ ___/ //_/ _ \/ ___/   | | / / /|_/ /
- / /_/ / /_/ / /__/ ,< /  __/ /       | |/ / /  / /
-/_____/\____/\___/_/|_|\___/_/        |___/_/  /_/
+source /dev/stdin <<<$(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/api.func)
+source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/vm-core.func)
+source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/cloud-init.func) 2>/dev/null || true
+load_functions
 
-EOF
-}
-header_info
-echo -e "\n Loading..."
-GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//')
-RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"
-METHOD=""
+# ==============================================================================
+# SCRIPT VARIABLES
+# ==============================================================================
+APP="Docker"
+APP_TYPE="vm"
 NSAPP="docker-vm"
 var_os="debian"
 var_version="13"
+
+GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//')
+RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"
+METHOD=""
 DISK_SIZE="10G"
 USE_CLOUD_INIT="no"
 INSTALL_PORTAINER="no"
 OS_TYPE=""
 OS_VERSION=""
-
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-
-CL=$(echo "\033[m")
-BOLD=$(echo "\033[1m")
-BFR="\\r\\033[K"
-HOLD=" "
-TAB="  "
-
-CM="${TAB}✔️${TAB}${CL}"
-CROSS="${TAB}✖️${TAB}${CL}"
-INFO="${TAB}💡${TAB}${CL}"
-OS="${TAB}🖥️${TAB}${CL}"
-CONTAINERTYPE="${TAB}📦${TAB}${CL}"
-DISKSIZE="${TAB}💾${TAB}${CL}"
-CPUCORE="${TAB}🧠${TAB}${CL}"
-RAMSIZE="${TAB}🛠️${TAB}${CL}"
-CONTAINERID="${TAB}🆔${TAB}${CL}"
-HOSTNAME="${TAB}🏠${TAB}${CL}"
-BRIDGE="${TAB}🌉${TAB}${CL}"
-GATEWAY="${TAB}🌐${TAB}${CL}"
-DEFAULT="${TAB}⚙️${TAB}${CL}"
-MACADDRESS="${TAB}🔗${TAB}${CL}"
-VLANTAG="${TAB}🏷️${TAB}${CL}"
-CREATING="${TAB}🚀${TAB}${CL}"
-ADVANCED="${TAB}🧩${TAB}${CL}"
-CLOUD="${TAB}☁️${TAB}${CL}"
-
 THIN="discard=on,ssd=1,"
+
+# ==============================================================================
+# ERROR HANDLING & CLEANUP
+# ==============================================================================
 set -e
 trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
 trap cleanup EXIT
 trap 'post_update_to_api "failed" "INTERRUPTED"' SIGINT
 trap 'post_update_to_api "failed" "TERMINATED"' SIGTERM
+
 function error_handler() {
   local exit_code="$?"
   local line_number="$1"
@@ -82,149 +51,9 @@ function error_handler() {
   cleanup_vmid
 }
 
-function get_valid_nextid() {
-  local try_id
-  try_id=$(pvesh get /cluster/nextid)
-  while true; do
-    if [ -f "/etc/pve/qemu-server/${try_id}.conf" ] || [ -f "/etc/pve/lxc/${try_id}.conf" ]; then
-      try_id=$((try_id + 1))
-      continue
-    fi
-    if lvs --noheadings -o lv_name | grep -qE "(^|[-_])${try_id}($|[-_])"; then
-      try_id=$((try_id + 1))
-      continue
-    fi
-    break
-  done
-  echo "$try_id"
-}
-
-function cleanup_vmid() {
-  if qm status $VMID &>/dev/null; then
-    qm stop $VMID &>/dev/null
-    qm destroy $VMID &>/dev/null
-  fi
-}
-
-function cleanup() {
-  popd >/dev/null
-  post_update_to_api "done" "none"
-  rm -rf $TEMP_DIR
-}
-
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-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
-
-function msg_info() {
-  local msg="$1"
-  echo -ne "${TAB}${YW}${HOLD}${msg}${HOLD}"
-}
-
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR}${CM}${GN}${msg}${CL}"
-}
-
-function msg_error() {
-  local msg="$1"
-  echo -e "${BFR}${CROSS}${RD}${msg}${CL}"
-}
-
-function spinner() {
-  local pid=$1
-  local msg="$2"
-  local spin='⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏'
-  local i=0
-
-  echo -ne "${TAB}${YW}${msg} "
-  while kill -0 $pid 2>/dev/null; do
-    i=$(((i + 1) % 10))
-    echo -ne "\b${spin:$i:1}"
-    sleep 0.1
-  done
-  echo -ne "\b"
-}
-
-function check_root() {
-  if [[ "$(id -u)" -ne 0 || $(ps -o comm= -p $PPID) == "sudo" ]]; then
-    clear
-    msg_error "Please run this script as root."
-    echo -e "\nExiting..."
-    sleep 2
-    exit
-  fi
-}
-
-# This function checks the version of Proxmox Virtual Environment (PVE) and exits if the version is not supported.
-# Supported: Proxmox VE 8.0.x – 8.9.x and 9.0 – 9.1
-pve_check() {
-  local PVE_VER
-  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
-
-  # Check for Proxmox VE 8.x: allow 8.0–8.9
-  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
-    local MINOR="${BASH_REMATCH[1]}"
-    if ((MINOR < 0 || MINOR > 9)); then
-      msg_error "This version of Proxmox VE is not supported."
-      msg_error "Supported: Proxmox VE version 8.0 – 8.9"
-      exit 1
-    fi
-    PVE_MAJOR=8
-    return 0
-  fi
-
-  # Check for Proxmox VE 9.x: allow 9.0–9.1
-  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
-    local MINOR="${BASH_REMATCH[1]}"
-    if ((MINOR < 0 || MINOR > 1)); then
-      msg_error "This version of Proxmox VE is not yet supported."
-      msg_error "Supported: Proxmox VE version 9.0 – 9.1"
-      exit 1
-    fi
-    PVE_MAJOR=9
-    return 0
-  fi
-
-  # All other unsupported versions
-  msg_error "This version of Proxmox VE is not supported."
-  msg_error "Supported versions: Proxmox VE 8.0 – 8.x or 9.0 – 9.1"
-  exit 1
-}
-
-function arch_check() {
-  if [ "$(dpkg --print-architecture)" != "amd64" ]; then
-    echo -e "\n ${INFO}${YWB}This script will not work with PiMox! \n"
-    echo -e "\n ${YWB}Visit https://github.com/asylumexp/Proxmox for ARM64 support. \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-
-function ssh_check() {
-  if command -v pveversion >/dev/null 2>&1; then
-    if [ -n "${SSH_CLIENT:+x}" ]; then
-      if whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "SSH DETECTED" --yesno "It's suggested to use the Proxmox shell instead of SSH, since SSH can create issues while gathering variables. Would you like to proceed with using SSH?" 10 62; then
-        echo "you've been warned"
-      else
-        clear
-        exit
-      fi
-    fi
-  fi
-}
-
-function exit-script() {
-  clear
-  echo -e "\n${CROSS}${RD}User exited script${CL}\n"
-  exit
-}
-
+# ==============================================================================
+# OS SELECTION FUNCTIONS
+# ==============================================================================
 function select_os() {
   if OS_CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SELECT OS" --radiolist \
     "Choose Operating System for Docker VM" 14 68 4 \
@@ -261,7 +90,7 @@ function select_os() {
     esac
     echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}${OS_DISPLAY}${CL}"
   else
-    exit-script
+    exit_script
   fi
 }
 
@@ -269,7 +98,7 @@ function select_cloud_init() {
   # Ubuntu only has cloudimg variant (always Cloud-Init), so no choice needed
   if [ "$OS_TYPE" = "ubuntu" ]; then
     USE_CLOUD_INIT="yes"
-    echo -e "${CLOUD}${BOLD}${DGN}Cloud-Init: ${BGN}yes (Ubuntu requires Cloud-Init)${CL}"
+    echo -e "${CLOUD:-${TAB}☁️${TAB}${CL}}${BOLD}${DGN}Cloud-Init: ${BGN}yes (Ubuntu requires Cloud-Init)${CL}"
     return
   fi
 
@@ -277,10 +106,10 @@ function select_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.\n\nNote: Debian without Cloud-Init will use nocloud image with console auto-login." 18 68); then
     USE_CLOUD_INIT="yes"
-    echo -e "${CLOUD}${BOLD}${DGN}Cloud-Init: ${BGN}yes${CL}"
+    echo -e "${CLOUD:-${TAB}☁️${TAB}${CL}}${BOLD}${DGN}Cloud-Init: ${BGN}yes${CL}"
   else
     USE_CLOUD_INIT="no"
-    echo -e "${CLOUD}${BOLD}${DGN}Cloud-Init: ${BGN}no${CL}"
+    echo -e "${CLOUD:-${TAB}☁️${TAB}${CL}}${BOLD}${DGN}Cloud-Init: ${BGN}no${CL}"
   fi
 }
 
@@ -299,9 +128,6 @@ function get_image_url() {
   local arch=$(dpkg --print-architecture)
   case $OS_TYPE in
   debian)
-    # Debian has two variants:
-    # - generic: For Cloud-Init enabled VMs
-    # - nocloud: For VMs without Cloud-Init (has console auto-login)
     if [ "$USE_CLOUD_INIT" = "yes" ]; then
       echo "https://cloud.debian.org/images/cloud/${OS_CODENAME}/latest/debian-${OS_VERSION}-generic-${arch}.qcow2"
     else
@@ -309,23 +135,21 @@ function get_image_url() {
     fi
     ;;
   ubuntu)
-    # Ubuntu only has cloudimg variant (always with Cloud-Init support)
     echo "https://cloud-images.ubuntu.com/${OS_CODENAME}/current/${OS_CODENAME}-server-cloudimg-${arch}.img"
     ;;
   esac
 }
 
+# ==============================================================================
+# SETTINGS FUNCTIONS
+# ==============================================================================
 function default_settings() {
   # OS Selection - ALWAYS ask
   select_os
-
-  # Cloud-Init Selection - ALWAYS ask
   select_cloud_init
-
-  # Portainer Selection - ALWAYS ask
   select_portainer
 
-  # Set defaults for other settings
+  # Set defaults
   VMID=$(get_valid_nextid)
   FORMAT=""
   MACHINE=" -machine q35"
@@ -360,17 +184,15 @@ function default_settings() {
 }
 
 function advanced_settings() {
-  # OS Selection - ALWAYS ask (at the beginning)
+  # OS Selection - ALWAYS ask first
   select_os
-
-  # Cloud-Init Selection - ALWAYS ask (at the beginning)
   select_cloud_init
-
-  # Portainer Selection - ALWAYS ask (at the beginning)
   select_portainer
 
   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
@@ -384,10 +206,11 @@ function advanced_settings() {
       echo -e "${CONTAINERID}${BOLD}${DGN}Virtual Machine ID: ${BGN}$VMID${CL}"
       break
     else
-      exit-script
+      exit_script
     fi
   done
 
+  # Machine Type
   if 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 \
@@ -402,9 +225,10 @@ function advanced_settings() {
       MACHINE=""
     fi
   else
-    exit-script
+    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
@@ -414,12 +238,13 @@ function advanced_settings() {
       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
+      exit_script
     fi
   else
-    exit-script
+    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 \
@@ -432,21 +257,22 @@ function advanced_settings() {
       DISK_CACHE=""
     fi
   else
-    exit-script
+    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"
-      echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}$HN${CL}"
     else
       HN=$(echo ${VM_NAME,,} | tr -d ' ')
-      echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}$HN${CL}"
     fi
+    echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}$HN${CL}"
   else
-    exit-script
+    exit_script
   fi
 
+  # CPU Model
   if 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 \
@@ -459,80 +285,78 @@ function advanced_settings() {
       CPU_TYPE=""
     fi
   else
-    exit-script
+    exit_script
   fi
 
+  # CPU Cores
   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"
-      echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}$CORE_COUNT${CL}"
-    else
-      echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}$CORE_COUNT${CL}"
     fi
+    echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}$CORE_COUNT${CL}"
   else
-    exit-script
+    exit_script
   fi
 
-  if RAM_SIZE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Allocate RAM in MiB" 8 58 2048 --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+  # RAM Size
+  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="2048"
-      echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}$RAM_SIZE${CL}"
-    else
-      echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}$RAM_SIZE${CL}"
+      RAM_SIZE="4096"
     fi
+    echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}$RAM_SIZE${CL}"
   else
-    exit-script
+    exit_script
   fi
 
+  # 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"
-      echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}$BRG${CL}"
-    else
-      echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}$BRG${CL}"
     fi
+    echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}$BRG${CL}"
   else
-    exit-script
+    exit_script
   fi
 
+  # MAC Address
   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}"
     else
       MAC="$MAC1"
-      echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}$MAC1${CL}"
     fi
+    echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}$MAC${CL}"
   else
-    exit-script
+    exit_script
   fi
 
-  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
+  # VLAN
+  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}"
     else
       VLAN=",tag=$VLAN1"
-      echo -e "${VLANTAG}${BOLD}${DGN}VLAN: ${BGN}$VLAN1${CL}"
     fi
+    echo -e "${VLANTAG}${BOLD}${DGN}VLAN: ${BGN}$VLAN1${CL}"
   else
-    exit-script
+    exit_script
   fi
 
+  # MTU
   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}"
     else
       MTU=",mtu=$MTU1"
-      echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}$MTU1${CL}"
     fi
+    echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}$MTU1${CL}"
   else
-    exit-script
+    exit_script
   fi
 
+  # 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"
@@ -541,6 +365,7 @@ function advanced_settings() {
     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
@@ -561,13 +386,163 @@ function start_script() {
     advanced_settings
   fi
 }
+
+# ==============================================================================
+# DOCKER INSTALLATION SCRIPTS
+# ==============================================================================
+function create_docker_install_script() {
+  local file="$1"
+  local with_portainer="$2"
+
+  local portainer_section=""
+  if [ "$with_portainer" = "yes" ]; then
+    portainer_section='
+# Install Portainer
+/root/portainer-install.sh'
+  else
+    portainer_section='
+# Portainer not requested - skip installation'
+  fi
+
+  virt-customize -q -a "${file}" --run-command "cat > /root/install-docker.sh << 'INSTALLEOF'
+#!/bin/bash
+# Log output to file
+exec > /var/log/install-docker.log 2>&1
+echo \"[\$(date)] Starting Docker installation on first boot\"
+
+# Check if Docker is already installed
+if command -v docker >/dev/null 2>&1; then
+  echo \"[\$(date)] Docker already installed, checking if running\"
+  systemctl start docker 2>/dev/null || true
+  if docker info >/dev/null 2>&1; then
+    echo \"[\$(date)] Docker is already working, exiting\"
+    exit 0
+  fi
+fi
+
+# Wait for network to be fully available
+for i in {1..30}; do
+  if ping -c 1 8.8.8.8 >/dev/null 2>&1; then
+    echo \"[\$(date)] Network is available\"
+    break
+  fi
+  echo \"[\$(date)] Waiting for network... attempt \$i/30\"
+  sleep 2
+done
+
+# Configure DNS
+echo \"[\$(date)] Configuring DNS\"
+mkdir -p /etc/systemd/resolved.conf.d
+cat > /etc/systemd/resolved.conf.d/dns.conf << DNSEOF
+[Resolve]
+DNS=8.8.8.8 1.1.1.1
+FallbackDNS=8.8.4.4 1.0.0.1
+DNSEOF
+systemctl restart systemd-resolved 2>/dev/null || true
+
+# Update package lists
+echo \"[\$(date)] Updating package lists\"
+apt-get update
+
+# Install base packages if not already installed
+echo \"[\$(date)] Installing base packages\"
+apt-get install -y qemu-guest-agent curl ca-certificates 2>/dev/null || true
+
+# Install Docker
+echo \"[\$(date)] Installing Docker\"
+curl -fsSL https://get.docker.com | sh
+systemctl enable docker
+systemctl start docker
+
+# Wait for Docker to be ready
+for i in {1..10}; do
+  if docker info >/dev/null 2>&1; then
+    echo \"[\$(date)] Docker is ready\"
+    break
+  fi
+  sleep 1
+done
+${portainer_section}
+
+# Create completion flag
+echo \"[\$(date)] Docker installation completed successfully\"
+touch /root/.docker-installed
+INSTALLEOF" >/dev/null
+
+  virt-customize -q -a "${file}" --run-command "chmod +x /root/install-docker.sh" >/dev/null
+}
+
+function create_portainer_script() {
+  local file="$1"
+
+  virt-customize -q -a "${file}" --run-command 'cat > /root/portainer-install.sh << '"'"'PORTAINEREOF'"'"'
+#!/bin/bash
+exec >> /var/log/install-docker.log 2>&1
+echo "[$(date)] Installing Portainer"
+docker volume create portainer_data 2>/dev/null || true
+docker run -d \
+  -p 9000:9000 \
+  -p 9443:9443 \
+  --name=portainer \
+  --restart=always \
+  -v /var/run/docker.sock:/var/run/docker.sock \
+  -v portainer_data:/data \
+  portainer/portainer-ce:latest
+echo "[$(date)] Portainer installed"
+PORTAINEREOF' >/dev/null
+
+  virt-customize -q -a "${file}" --run-command 'chmod +x /root/portainer-install.sh' >/dev/null
+}
+
+function create_docker_service() {
+  local file="$1"
+
+  virt-customize -q -a "${file}" --run-command 'cat > /etc/systemd/system/install-docker.service << "SERVICEEOF"
+[Unit]
+Description=Install Docker on First Boot
+After=network-online.target
+Wants=network-online.target
+ConditionPathExists=!/root/.docker-installed
+
+[Service]
+Type=oneshot
+ExecStart=/root/install-docker.sh
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
+SERVICEEOF
+' >/dev/null
+
+  virt-customize -q -a "${file}" --run-command "systemctl enable install-docker.service" >/dev/null
+}
+
+# ==============================================================================
+# MAIN EXECUTION
+# ==============================================================================
+header_info
+echo -e "\n Loading..."
+
 check_root
 arch_check
 pve_check
 ssh_check
+
+TEMP_DIR=$(mktemp -d)
+pushd $TEMP_DIR >/dev/null
+
+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
+# ==============================================================================
 msg_info "Validating Storage"
 while read -r line; do
   TAG=$(echo $line | awk '{print $1}')
@@ -580,6 +555,7 @@ while read -r line; do
   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."
@@ -597,15 +573,20 @@ fi
 msg_ok "Using ${CL}${BL}$STORAGE${CL} ${GN}for Storage Location."
 msg_ok "Virtual Machine ID is ${CL}${BL}$VMID${CL}."
 
+# ==============================================================================
+# PREREQUISITES
+# ==============================================================================
 if ! command -v virt-customize &>/dev/null; then
-  msg_info "Installing Pre-Requisite libguestfs-tools onto Host"
+  msg_info "Installing libguestfs-tools"
   apt-get -qq update >/dev/null
   apt-get -qq install libguestfs-tools lsb-release -y >/dev/null
-  # Workaround for Proxmox VE 9.0 libguestfs issue
   apt-get -qq install dhcpcd-base -y >/dev/null 2>&1 || true
-  msg_ok "Installed libguestfs-tools successfully"
+  msg_ok "Installed libguestfs-tools"
 fi
 
+# ==============================================================================
+# IMAGE DOWNLOAD
+# ==============================================================================
 msg_info "Retrieving the URL for the ${OS_DISPLAY} Qcow2 Disk Image"
 URL=$(get_image_url)
 sleep 2
@@ -615,6 +596,9 @@ echo -en "\e[1A\e[0K"
 FILE=$(basename $URL)
 msg_ok "Downloaded ${CL}${BL}${FILE}${CL}"
 
+# ==============================================================================
+# STORAGE TYPE DETECTION
+# ==============================================================================
 STORAGE_TYPE=$(pvesm status -storage "$STORAGE" | awk 'NR>1 {print $2}')
 case $STORAGE_TYPE in
 nfs | dir)
@@ -631,197 +615,31 @@ btrfs)
   THIN=""
   ;;
 esac
+
 for i in {0,1}; do
   disk="DISK$i"
   eval DISK${i}=vm-${VMID}-disk-${i}${DISK_EXT:-}
   eval DISK${i}_REF=${STORAGE}:${DISK_REF:-}${!disk}
 done
 
+# ==============================================================================
+# IMAGE CUSTOMIZATION
+# ==============================================================================
 echo -e "${INFO}${BOLD}${GN}Preparing ${OS_DISPLAY} Qcow2 Disk Image${CL}"
 
-# Set DNS for libguestfs appliance environment (not the guest)
 export LIBGUESTFS_BACKEND_SETTINGS=dns=8.8.8.8,1.1.1.1
 
-# Create install-docker.sh with Portainer support if requested
+# Create Docker installation scripts
+create_docker_install_script "${FILE}" "$INSTALL_PORTAINER"
+
 if [ "$INSTALL_PORTAINER" = "yes" ]; then
-  virt-customize -q -a "${FILE}" --run-command "cat > /root/install-docker.sh << \"INSTALLEOF\"
-#!/bin/bash
-# Log output to file
-exec > /var/log/install-docker.log 2>&1
-echo \"[\\$(date)] Starting Docker installation on first boot\"
-
-# Check if Docker is already installed
-if command -v docker >/dev/null 2>&1; then
-  echo \"[\\$(date)] Docker already installed, checking if running\"
-  systemctl start docker 2>/dev/null || true
-  if docker info >/dev/null 2>&1; then
-    echo \"[\\$(date)] Docker is already working, exiting\"
-    exit 0
-  fi
+  create_portainer_script "${FILE}"
 fi
 
-# Wait for network to be fully available
-for i in {1..30}; do
-  if ping -c 1 8.8.8.8 >/dev/null 2>&1; then
-    echo \"[\\$(date)] Network is available\"
-    break
-  fi
-  echo \"[\\$(date)] Waiting for network... attempt \\\$i/30\"
-  sleep 2
-done
+create_docker_service "${FILE}"
 
-# Configure DNS
-echo \"[\\$(date)] Configuring DNS\"
-mkdir -p /etc/systemd/resolved.conf.d
-cat > /etc/systemd/resolved.conf.d/dns.conf << DNSEOF
-[Resolve]
-DNS=8.8.8.8 1.1.1.1
-FallbackDNS=8.8.4.4 1.0.0.1
-DNSEOF
-systemctl restart systemd-resolved 2>/dev/null || true
-
-# Update package lists
-echo \"[\\$(date)] Updating package lists\"
-apt-get update
-
-# Install base packages if not already installed
-echo \"[\\$(date)] Installing base packages\"
-apt-get install -y qemu-guest-agent curl ca-certificates 2>/dev/null || true
-
-# Install Docker
-echo \"[\\$(date)] Installing Docker\"
-curl -fsSL https://get.docker.com | sh
-systemctl enable docker
-systemctl start docker
-
-# Wait for Docker to be ready
-for i in {1..10}; do
-  if docker info >/dev/null 2>&1; then
-    echo \"[\\$(date)] Docker is ready\"
-    break
-  fi
-  sleep 1
-done
-
-# Install Portainer
-/root/portainer-install.sh
-
-# Create completion flag
-echo \"[\\$(date)] Docker installation completed successfully\"
-touch /root/.docker-installed
-INSTALLEOF" >/dev/null
-else
-  virt-customize -q -a "${FILE}" --run-command "cat > /root/install-docker.sh << \"INSTALLEOF\"
-#!/bin/bash
-# Log output to file
-exec > /var/log/install-docker.log 2>&1
-echo \"[\\$(date)] Starting Docker installation on first boot\"
-
-# Check if Docker is already installed
-if command -v docker >/dev/null 2>&1; then
-  echo \"[\\$(date)] Docker already installed, checking if running\"
-  systemctl start docker 2>/dev/null || true
-  if docker info >/dev/null 2>&1; then
-    echo \"[\\$(date)] Docker is already working, exiting\"
-    exit 0
-  fi
-fi
-
-# Wait for network to be fully available
-for i in {1..30}; do
-  if ping -c 1 8.8.8.8 >/dev/null 2>&1; then
-    echo \"[\\$(date)] Network is available\"
-    break
-  fi
-  echo \"[\\$(date)] Waiting for network... attempt \\\$i/30\"
-  sleep 2
-done
-
-# Configure DNS
-echo \"[\\$(date)] Configuring DNS\"
-mkdir -p /etc/systemd/resolved.conf.d
-cat > /etc/systemd/resolved.conf.d/dns.conf << DNSEOF
-[Resolve]
-DNS=8.8.8.8 1.1.1.1
-FallbackDNS=8.8.4.4 1.0.0.1
-DNSEOF
-systemctl restart systemd-resolved 2>/dev/null || true
-
-# Update package lists
-echo \"[\\$(date)] Updating package lists\"
-apt-get update
-
-# Install base packages if not already installed
-echo \"[\\$(date)] Installing base packages\"
-apt-get install -y qemu-guest-agent curl ca-certificates 2>/dev/null || true
-
-# Install Docker
-echo \"[\\$(date)] Installing Docker\"
-curl -fsSL https://get.docker.com | sh
-systemctl enable docker
-systemctl start docker
-
-# Wait for Docker to be ready
-for i in {1..10}; do
-  if docker info >/dev/null 2>&1; then
-    echo \"[\\$(date)] Docker is ready\"
-    break
-  fi
-  sleep 1
-done
-
-# Portainer not requested - skip installation
-
-# Create completion flag
-echo \"[\\$(date)] Docker installation completed successfully\"
-touch /root/.docker-installed
-INSTALLEOF" >/dev/null
-fi
-
-# Add Portainer installation script if requested
-if [ "$INSTALL_PORTAINER" = "yes" ]; then
-  virt-customize -q -a "${FILE}" --run-command 'cat > /root/portainer-install.sh << '"'"'PORTAINEREOF'"'"'
-#!/bin/bash
-exec >> /var/log/install-docker.log 2>&1
-echo "[$(date)] Installing Portainer"
-docker volume create portainer_data 2>/dev/null || true
-docker run -d \
-  -p 9000:9000 \
-  -p 9443:9443 \
-  --name=portainer \
-  --restart=always \
-  -v /var/run/docker.sock:/var/run/docker.sock \
-  -v portainer_data:/data \
-  portainer/portainer-ce:latest
-echo "[$(date)] Portainer installed"
-PORTAINEREOF' >/dev/null
-
-  virt-customize -q -a "${FILE}" --run-command 'chmod +x /root/portainer-install.sh' >/dev/null
-fi
-
-virt-customize -q -a "${FILE}" --run-command "chmod +x /root/install-docker.sh" >/dev/null
-
-virt-customize -q -a "${FILE}" --run-command 'cat > /etc/systemd/system/install-docker.service << "SERVICEEOF"
-[Unit]
-Description=Install Docker on First Boot
-After=network-online.target
-Wants=network-online.target
-ConditionPathExists=!/root/.docker-installed
-
-[Service]
-Type=oneshot
-ExecStart=/root/install-docker.sh
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
-SERVICEEOF
-' >/dev/null
-
-virt-customize -q -a "${FILE}" --run-command "systemctl enable install-docker.service" >/dev/null
-
-# Try to install packages and Docker during image customization
-DOCKER_INSTALLED_ON_FIRST_BOOT="yes" # Assume first-boot by default
+# Try to install packages during image customization
+DOCKER_INSTALLED_ON_FIRST_BOOT="yes"
 
 msg_info "Installing base packages (qemu-guest-agent, curl, ca-certificates)"
 if virt-customize -a "${FILE}" --install qemu-guest-agent,curl,ca-certificates >/dev/null 2>&1; then
@@ -845,15 +663,13 @@ if virt-customize -a "${FILE}" --install qemu-guest-agent,curl,ca-certificates >
 }
 DOCKEREOF" >/dev/null 2>&1
 
-    # Create completion flag to prevent first-boot script from running
     virt-customize -q -a "${FILE}" --run-command "touch /root/.docker-installed" >/dev/null 2>&1
-
     DOCKER_INSTALLED_ON_FIRST_BOOT="no"
   else
-    msg_ok "Docker will be installed on first boot (installation failed during image preparation)"
+    msg_ok "Docker will be installed on first boot"
   fi
 else
-  msg_ok "Packages will be installed on first boot (network not available during image preparation)"
+  msg_ok "Packages will be installed on first boot"
 fi
 
 # Set hostname and clean machine-id
@@ -861,23 +677,27 @@ virt-customize -q -a "${FILE}" --hostname "${HN}" >/dev/null 2>&1
 virt-customize -q -a "${FILE}" --run-command "truncate -s 0 /etc/machine-id" >/dev/null 2>&1
 virt-customize -q -a "${FILE}" --run-command "rm -f /var/lib/dbus/machine-id" >/dev/null 2>&1
 
-# Configure SSH to allow root login with password when Cloud-Init is enabled
-# (Cloud-Init will set the password, but SSH needs to accept password authentication)
+# Configure SSH for Cloud-Init
 if [ "$USE_CLOUD_INIT" = "yes" ]; then
   virt-customize -q -a "${FILE}" --run-command "sed -i 's/^#*PermitRootLogin.*/PermitRootLogin yes/' /etc/ssh/sshd_config" >/dev/null 2>&1 || true
   virt-customize -q -a "${FILE}" --run-command "sed -i 's/^#*PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config" >/dev/null 2>&1 || true
 fi
 
+# Expand disk
 msg_info "Expanding root partition to use full disk space"
 qemu-img create -f qcow2 expanded.qcow2 ${DISK_SIZE} >/dev/null 2>&1
 virt-resize --quiet --expand /dev/sda1 ${FILE} expanded.qcow2 >/dev/null 2>&1
 mv expanded.qcow2 ${FILE} >/dev/null 2>&1
 msg_ok "Expanded image to full size"
 
-msg_info "Creating a Docker VM"
+# ==============================================================================
+# VM CREATION
+# ==============================================================================
+msg_info "Creating Docker VM"
 
 qm create $VMID -agent 1${MACHINE} -tablet 0 -localtime 1 -bios ovmf${CPU_TYPE} -cores $CORE_COUNT -memory $RAM_SIZE \
   -name $HN -tags community-script -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
+
 pvesm alloc $STORAGE $VMID $DISK0 4M 1>&/dev/null
 qm importdisk $VMID ${FILE} $STORAGE ${DISK_IMPORT:-} 1>&/dev/null
 qm set $VMID \
@@ -887,88 +707,55 @@ qm set $VMID \
   -serial0 socket >/dev/null
 qm set $VMID --agent enabled=1 >/dev/null
 
-# Proxmox 9: Enable I/O Thread for better disk performance
+# Proxmox 9: Enable I/O Thread
 if [ "${PVE_MAJOR:-8}" = "9" ]; then
   qm set $VMID -iothread 1 >/dev/null 2>&1 || true
 fi
 
-msg_ok "Created a Docker VM ${CL}${BL}(${HN})${CL}"
+msg_ok "Created Docker VM ${CL}${BL}(${HN})${CL}"
 
-# Add Cloud-Init drive if requested
+# Cloud-Init configuration
 if [ "$USE_CLOUD_INIT" = "yes" ]; then
   msg_info "Configuring Cloud-Init"
   setup_cloud_init "$VMID" "$STORAGE" "$HN" "yes" >/dev/null 2>&1
   msg_ok "Cloud-Init configured"
 fi
 
-DESCRIPTION=$(
-  cat <<EOF
-<div align='center'>
-  <a href='https://Helper-Scripts.com' target='_blank' rel='noopener noreferrer'>
-    <img src='https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/images/logo-81x112.png' alt='Logo' style='width:81px;height:112px;'/>
-  </a>
-
-  <h2 style='font-size: 24px; margin: 20px 0;'>Docker VM</h2>
-
-  <p style='margin: 16px 0;'>
-    <a href='https://ko-fi.com/community_scripts' target='_blank' rel='noopener noreferrer'>
-      <img src='https://img.shields.io/badge/&#x2615;-Buy us a coffee-blue' alt='spend Coffee' />
-    </a>
-  </p>
-
-  <span style='margin: 0 10px;'>
-    <i class="fa fa-github fa-fw" style="color: #f5f5f5;"></i>
-    <a href='https://github.com/community-scripts/ProxmoxVE' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>GitHub</a>
-  </span>
-  <span style='margin: 0 10px;'>
-    <i class="fa fa-comments fa-fw" style="color: #f5f5f5;"></i>
-    <a href='https://github.com/community-scripts/ProxmoxVE/discussions' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>Discussions</a>
-  </span>
-  <span style='margin: 0 10px;'>
-    <i class="fa fa-exclamation-circle fa-fw" style="color: #f5f5f5;"></i>
-    <a href='https://github.com/community-scripts/ProxmoxVE/issues' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>Issues</a>
-  </span>
-</div>
-EOF
-)
-qm set "$VMID" -description "$DESCRIPTION" >/dev/null
+# Set description
+set_description
 
+# Start VM
 if [ "$START_VM" == "yes" ]; then
   msg_info "Starting Docker VM"
   qm start $VMID >/dev/null 2>&1
   msg_ok "Started Docker VM"
 fi
 
-# Try to get VM IP address silently in background (max 10 seconds)
+# ==============================================================================
+# FINAL OUTPUT
+# ==============================================================================
 VM_IP=""
 if [ "$START_VM" == "yes" ]; then
   for i in {1..5}; do
     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 |
       grep -v "^127\." | head -1)
-
-    if [ -n "$VM_IP" ]; then
-      break
-    fi
+    [ -n "$VM_IP" ] && break
     sleep 2
   done
 fi
 
-# Display information about installed components
 echo -e "\n${INFO}${BOLD}${GN}VM Configuration Summary:${CL}"
 echo -e "${TAB}${DGN}VM ID: ${BGN}${VMID}${CL}"
 echo -e "${TAB}${DGN}Hostname: ${BGN}${HN}${CL}"
 echo -e "${TAB}${DGN}OS: ${BGN}${OS_DISPLAY}${CL}"
 
-if [ -n "$VM_IP" ]; then
-  echo -e "${TAB}${DGN}IP Address: ${BGN}${VM_IP}${CL}"
-fi
+[ -n "$VM_IP" ] && echo -e "${TAB}${DGN}IP Address: ${BGN}${VM_IP}${CL}"
 
 if [ "$DOCKER_INSTALLED_ON_FIRST_BOOT" = "yes" ]; then
   echo -e "${TAB}${DGN}Docker: ${BGN}Will be installed on first boot${CL}"
-  echo -e "${TAB}${YW}⚠️  Docker installation will happen automatically after VM starts${CL}"
   echo -e "${TAB}${YW}⚠️  Wait 2-3 minutes after boot for installation to complete${CL}"
-  echo -e "${TAB}${YW}⚠️  Check installation progress: ${BL}cat /var/log/install-docker.log${CL}"
+  echo -e "${TAB}${YW}⚠️  Check progress: ${BL}cat /var/log/install-docker.log${CL}"
 else
   echo -e "${TAB}${DGN}Docker: ${BGN}Latest (via get.docker.com)${CL}"
 fi
@@ -977,13 +764,13 @@ if [ "$INSTALL_PORTAINER" = "yes" ]; then
   if [ -n "$VM_IP" ]; then
     echo -e "${TAB}${DGN}Portainer: ${BGN}https://${VM_IP}:9443${CL}"
   else
-    echo -e "${TAB}${DGN}Portainer: ${BGN}Will be accessible at https://<VM-IP>:9443${CL}"
-    echo -e "${TAB}${YW}⚠️  Wait 2-3 minutes after boot for installation to complete${CL}"
-    echo -e "${TAB}${YW}⚠️  Get IP with: ${BL}qm guest cmd ${VMID} network-get-interfaces${CL}"
+    echo -e "${TAB}${DGN}Portainer: ${BGN}https://<VM-IP>:9443${CL}"
+    echo -e "${TAB}${YW}⚠️  Get IP: ${BL}qm guest cmd ${VMID} network-get-interfaces${CL}"
   fi
 fi
+
 if [ "$USE_CLOUD_INIT" = "yes" ]; then
-  display_cloud_init_info "$VMID" "$HN"
+  display_cloud_init_info "$VMID" "$HN" 2>/dev/null || true
 fi
 
 post_update_to_api "done" "none"
diff --git a/vm/headers/docker-vm b/vm/headers/docker-vm
new file mode 100644
index 000000000..5c9890ed5
--- /dev/null
+++ b/vm/headers/docker-vm
@@ -0,0 +1,6 @@
+    ____             __                _    ____  ___
+   / __ \____  _____/ /_____  _____   | |  / /  |/  /
+  / / / / __ \/ ___/ //_/ _ \/ ___/   | | / / /|_/ /
+ / /_/ / /_/ / /__/ ,< /  __/ /       | |/ / /  / /
+/_____/\____/\___/_/|_|\___/_/        |___/_/  /_/
+