diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index dde7d9cdf..993181ccb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,8 +17,8 @@ nmcp = "1.4.4"
 picocli = "4.7.7"
 protobuf-plugin = "0.9.6"
 protobuf = "3.25.8"
-scala-2-12 = "2.12.20"
-scala-2-13 = "2.13.18"
+scala-2-12 = "2.12.21"
+scala-2-13 = "2.12.21"
 scalatest-2-12 = "3.2.19"
 scalatest-2-13 = "3.2.19"
 scalatestplus-junit5-2-12 = "3.2.19.0"
diff --git a/spark/spark-3.4_2.12/build.gradle.kts b/spark/spark-3.4_2.12/build.gradle.kts
index de50e4bfc..f9d247eb8 100644
--- a/spark/spark-3.4_2.12/build.gradle.kts
+++ b/spark/spark-3.4_2.12/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 
 // Spark 3.4 with Scala 2.12 variant configuration
 val sparkVersion = "3.4.4"
-val scalaVersion = "2.12.20"
+val scalaVersion = "2.12.21"
 val sparkMajorMinor = "3.4"
 val scalaBinary = "2.12"
 val classifier = "spark34_2.12"
diff --git a/spark/spark-3.5_2.12/build.gradle.kts b/spark/spark-3.5_2.12/build.gradle.kts
index fd6cdeda9..d6d05c780 100644
--- a/spark/spark-3.5_2.12/build.gradle.kts
+++ b/spark/spark-3.5_2.12/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 
 // Spark 3.5 with Scala 2.12 variant configuration
 val sparkVersion = "3.5.4"
-val scalaVersion = "2.12.20"
+val scalaVersion = "2.12.21"
 val sparkMajorMinor = "3.5"
 val scalaBinary = "2.12"
 val classifier = "spark35_2.12"
diff --git a/spark/spark-4.0_2.13/build.gradle.kts b/spark/spark-4.0_2.13/build.gradle.kts
index e706c7103..758cc1812 100644
--- a/spark/spark-4.0_2.13/build.gradle.kts
+++ b/spark/spark-4.0_2.13/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 
 // Spark 4.0 with Scala 2.13 variant configuration
 val sparkVersion = "4.0.2"
-val scalaVersion = "2.13.18"
+val scalaVersion = "2.12.21"
 val sparkMajorMinor = "4.0"
 val scalaBinary = "2.13"
 val classifier = "spark40_2.13"