diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 4c6633edc..9ff9eb0e6 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -181,9 +181,19 @@
                 <version>1.4.1</version>
             </dependency>
             <dependency>
-                <groupId>com.datastax.oss</groupId>
+                <groupId>org.apache.cassandra</groupId>
+                <artifactId>java-driver-core</artifactId>
+                <version>4.18.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cassandra</groupId>
                 <artifactId>java-driver-query-builder</artifactId>
-                <version>4.17.0</version>
+                <version>4.18.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cassandra</groupId>
+                <artifactId>java-driver-mapper-runtime</artifactId>
+                <version>4.18.1</version>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
@@ -375,6 +385,12 @@
                 <artifactId>js-scriptengine</artifactId>
                 <version>23.1.2</version>
             </dependency>
+            <dependency>
+                <groupId>com.github.stephenc.jcip</groupId>
+                <artifactId>jcip-annotations</artifactId>
+                <scope>provided</scope>
+                <version>1.0-1</version>
+            </dependency>
 
         </dependencies>
     </dependencyManagement>
diff --git a/nb-adapters/adapter-cqld4/pom.xml b/nb-adapters/adapter-cqld4/pom.xml
index 124a9e244..7121b920c 100644
--- a/nb-adapters/adapter-cqld4/pom.xml
+++ b/nb-adapters/adapter-cqld4/pom.xml
@@ -57,15 +57,15 @@
         </dependency>
 
         <dependency>
-            <groupId>com.datastax.oss</groupId>
+            <groupId>org.apache.cassandra</groupId>
             <artifactId>java-driver-core</artifactId>
-            <version>4.17.0</version>
+            <version>4.18.1</version>
         </dependency>
 
         <dependency>
-            <groupId>com.datastax.oss</groupId>
+            <groupId>org.apache.cassandra</groupId>
             <artifactId>java-driver-query-builder</artifactId>
-            <version>4.17.0</version>
+            <version>4.18.1</version>
         </dependency>
 
         <dependency>
@@ -105,6 +105,13 @@
             <artifactId>jackson-core</artifactId>
             <version>2.17.0</version>
         </dependency>
+        <!-- See https://issues.apache.org/jira/browse/CASSANDRA-18969 for more details -->
+        <dependency>
+            <groupId>com.github.stephenc.jcip</groupId>
+            <artifactId>jcip-annotations</artifactId>
+            <scope>provided</scope>
+            <version>1.0-1</version>
+        </dependency>
 
     </dependencies>