diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f6d338a54..6c4ac0e416 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 ------
 
 **CHANGES**
+- Upgrade mysql-community-client to version 8.0.39. 
 
 **BUG FIXES**
 - Fix an issue in the way we get region when manage volumes so that it can correctly handle local zone.
diff --git a/cookbooks/aws-parallelcluster-slurm/resources/mysql_client/partial/_common.rb b/cookbooks/aws-parallelcluster-slurm/resources/mysql_client/partial/_common.rb
index c1fe9e3955..9ce5ac03d5 100644
--- a/cookbooks/aws-parallelcluster-slurm/resources/mysql_client/partial/_common.rb
+++ b/cookbooks/aws-parallelcluster-slurm/resources/mysql_client/partial/_common.rb
@@ -35,11 +35,11 @@
 
 action_class do
   def package_version
-    "8.0.36-1"
+    "8.0.39-1"
   end
 
   def package_source_version
-    "8.0.36"
+    "8.0.39"
   end
 
   def package_filename
diff --git a/cookbooks/aws-parallelcluster-slurm/spec/unit/resources/mysql_client_spec.rb b/cookbooks/aws-parallelcluster-slurm/spec/unit/resources/mysql_client_spec.rb
index 4680cbf2d0..048ddc2972 100644
--- a/cookbooks/aws-parallelcluster-slurm/spec/unit/resources/mysql_client_spec.rb
+++ b/cookbooks/aws-parallelcluster-slurm/spec/unit/resources/mysql_client_spec.rb
@@ -23,8 +23,8 @@ def self.validate(chef_run)
     %w(x86_64 aarch64).each do |architecture|
       context "on #{platform}#{version} #{architecture}" do
         cached(:source_dir) { 'SOURCE_DIR' }
-        cached(:package_source_version) { '8.0.36' }
-        cached(:package_version) { '8.0.36-1' }
+        cached(:package_source_version) { '8.0.39' }
+        cached(:package_version) { '8.0.39-1' }
         cached(:package_filename) { "mysql-community-client-#{package_version}.tar.gz" }
         cached(:s3_url) { 's3://url' }
         cached(:package_platform) do
diff --git a/cookbooks/aws-parallelcluster-slurm/test/controls/mysql_client_spec.rb b/cookbooks/aws-parallelcluster-slurm/test/controls/mysql_client_spec.rb
index 0a1f48de2a..bbe1ddf088 100644
--- a/cookbooks/aws-parallelcluster-slurm/test/controls/mysql_client_spec.rb
+++ b/cookbooks/aws-parallelcluster-slurm/test/controls/mysql_client_spec.rb
@@ -32,7 +32,7 @@
   mysql_packages.each do |pkg|
     describe package(pkg) do
       it { should be_installed }
-      its('version') { should match /^8.0.36-/ } unless ubuntu
+      its('version') { should match /^8.0.39-/ } unless ubuntu
     end
   end
 end
@@ -48,7 +48,7 @@
     its('content') do
       should eq %(You can get MySQL source code here:
 
-https://#{node['cluster']['region']}-aws-parallelcluster.s3.#{node['cluster']['region']}.amazonaws.com/archives/source/mysql-8.0.36.tar.gz
+https://#{node['cluster']['region']}-aws-parallelcluster.s3.#{node['cluster']['region']}.amazonaws.com/archives/source/mysql-8.0.39.tar.gz
 )
     end
   end