diff --git a/dependencies.md b/dependencies.md
index 3557b49..6f1e7f1 100644
--- a/dependencies.md
+++ b/dependencies.md
@@ -28,7 +28,7 @@
 
 | Dependency                                  | License                                                                                                                                                                                             |
 | ------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [EXASolution JDBC Driver][21]               | [EXAClient License][22]                                                                                                                                                                             |
+| [Exasol JDBC Driver][21]                    | [EXAClient License][22]                                                                                                                                                                             |
 | [spark-connector-common-java][23]           | [MIT License][24]                                                                                                                                                                                   |
 | [Exasol SQL Statement Builder][25]          | [MIT License][26]                                                                                                                                                                                   |
 | [error-reporting-java8][27]                 | [MIT License][28]                                                                                                                                                                                   |
@@ -169,8 +169,8 @@
 [18]: http://zlika.github.io/reproducible-build-maven-plugin
 [19]: https://github.com/itsallcode/openfasttrace-maven-plugin
 [20]: https://www.gnu.org/licenses/gpl-3.0.html
-[21]: http://www.exasol.com
-[22]: https://repo1.maven.org/maven2/com/exasol/exasol-jdbc/7.1.20/exasol-jdbc-7.1.20-license.txt
+[21]: http://www.exasol.com/
+[22]: https://repo1.maven.org/maven2/com/exasol/exasol-jdbc/24.1.2/exasol-jdbc-24.1.2-license.txt
 [23]: https://github.com/exasol/spark-connector-common-java/
 [24]: https://github.com/exasol/spark-connector-common-java/blob/main/LICENSE
 [25]: https://github.com/exasol/sql-statement-builder/
diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md
index 224bf66..44539ae 100644
--- a/doc/changes/changelog.md
+++ b/doc/changes/changelog.md
@@ -1,5 +1,6 @@
 # Changes
 
+* [2.2.0](changes_2.2.0.md)
 * [2.1.8](changes_2.1.8.md)
 * [2.1.7](changes_2.1.7.md)
 * [2.1.6](changes_2.1.6.md)
diff --git a/doc/changes/changes_2.2.0.md b/doc/changes/changes_2.2.0.md
new file mode 100644
index 0000000..5ecac22
--- /dev/null
+++ b/doc/changes/changes_2.2.0.md
@@ -0,0 +1,30 @@
+# Spark Connector 2.2.0, released 2024-08-28
+
+Code name: Fix Exasol-JDBC compatibility, CVE CVE-2024-25638
+
+## Summary
+Fixed issue with Exasol-JDBC parameter change.
+Fixed CVE-2024-25638 in dnsjava:dnsjava:jar:2.1.7:provided (hadoop-client dependency).
+
+## Security
+
+* #228: Fix vulnerability in dnsjava:dnsjava:jar:2.1.7:provided
+
+## Bugfixes
+
+* #227: Spark Connector is not compatible with exasol-jdbc V24+
+
+## Dependency Updates
+
+### Spark Exasol Connector With JDBC
+
+#### Compile Dependency Updates
+
+* Updated `com.exasol:exasol-jdbc:7.1.20` to `24.1.2`
+* Updated `com.exasol:spark-connector-common-java:2.0.1` to `2.0.5`
+
+### Spark Exasol Connector With S3
+
+#### Compile Dependency Updates
+
+* Updated `com.exasol:spark-connector-common-java:2.0.1` to `2.0.5`
diff --git a/exasol-jdbc/src/main/scala/com/exasol/spark/util/ExasolConnectionManager.scala b/exasol-jdbc/src/main/scala/com/exasol/spark/util/ExasolConnectionManager.scala
index 804ebef..677158b 100644
--- a/exasol-jdbc/src/main/scala/com/exasol/spark/util/ExasolConnectionManager.scala
+++ b/exasol-jdbc/src/main/scala/com/exasol/spark/util/ExasolConnectionManager.scala
@@ -82,7 +82,7 @@ final case class ExasolConnectionManager(options: ExasolOptions) {
       .toSeq
       .map { case ((host, port), idx) =>
         val hostWithFingerprint = getHostWithFingerprint(host)
-        val url = s"$WORKER_CONNECTION_PREFIX:$hostWithFingerprint:$port;workerID=$idx;workertoken=$token"
+        val url = s"$WORKER_CONNECTION_PREFIX:$hostWithFingerprint:$port;comment=$idx;workertoken=$token"
         getConnectionStringWithOptions(url)
       }
   }
diff --git a/exasol-jdbc/src/test/scala/com/exasol/spark/util/ExasolConnectionManagerSuite.scala b/exasol-jdbc/src/test/scala/com/exasol/spark/util/ExasolConnectionManagerSuite.scala
index cec74c9..5f6c1fd 100644
--- a/exasol-jdbc/src/test/scala/com/exasol/spark/util/ExasolConnectionManagerSuite.scala
+++ b/exasol-jdbc/src/test/scala/com/exasol/spark/util/ExasolConnectionManagerSuite.scala
@@ -88,6 +88,5 @@ class ExasolConnectionManagerSuite extends AnyFunSuite with Matchers with Mockit
   }
 
   private[this] def getWorkerJdbcUrl(host: String, port: Int, id: Int, token: Long): String =
-    s"jdbc:exa-worker:$host:$port;workerID=$id;workertoken=$token"
-
+    s"jdbc:exa-worker:$host:$port;comment=$id;workertoken=$token"
 }
diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml
index 2c47bdd..c8eb19b 100644
--- a/parent-pom/pom.xml
+++ b/parent-pom/pom.xml
@@ -15,7 +15,7 @@
         <relativePath>pk_generated_parent.pom</relativePath>
     </parent>
     <properties>
-        <revision>2.1.8</revision>
+        <revision>2.2.0</revision>
         <java.version>8</java.version>
         <log4j.version>2.20.0</log4j.version>
         <junit.version>5.10.0</junit.version>
@@ -32,7 +32,7 @@
             <dependency>
                 <groupId>com.exasol</groupId>
                 <artifactId>exasol-jdbc</artifactId>
-                <version>7.1.20</version>
+                <version>24.1.2</version>
             </dependency>
             <dependency>
                 <groupId>com.exasol</groupId>
@@ -342,6 +342,13 @@
                 <artifactId>woodstox-core</artifactId>
                 <version>6.5.1</version>
             </dependency>
+            <!-- Update transitive dependency of org.apache.hadoop:hadoop-client to fix CVE-2024-25638 -->
+            <dependency>
+                <groupId>dnsjava</groupId>
+                <artifactId>dnsjava</artifactId>
+                <version>3.6.1</version>
+                <scope>provided</scope>
+            </dependency>
             <dependency>
                 <!-- Upgrade transitive dependency of org.apache.spark:spark-core_2.13 to fix CVE-2023-42503 -->
                 <groupId>org.apache.commons</groupId>