diff --git a/CPScripts/mailscannerinstaller.sh b/CPScripts/mailscannerinstaller.sh
index 780486854..190a5ebf4 100644
--- a/CPScripts/mailscannerinstaller.sh
+++ b/CPScripts/mailscannerinstaller.sh
@@ -133,7 +133,17 @@ elif [ "$CLNVERSION" = "ID=\"cloudlinux\"" ]; then
 
 elif [[ $Server_OS = "Ubuntu" ]]; then
 
-  apt-get install -y libmysqlclient-dev
+  # Debian 13+ compatibility: libmysqlclient-dev replaced with libmariadb-dev-compat libmariadb-dev
+  if [ -f /etc/debian_version ]; then
+      DEBIAN_VERSION=$(cat /etc/debian_version | cut -d. -f1)
+      if [ "$DEBIAN_VERSION" -ge 13 ] 2>/dev/null; then
+          apt-get install -y libmariadb-dev-compat libmariadb-dev
+      else
+          apt-get install -y libmysqlclient-dev
+      fi
+  else
+      apt-get install -y libmysqlclient-dev
+  fi
 
   apt-get install -y cpanminus gcc perl bzip2 zip make patch automake rpm libarchive-zip-perl libfilesys-df-perl libole-storage-lite-perl libsys-hostname-long-perl libsys-sigaction-perl libregexp-common-net-cidr-perl libmime-tools-perl libdbd-sqlite3-perl binutils build-essential libfilesys-df-perl zlib1g unzip mlocate clamav libdbd-mysql-perl unrar libclamav-dev libclamav-client-perl libclamunrar9
 
diff --git a/CPScripts/spamassassin_tojunk_installer.sh b/CPScripts/spamassassin_tojunk_installer.sh
index 8043f3956..3c76f7a1a 100644
--- a/CPScripts/spamassassin_tojunk_installer.sh
+++ b/CPScripts/spamassassin_tojunk_installer.sh
@@ -19,7 +19,17 @@ if [ "$OS" = "NAME=\"Ubuntu\"" ];then
 if [ "$UBUNTUVERSION" = "VERSION_ID=\"18.04\"" ];then
        apt-get install -y dovecot-managesieved dovecot-sieve dovecot-lmtpd net-tools pflogsumm
 elif [ "$UBUNTUVERSION" = "VERSION_ID=\"20.04\"" ];then
-           apt-get install -y libmysqlclient-dev
+           # Debian 13+ compatibility: libmysqlclient-dev replaced with libmariadb-dev-compat libmariadb-dev
+           if [ -f /etc/debian_version ]; then
+               DEBIAN_VERSION=$(cat /etc/debian_version | cut -d. -f1)
+               if [ "$DEBIAN_VERSION" -ge 13 ] 2>/dev/null; then
+                   apt-get install -y libmariadb-dev-compat libmariadb-dev
+               else
+                   apt-get install -y libmysqlclient-dev
+               fi
+           else
+               apt-get install -y libmysqlclient-dev
+           fi
            sed -e '/deb/ s/^#*/#/' -i /etc/apt/sources.list.d/dovecot.list           
 		   apt install -y dovecot-lmtpd dovecot-managesieved dovecot-sieve net-tools pflogsumm
 fi
diff --git a/cyberpanel.sh b/cyberpanel.sh
index b3c988a92..93ff1279e 100644
--- a/cyberpanel.sh
+++ b/cyberpanel.sh
@@ -1358,11 +1358,30 @@ else
     apt install -y --allow-downgrades libgnutls30=3.6.13-2ubuntu1.3
   fi
 
-  if [[ "$Server_OS_Version" = "22" ]] || [[ "$Server_OS_Version" = "24" ]] ; then
-    DEBIAN_FRONTEND=noninteractive apt install -y dnsutils net-tools htop telnet libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev virtualenv git socat vim unzip zip libmariadb-dev-compat libmariadb-dev
+  # Check if this is Debian (no lsb-release) and use appropriate packages
+  if [[ ! -f /etc/lsb-release ]] && [[ -f /etc/debian_version ]]; then
+    # Pure Debian system - check version for package mapping
+    DEBIAN_VERSION=$(cat /etc/debian_version | cut -d'.' -f1)
+    if [[ $DEBIAN_VERSION -ge 13 ]]; then
+      # Debian 13 (Trixie) - use newer package names
+      DEBIAN_FRONTEND=noninteractive apt install -y dnsutils net-tools htop telnet libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcom-err2 libldap2-dev virtualenv git socat vim unzip zip libmariadb-dev-compat libmariadb-dev
+       Check_Return
+    elif [[ $DEBIAN_VERSION -ge 12 ]]; then
+      # Debian 12 (Bookworm) - use intermediate package names
+      DEBIAN_FRONTEND=noninteractive apt install -y dnsutils net-tools htop telnet libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcom-err2 libldap2-dev virtualenv git socat vim unzip zip libmariadb-dev
+       Check_Return
+    else
+      # Older Debian versions - use original package names
+      DEBIAN_FRONTEND=noninteractive apt install -y dnsutils net-tools htop telnet libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcom-err2 libldap2-dev virtualenv git socat vim unzip zip
+       Check_Return
+    fi
+  elif [[ "$Server_OS_Version" = "22" ]] || [[ "$Server_OS_Version" = "24" ]] ; then
+    # Ubuntu 22.04/24.04 - use newer package names
+    DEBIAN_FRONTEND=noninteractive apt install -y dnsutils net-tools htop telnet libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcom-err2 libldap2-dev virtualenv git socat vim unzip zip libmariadb-dev-compat libmariadb-dev
      Check_Return
   else
-    DEBIAN_FRONTEND=noninteractive apt install -y dnsutils net-tools htop telnet libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev virtualenv git socat vim unzip zip
+    # Older Ubuntu versions - use original package names
+    DEBIAN_FRONTEND=noninteractive apt install -y dnsutils net-tools htop telnet libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcom-err2 libldap2-dev virtualenv git socat vim unzip zip
      Check_Return
   fi