diff --git a/misc/build.func b/misc/build.func
index 94fc86a2..4e596ae8 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -1100,6 +1100,10 @@ start() {
   source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/tools.func)
   if command -v pveversion >/dev/null 2>&1; then
     install_script
+  elif [ ! -z ${PHS_SILENT+x} ] && [[ "${PHS_SILENT}" == "1" ]]; then
+    VERBOSE="no"
+    set_std_mode
+    update_script
   else
     CHOICE=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "${APP} LXC Update/Setting" --menu \
       "Support/Update functions for ${APP} LXC. Choose an option:" \
diff --git a/tools/pve/update-apps.sh b/tools/pve/update-apps.sh
index e7712e4e..0c1a979f 100644
--- a/tools/pve/update-apps.sh
+++ b/tools/pve/update-apps.sh
@@ -1,9 +1,11 @@
 #!/usr/bin/env bash
 
 # Copyright (c) 2021-2025 community-scripts ORG
-# Author: BvdBerg01
+# Author: BvdBerg01 | Co-Author: remz1337
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 
+source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/core.func)
+
 function header_info {
   clear
   cat <<"EOF"
@@ -16,8 +18,6 @@ function header_info {
 EOF
 }
 
-source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/core.func)
-
 header_info
 echo "Loading..."
 whiptail --backtitle "Proxmox VE Helper Scripts" --title "LXC Container Update" --yesno "This will update LXC container. Proceed?" 10 58 || exit
@@ -45,8 +45,8 @@ while read -r container; do
 done <<< "$containers"
 
 CHOICE=$(whiptail --title "LXC Container Update" \
-                   --radiolist "Select LXC container to update:" 25 60 13 \
-                   "${menu_items[@]}" 3>&2 2>&1 1>&3)
+                   --checklist "Select LXC containers to update:" 25 60 13 \
+                   "${menu_items[@]}" 3>&2 2>&1 1>&3 | tr -d '"')
 
 if [ -z "$CHOICE" ]; then
     whiptail --title "LXC Container Update" \
@@ -55,12 +55,21 @@ if [ -z "$CHOICE" ]; then
 fi
 
 header_info
-if(whiptail --backtitle "Proxmox VE Helper Scripts" --title "LXC Container Update" --yesno "Do you want to create a backup from your container?" 10 58); then
+BACKUP_CHOICE="no"
+if(whiptail --backtitle "Proxmox VE Helper Scripts" --title "LXC Container Update" --yesno "Do you want to backup your containers before update?" 10 58); then
+  BACKUP_CHOICE="yes"
+fi
 
+UNATTENDED_UPDATE="no"
+if(whiptail --backtitle "Proxmox VE Helper Scripts" --title "LXC Container Update" --yesno "Run updates unattended?" 10 58); then
+  UNATTENDED_UPDATE="yes"
+fi
+
+if [ "$BACKUP_CHOICE" == "yes" ]; then
   STORAGES=$(awk '/^(\S+):/ {storage=$2} /content.*backup/ {print storage}' /etc/pve/storage.cfg)
 
   if [ -z "$STORAGES" ]; then
-    whiptail --msgbox "Geen opslag met 'backup' gevonden!" 8 40
+    whiptail --msgbox "No storage with 'backup' found!" 8 40
     exit 1
   fi
 
@@ -75,37 +84,148 @@ if(whiptail --backtitle "Proxmox VE Helper Scripts" --title "LXC Container Updat
       msg_error "No storage selected!"
       exit 1
   fi
+fi
 
-  msg_info "Creating backup"
-  vzdump $CHOICE --compress zstd --storage $STORAGE_CHOICE -notes-template "community-scripts backup updater" > /dev/null 2>&1
+function backup_container(){
+  msg_info "Creating backup for container $1"
+  vzdump $1 --compress zstd --storage $STORAGE_CHOICE -notes-template "community-scripts backup updater" > /dev/null 2>&1
   status=$?
 
   if [ $status -eq 0 ]; then
-  msg_ok "Backup created"
-  pct exec $CHOICE -- update --from-pve
-  exit_code=$?
+    msg_ok "Backup created"
   else
-  msg_error "Backup failed"
+    msg_error "Backup failed for container $1"
+    exit 1
   fi
+}
 
-else
-  pct exec $CHOICE -- update --from-pve
-  exit_code=$?
+UPDATE_CMD="update;"
+if [ "$UNATTENDED_UPDATE" == "yes" ];then
+  UPDATE_CMD="export PHS_SILENT=1;update;"
 fi
 
-if [ $exit_code -eq 0 ]; then
-  msg_ok "Update completed"
-else
-  msg_info "Restoring LXC from backup"
-  pct stop $CHOICE
-  LXC_STORAGE=$(pct config $CHOICE | awk -F '[:,]' '/rootfs/ {print $2}')
-  pct restore $CHOICE /var/lib/vz/dump/vzdump-lxc-$CHOICE-*.tar.zst --storage $LXC_STORAGE --force > /dev/null 2>&1
-  pct start $CHOICE
-  restorestatus=$?
-  if [ $restorestatus -eq 0 ]; then
-  msg_ok "Restored LXC from backup"
-  else
-  msg_error "Restored LXC from backup failed"
+containers_needing_reboot=()
+for container in $CHOICE; do
+  msg_info "Updating container $container"
+
+  if [ "BACKUP_CHOICE" == "yes" ];then
+    backup_container $container
   fi
 
+  #1) Detect service using the service name in the update command
+  pushd $(mktemp -d) >/dev/null
+  pct pull "$container" /usr/bin/update update 2>/dev/null
+  service=$(cat update | sed 's|.*/ct/||g' | sed 's|\.sh).*||g')
+  popd >/dev/null
+
+  #1.1) If update script not detected, return
+  if [ -z "${service}" ]; then
+    echo -e "${YW}[WARN]${CL} Update script not found. Skipping to next container"
+    continue
+  else
+    echo -e "${BL}[INFO]${CL} Detected service: ${GN}${service}${CL}"
+  fi
+
+  #2) Extract service build/update resource requirements from config/installation file
+  script=$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/ct/${service}.sh)
+  config=$(pct config "$container")
+  build_cpu=$(echo "$script" | { grep -m 1 "var_cpu" || test $? = 1; } | sed 's|.*=||g' | sed 's|"||g' | sed 's|.*var_cpu:-||g' | sed 's|}||g')
+  build_ram=$(echo "$script" | { grep -m 1 "var_ram" || test $? = 1; } | sed 's|.*=||g' | sed 's|"||g' | sed 's|.*var_ram:-||g' | sed 's|}||g')
+  run_cpu=$(echo "$script" | { grep -m 1 "pct set \$CTID -cores" || test $? = 1; } | sed 's|.*cores ||g')
+  run_ram=$(echo "$script" | { grep -m 1 "pct set \$CTID -memory" || test $? = 1; } | sed 's|.*memory ||g')
+  current_cpu=$(echo "$config" | grep -m 1 "cores:" | sed 's|cores: ||g')
+  current_ram=$(echo "$config" | grep -m 1 "memory:" | sed 's|memory: ||g')
+
+  #Test if all values are valid (>0)
+  if [ -z "${run_cpu}" ] || [ "$run_cpu" -le 0 ]; then
+    #echo "No valid value found for run_cpu. Assuming same as current configuration."
+    run_cpu=$current_cpu
+  fi
+
+  if [ -z "${run_ram}" ] || [ "$run_ram" -le 0 ]; then
+    #echo "No valid value found for run_ram. Assuming same as current configuration."
+    run_ram=$current_ram
+  fi
+
+  if [ -z "${build_cpu}" ] || [ "$build_cpu" -le 0 ]; then
+    #echo "No valid value found for build_cpu. Assuming same as current configuration."
+    build_cpu=$current_cpu
+  fi
+
+  if [ -z "${build_ram}" ] || [ "$build_ram" -le 0 ]; then
+    #echo "No valid value found for build_ram. Assuming same as current configuration."
+    build_ram=$current_ram
+  fi
+
+  UPDATE_BUILD_RESOURCES=0
+  if [ "$build_cpu" -gt "$run_cpu" ] || [ "$build_ram" -gt "$run_ram" ]; then
+    UPDATE_BUILD_RESOURCES=1
+  fi
+
+  #3) if build resources are different than run resources, then:
+  if [ "$UPDATE_BUILD_RESOURCES" -eq "1" ]; then
+    pct set "$container" --cores "$build_cpu" --memory "$build_ram"
+  fi
+
+  os=$(pct config "$container" | awk '/^ostype/ {print $2}')
+
+  #4) Update service, using the update command
+  case "$os" in
+  alpine) pct exec "$container" -- ash -c "$UPDATE_CMD" ;;
+  archlinux) pct exec "$container" -- bash -c "$UPDATE_CMD" ;;
+  fedora | rocky | centos | alma) pct exec "$container" -- bash -c "$UPDATE_CMD" ;;
+  ubuntu | debian | devuan) pct exec "$container" -- bash -c "$UPDATE_CMD" ;;
+  opensuse) pct exec "$container" -- bash -c "$UPDATE_CMD" ;;
+  esac
+  exit_code=$?
+
+  #5) if build resources are different than run resources, then:
+  if [ "$UPDATE_BUILD_RESOURCES" -eq "1" ]; then
+    pct set "$container" --cores "$run_cpu" --memory "$run_ram"
+  fi
+
+  if pct exec "$container" -- [ -e "/var/run/reboot-required" ]; then
+    # Get the container's hostname and add it to the list
+    container_hostname=$(pct exec "$container" hostname)
+    containers_needing_reboot+=("$container ($container_hostname)")
+  fi
+
+  if [ $exit_code -eq 0 ]; then
+    msg_ok "Updated container $container"
+  elif [ "BACKUP_CHOICE" == "yes" ];then
+    msg_info "Restoring LXC from backup"
+    pct stop $container
+    LXC_STORAGE=$(pct config $container | awk -F '[:,]' '/rootfs/ {print $2}')
+    pct restore $container /var/lib/vz/dump/vzdump-lxc-${container}-*.tar.zst --storage $LXC_STORAGE --force > /dev/null 2>&1
+    pct start $container
+    restorestatus=$?
+    if [ $restorestatus -eq 0 ]; then
+      msg_ok "Restored LXC from backup"
+    else
+      msg_error "Restored LXC from backup failed"
+      exit 1
+    fi
+  else
+    msg_error "Update failed for container $container. Exiting"
+    exit 1
+  fi
+done
+
+wait
+header_info
+echo -e "${GN}The process is complete, and the containers have been successfully updated.${CL}\n"
+if [ "${#containers_needing_reboot[@]}" -gt 0 ]; then
+  echo -e "${RD}The following containers require a reboot:${CL}"
+  for container_name in "${containers_needing_reboot[@]}"; do
+    echo "$container_name"
+  done
+  echo -ne "${INFO} Do you wish to reboot these containers? <yes/No>  "
+  read -r prompt
+  if [[ ${prompt,,} =~ ^(yes)$ ]]; then
+    echo -e "${CROSS}${HOLD} ${YWB}Rebooting containers.${CL}"
+    for container_name in "${containers_needing_reboot[@]}"; do
+      container=$(echo $container_name | cut -d " " -f 1)
+      pct reboot ${container}
+    done
+  fi
 fi