diff --git a/README.md b/README.md
index 71fca8bd..02f5c2b8 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ See the [documentation](https://clickhouse.com/docs/en/integrations/apache-spark
 
 - Java 8 or 17
 - Scala 2.12 or 2.13
-- Apache Spark 3.3 or 3.4 or 3.5
+- Apache Spark 3.3, 3.4, 3.5, or 4.0
 
 Notes:
 1. As of 0.5.0, this connector switches from ClickHouse raw gRPC Client to 
@@ -31,8 +31,8 @@ Notes:
 
 | Version | Compatible Spark Versions | ClickHouse JDBC version |
 |---------|---------------------------|-------------------------|
-| main    | Spark 3.3, 3.4, 3.5       | 0.6.3                   |
-| 0.8.0   | Spark 3.3, 3.4, 3.5       | 0.6.3                   |
+| main    | Spark 3.3, 3.4, 3.5, 4.0  | 0.9.4                   |
+| 0.8.1   | Spark 3.3, 3.4, 3.5       | 0.6.3                   |
 | 0.7.3   | Spark 3.3, 3.4            | 0.4.6                   |
 | 0.6.0   | Spark 3.3                 | 0.3.2-patch11           |
 | 0.5.0   | Spark 3.2, 3.3            | 0.3.2-patch11           |
diff --git a/build.gradle b/build.gradle
index 6f0af275..85b85d6e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -235,8 +235,6 @@ project(':clickhouse-core') {
 
         api("com.clickhouse:client-v2:${clickhouse_client_v2_version}:all") { transitive = false }
 
-        compileOnly "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_api_version"
-
         testFixturesApi "org.slf4j:slf4j-api:$slf4j_version"
         testFixturesApi "org.scalatest:scalatest_$scala_binary_version:$scalatest_version"
         testFixturesRuntimeOnly "com.vladsch.flexmark:flexmark-all:$flexmark_version"
diff --git a/gradle.properties b/gradle.properties
index 664dcc5c..bdeca72c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -38,7 +38,7 @@ spark_35_scala_212_version=2.12.18
 spark_33_scala_213_version=2.13.8
 spark_34_scala_213_version=2.13.8
 spark_35_scala_213_version=2.13.8
-spark_40_scala_213_version=2.13.8
+spark_40_scala_213_version=2.13.16
 
 spark_33_antlr_version=4.8
 spark_34_antlr_version=4.9.3
@@ -48,23 +48,19 @@ spark_40_antlr_version=4.13.1
 spark_33_jackson_version=2.13.4
 spark_34_jackson_version=2.14.2
 spark_35_jackson_version=2.15.2
-spark_40_jackson_version=2.17.0
+spark_40_jackson_version=2.18.2
 
 spark_33_slf4j_version=1.7.32
 spark_34_slf4j_version=2.0.6
 spark_35_slf4j_version=2.0.7
-spark_40_slf4j_version=2.0.7
+spark_40_slf4j_version=2.0.16
 
 # Align with Apache Spark, and don't bundle them in release jar.
-commons_lang3_version=3.12.0
+commons_lang3_version=3.17.0
 commons_codec_version=1.17.2
 
-# javax annotations removed in jdk 11
-# fix build error with jakarta annotations
-jakarta_annotation_api_version=1.3.5
-
 # Test only
-kyuubi_version=1.9.2
+kyuubi_version=1.10.2
 testcontainers_scala_version=0.41.2
 scalatest_version=3.2.19
 flexmark_version=0.62.2