diff --git a/CT-Build/Debian.yaml b/CT-Build/Debian.yaml
index 15cf22c..3a0b71b 100644
--- a/CT-Build/Debian.yaml
+++ b/CT-Build/Debian.yaml
@@ -1547,7 +1547,7 @@ packages:
 #Mysql Repo
   - name: mysql.list
     url: |-
-      deb [signed-by=/usr/share/keyrings/mysql-archive-keyring.gpg arch=amd64] http://repo.mysql.com/apt/debian/ {{ image.release }} mysql-8.0
+      deb [signed-by=/usr/share/keyrings/mysql-archive-keyring.gpg arch=amd64] http://repo.mysql.com/apt/debian/ {{ image.release }} mysql-8.4-lts
     variants:
     - mysql
 
@@ -1737,7 +1737,7 @@ actions:
     echo $password > /opt/Setup/TempMysqlPasswd
     debconf-set-selections <<< "mysql-community-server mysql-community-server/root-pass password $password"
     debconf-set-selections <<< "mysql-community-server mysql-community-server/re-root-pass password $password"
-    debconf-set-selections <<< "mysql-community-server mysql-server/default-auth-override select Use Legacy Authentication Method (Retain MySQL 5.x Compatibility)"
+    debconf-set-selections <<< "mysql-community-server mysql-server/default-auth-override select Use Strong Password Encryption (RECOMMENDED)"
   variants:
   - mysql
 
diff --git a/CT-Files/mysql/Configs/my.cnf b/CT-Files/mysql/Configs/my.cnf
index a703154..d9cf999 100644
--- a/CT-Files/mysql/Configs/my.cnf
+++ b/CT-Files/mysql/Configs/my.cnf
@@ -1,6 +1,12 @@
 [mysqld]
 disable_log_bin
-default-authentication-plugin = mysql_native_password
+# Use legacy authentication method 
+## mysql_native_password    = ON 
+## authentication_policy    = mysql_native_password
+
+# Use recommended authentication method 
+authentication_policy   = caching_sha2_password
+
 user            = mysql
 pid-file        = /var/run/mysqld/mysqld.pid
 socket          = /var/run/mysqld/mysqld.sock