diff --git a/.build/cassandra-deps-template.xml b/.build/cassandra-deps-template.xml
index ab98e36ab8..e7d8b78ef4 100644
--- a/.build/cassandra-deps-template.xml
+++ b/.build/cassandra-deps-template.xml
@@ -145,7 +145,7 @@
       <artifactId>logback-classic</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.cassandra</groupId>
+      <groupId>org.apache.cassandra</groupId>
       <artifactId>cassandra-driver-core</artifactId>
       <classifier>shaded</classifier>
     </dependency>
diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml
index cb15badbb9..2cb5f8ca0f 100644
--- a/.build/parent-pom-template.xml
+++ b/.build/parent-pom-template.xml
@@ -940,9 +940,9 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>com.datastax.cassandra</groupId>
+        <groupId>org.apache.cassandra</groupId>
         <artifactId>cassandra-driver-core</artifactId>
-        <version>3.11.5</version>
+        <version>3.12.1</version>
         <classifier>shaded</classifier>
         <exclusions>
           <exclusion>
diff --git a/CHANGES.txt b/CHANGES.txt
index 6e53c8ac93..09cd12badb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 5.0.4
+ * Upgrade com.datastax.cassandra:cassandra-driver-core:3.11.5 to org.apache.cassandra:cassandra-driver-core:3.12.1 (CASSANDRA-17231)
  * Update netty to 4.1.119.Final and netty-tcnative to 2.0.70.Final (CASSANDRA-20314)
  * Serialization can lose complex deletions in a mutation with multiple collections in a row (CASSANDRA-20449)
  * Improve error messages when initializing auth classes (CASSANDRA-20368)
diff --git a/test/unit/org/apache/cassandra/tools/nodetool/ClientStatsTest.java b/test/unit/org/apache/cassandra/tools/nodetool/ClientStatsTest.java
index d5b01730ef..d4d9d6ec15 100644
--- a/test/unit/org/apache/cassandra/tools/nodetool/ClientStatsTest.java
+++ b/test/unit/org/apache/cassandra/tools/nodetool/ClientStatsTest.java
@@ -166,7 +166,7 @@ public class ClientStatsTest
         tool.assertOnCleanExit();
         String stdout = tool.getStdout();
         assertThat(stdout).containsPattern("Address +SSL +Cipher +Protocol +Version +User +Keyspace +Requests +Driver-Name +Driver-Version");
-        assertThat(stdout).containsPattern("/127.0.0.1:[0-9]+ false undefined undefined [0-9]+ +anonymous +[0-9]+ +DataStax Java Driver 3.11.5");
+        assertThat(stdout).containsPattern("/127.0.0.1:[0-9]+ false undefined undefined [0-9]+ +anonymous +[0-9]+ +Apache Cassandra Java Driver 3.12.1");
         assertThat(stdout).contains("Total connected clients: 2");
         assertThat(stdout).contains("User      Connections");
         assertThat(stdout).contains("anonymous 2");
@@ -179,9 +179,9 @@ public class ClientStatsTest
         tool.assertOnCleanExit();
         String stdout = tool.getStdout();
         assertThat(stdout).containsPattern("Address +SSL +Cipher +Protocol +Version +User +Keyspace +Requests +Driver-Name +Driver-Version +Client-Options");
-        assertThat(stdout).containsPattern("/127.0.0.1:[0-9]+ false undefined undefined [0-9]+ +anonymous +[0-9]+ +DataStax Java Driver 3.11.5");
-        assertThat(stdout).containsPattern("DRIVER_NAME=DataStax Java Driver");
-        assertThat(stdout).containsPattern("DRIVER_VERSION=3.11.5");
+        assertThat(stdout).containsPattern("/127.0.0.1:[0-9]+ false undefined undefined [0-9]+ +anonymous +[0-9]+ +Apache Cassandra Java Driver 3.12.1");
+        assertThat(stdout).containsPattern("DRIVER_NAME=Apache Cassandra Java Driver");
+        assertThat(stdout).containsPattern("DRIVER_VERSION=3.12.1");
         assertThat(stdout).containsPattern("CQL_VERSION=3.0.0");
         assertThat(stdout).contains("Total connected clients: 2");
         assertThat(stdout).contains("User      Connections");