diff --git a/.build/run-ci b/.build/run-ci
index 04a257d858..b009eb4c8d 100755
--- a/.build/run-ci
+++ b/.build/run-ci
@@ -82,6 +82,8 @@ def base_job_name(args) -> str:
                 # TODO: add new version each release branching
                 if version.startswith("5.0."):
                     base_job_name._cached_result = "cassandra-5.0"
+                elif version.startswith("6.0"):
+                    base_job_name._cached_result = "cassandra-6.0"
                 else:
                     base_job_name._cached_result = "cassandra"
                 break
diff --git a/.build/run-tests.sh b/.build/run-tests.sh
index b904bc9751..8ec8148cfc 100755
--- a/.build/run-tests.sh
+++ b/.build/run-tests.sh
@@ -203,7 +203,7 @@ _build_all_dtest_jars() {
     [ "${java_version}" -eq 11 ] && export CASSANDRA_USE_JDK11=true
 
     pushd ${TMP_DIR}/cassandra-dtest-jars >/dev/null
-    for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk ; do
+    for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk ; do
         git clean -qxdff && git reset --hard HEAD  || echo "failed to reset/clean ${TMP_DIR}/cassandra-dtest-jars… continuing…"
         git checkout --quiet $branch
         dtest_jar_version=$(grep 'property\s*name=\"base.version\"' build.xml |sed -ne 's/.*value=\"\([^"]*\)\".*/\1/p')
diff --git a/.circleci/config.yml b/.circleci/config.yml
index edcbb164c3..eb7c6d1780 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5045,7 +5045,7 @@ jobs:
           cd ~/cassandra
           mkdir ~/dtest_jars
           git remote add apache https://github.com/apache/cassandra.git
-          for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk; do
+          for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
             # check out the correct cassandra version:
             git remote set-branches --add apache '$branch'
             git fetch --depth 1 apache $branch
diff --git a/.circleci/config.yml.FREE b/.circleci/config.yml.FREE
index edcbb164c3..eb7c6d1780 100644
--- a/.circleci/config.yml.FREE
+++ b/.circleci/config.yml.FREE
@@ -5045,7 +5045,7 @@ jobs:
           cd ~/cassandra
           mkdir ~/dtest_jars
           git remote add apache https://github.com/apache/cassandra.git
-          for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk; do
+          for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
             # check out the correct cassandra version:
             git remote set-branches --add apache '$branch'
             git fetch --depth 1 apache $branch
diff --git a/.circleci/config.yml.PAID b/.circleci/config.yml.PAID
index e10097a426..92a7eccfb6 100644
--- a/.circleci/config.yml.PAID
+++ b/.circleci/config.yml.PAID
@@ -5045,7 +5045,7 @@ jobs:
           cd ~/cassandra
           mkdir ~/dtest_jars
           git remote add apache https://github.com/apache/cassandra.git
-          for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk; do
+          for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
             # check out the correct cassandra version:
             git remote set-branches --add apache '$branch'
             git fetch --depth 1 apache $branch
diff --git a/.circleci/config_template.yml b/.circleci/config_template.yml
index a3e09b1fa0..abae0e8bb0 100644
--- a/.circleci/config_template.yml
+++ b/.circleci/config_template.yml
@@ -2824,7 +2824,7 @@ commands:
           cd ~/cassandra
           mkdir ~/dtest_jars
           git remote add apache https://github.com/apache/cassandra.git
-          for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk; do
+          for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
             # check out the correct cassandra version:
             git remote set-branches --add apache '$branch'
             git fetch --depth 1 apache $branch