diff --git a/addons/schedule/common/pom.xml b/addons/schedule/common/pom.xml
index 6e9faaf558..c5a2ae3a0c 100644
--- a/addons/schedule/common/pom.xml
+++ b/addons/schedule/common/pom.xml
@@ -33,9 +33,8 @@
       <artifactId>indy-schedule-model-java</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.cassandra</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>cassandra-driver-mapping</artifactId>
-      <version>${datastaxVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.cassandraunit</groupId>
diff --git a/addons/schedule/model-java/pom.xml b/addons/schedule/model-java/pom.xml
index 1f5993c97c..669195395e 100644
--- a/addons/schedule/model-java/pom.xml
+++ b/addons/schedule/model-java/pom.xml
@@ -28,9 +28,9 @@
   <name>Indy :: Add-Ons :: Schedule :: Java Domain Model</name>
 
   <dependencies>
-    <!--Datastax Java Driver-->
+    <!--Apache Cassandra Java Driver (matches path-mapped-storage)-->
     <dependency>
-      <groupId>com.datastax.cassandra</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>cassandra-driver-mapping</artifactId>
     </dependency>
   </dependencies>
diff --git a/pom.xml b/pom.xml
index 9855de0319..5e3d9d7863 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
     <httpclientVersion>4.5.13</httpclientVersion>
     <otelInstrumentationVersion>1.19.0-alpha</otelInstrumentationVersion>
     <cassandraUnitVersion>3.7.1.0</cassandraUnitVersion>
-    <datastaxVersion>3.11.3</datastaxVersion>
+    <cassandraVersion>3.12.1</cassandraVersion>
     <pathmappedStorageVersion>3.0</pathmappedStorageVersion>
     <o11yphantVersion>1.9.2</o11yphantVersion>
     <swaggerVersion>1.6.6</swaggerVersion>
@@ -1379,6 +1379,15 @@
         <version>${logbackContribVersion}</version>
       </dependency>
 
+      <!-- Managing vulnerable versions of netty from cassandra to avoid CVE -->
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-bom</artifactId>
+        <version>4.1.118.Final</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
       <!-- o11yphant dependencies -->
       <dependency>
         <groupId>org.commonjava.util</groupId>
@@ -1475,16 +1484,16 @@
         <version>${pathmappedStorageVersion}</version>
       </dependency>
 
-      <!--Datastax Java Driver-->
+      <!--Apache Cassandra Java Driver (matches path-mapped-storage)-->
       <dependency>
-        <groupId>com.datastax.cassandra</groupId>
+        <groupId>org.apache.cassandra</groupId>
         <artifactId>cassandra-driver-core</artifactId>
-        <version>${datastaxVersion}</version>
+        <version>${cassandraVersion}</version>
       </dependency>
       <dependency>
-        <groupId>com.datastax.cassandra</groupId>
+        <groupId>org.apache.cassandra</groupId>
         <artifactId>cassandra-driver-mapping</artifactId>
-        <version>${datastaxVersion}</version>
+        <version>${cassandraVersion}</version>
       </dependency>
 
       <dependency>
diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml
index 9ec7b6593d..2c7829276f 100644
--- a/subsys/cassandra/pom.xml
+++ b/subsys/cassandra/pom.xml
@@ -38,13 +38,13 @@
       <groupId>org.commonjava.indy</groupId>
       <artifactId>indy-subsys-trace</artifactId>
     </dependency>
-    <!--Datastax Java Driver-->
+    <!--Apache Cassandra Java Driver (matches path-mapped-storage)-->
     <dependency>
-      <groupId>com.datastax.cassandra</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>cassandra-driver-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.cassandra</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>cassandra-driver-mapping</artifactId>
     </dependency>
   </dependencies>