diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01b61fd75e..4c63fc262e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 - Upgrade ARM PL to version 24.10 (from 23.10).
 - Remove generation of DSA keys for login nodes as DSA, which became unsupported in OpenSSH 9.7+.
 - Set instance ID and instance type information in Slurm upon compute nodes launch.
+- Install NVIDIA drivers without the option 'no-cc-version-check', which is now deprecated in the NVIDIA installer.
 
 3.12.0
 ------
diff --git a/cookbooks/aws-parallelcluster-platform/resources/nvidia_driver/partial/_nvidia_driver_common.rb b/cookbooks/aws-parallelcluster-platform/resources/nvidia_driver/partial/_nvidia_driver_common.rb
index 947e68f49f..5cfa7ea906 100644
--- a/cookbooks/aws-parallelcluster-platform/resources/nvidia_driver/partial/_nvidia_driver_common.rb
+++ b/cookbooks/aws-parallelcluster-platform/resources/nvidia_driver/partial/_nvidia_driver_common.rb
@@ -73,14 +73,13 @@
   end
 
   # Install driver
-  # TODO remove --no-cc-version-check when we can update ubuntu 22 images
   bash 'nvidia.run advanced' do
     user 'root'
     group 'root'
     cwd '/tmp'
     code <<-NVIDIA
       set -e
-      #{compiler_path} ./nvidia.run --silent --dkms --disable-nouveau --no-cc-version-check -m=#{nvidia_kernel_module}
+      #{compiler_path} ./nvidia.run --silent --dkms --disable-nouveau -m=#{nvidia_kernel_module}
       rm -f /tmp/nvidia.run
     NVIDIA
     creates '/usr/bin/nvidia-smi'
diff --git a/cookbooks/aws-parallelcluster-platform/spec/unit/resources/nvidia_driver_spec.rb b/cookbooks/aws-parallelcluster-platform/spec/unit/resources/nvidia_driver_spec.rb
index 2c77cdda36..a1d81426d7 100644
--- a/cookbooks/aws-parallelcluster-platform/spec/unit/resources/nvidia_driver_spec.rb
+++ b/cookbooks/aws-parallelcluster-platform/spec/unit/resources/nvidia_driver_spec.rb
@@ -244,7 +244,7 @@ def self.setup(chef_run, nvidia_driver_version: nil)
                 cwd: '/tmp',
                 creates: '/usr/bin/nvidia-smi'
               )
-              .with_code(%r{CC=/usr/bin/gcc10-gcc ./nvidia.run --silent --dkms --disable-nouveau --no-cc-version-check -m=#{kernel_module}})
+              .with_code(%r{CC=/usr/bin/gcc10-gcc ./nvidia.run --silent --dkms --disable-nouveau -m=#{kernel_module}})
               .with_code(%r{rm -f /tmp/nvidia.run})
           end
         elsif platform == 'ubuntu' && version == '22.04'
@@ -272,7 +272,7 @@ def self.setup(chef_run, nvidia_driver_version: nil)
                                cwd: '/tmp',
                                creates: '/usr/bin/nvidia-smi'
                              )
-              .with_code(%r{#{compiler_path} ./nvidia.run --silent --dkms --disable-nouveau --no-cc-version-check -m=#{kernel_module}})
+              .with_code(%r{#{compiler_path} ./nvidia.run --silent --dkms --disable-nouveau -m=#{kernel_module}})
           end
         else
           it "doesn't install gcc10" do
@@ -286,7 +286,7 @@ def self.setup(chef_run, nvidia_driver_version: nil)
                 cwd: '/tmp',
                 creates: '/usr/bin/nvidia-smi'
               )
-              .with_code(%r{./nvidia.run --silent --dkms --disable-nouveau --no-cc-version-check -m=#{kernel_module}})
+              .with_code(%r{./nvidia.run --silent --dkms --disable-nouveau -m=#{kernel_module}})
               .with_code(%r{rm -f /tmp/nvidia.run})
           end
         end