diff --git a/.circleci/config.yml.PAID b/.circleci/config.yml.PAID
index 6d4254c235..667157ff60 100644
--- a/.circleci/config.yml.PAID
+++ b/.circleci/config.yml.PAID
@@ -21,7 +21,7 @@ jobs:
   j8_jvm_upgrade_dtests:
     docker:
     - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
-    resource_class: xlarge
+    resource_class: medium
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
     parallelism: 4
@@ -6916,7 +6916,7 @@ jobs:
   j8_jvm_upgrade_dtests_repeat:
     docker:
     - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
-    resource_class: large
+    resource_class: medium
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
     parallelism: 25
@@ -9374,7 +9374,7 @@ jobs:
   j8_jvm_dtests:
     docker:
     - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
-    resource_class: large
+    resource_class: medium
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
     parallelism: 10
diff --git a/.circleci/config_template.yml b/.circleci/config_template.yml
index 1d2c2c6973..2e63afdb8a 100644
--- a/.circleci/config_template.yml
+++ b/.circleci/config_template.yml
@@ -154,6 +154,12 @@ j8_small_par_executor: &j8_small_par_executor
     #exec_resource_class: xlarge
   parallelism: 1
 
+j8_small_parallel_executor: &j8_small_parallel_executor
+  executor:
+    name: java8-executor
+    #exec_resource_class: xlarge
+  parallelism: 1
+
 j8_small_executor: &j8_small_executor
   executor:
     name: java8-executor
@@ -1556,7 +1562,7 @@ jobs:
           target: "testclasslist"
 
   j8_jvm_upgrade_dtests:
-    <<: *j8_medium_par_executor
+    <<: *j8_small_parallel_executor
     steps:
       - attach_workspace:
           at: /home/cassandra
diff --git a/.circleci/config_template.yml.PAID.patch b/.circleci/config_template.yml.PAID.patch
index a39b6ec067..1fe377b52b 100644
--- a/.circleci/config_template.yml.PAID.patch
+++ b/.circleci/config_template.yml.PAID.patch
@@ -1,6 +1,6 @@
---- config-2_1.yml	2023-02-07 21:22:17.000000000 -0500
-+++ config-2_1.yml.MIDRES	2023-02-08 10:15:45.000000000 -0500
-@@ -145,14 +145,14 @@
+--- config_template.yml	2023-08-11 09:57:36.000000000 -0400
++++ config_template.yml.PAID	2023-08-11 09:58:40.000000000 -0400
+@@ -145,20 +145,20 @@
  j8_par_executor: &j8_par_executor
    executor:
      name: java8-executor
@@ -14,12 +14,20 @@
      name: java8-executor
 -    #exec_resource_class: xlarge
 -  parallelism: 1
-+    exec_resource_class: large
++    exec_resource_class: medium
 +  parallelism: 10
  
+ j8_small_parallel_executor: &j8_small_parallel_executor
+   executor:
+     name: java8-executor
+-    #exec_resource_class: xlarge
+-  parallelism: 1
++    exec_resource_class: medium
++  parallelism: 4
+ 
  j8_small_executor: &j8_small_executor
    executor:
-@@ -163,26 +163,38 @@
+@@ -169,26 +169,44 @@
  j8_medium_par_executor: &j8_medium_par_executor
    executor:
      name: java8-executor
@@ -60,12 +68,18 @@
      name: java11-executor
 -    #exec_resource_class: xlarge
 -  parallelism: 1
-+    #exec_resource_class: large
++    exec_resource_class: medium
 +  parallelism: 10
++
++j11_small_parallel_executor: &j11_small_parallel_executor
++  executor:
++    name: java11-executor
++    #exec_resource_class: large
++  parallelism: 4
  
  j11_small_executor: &j11_small_executor
    executor:
-@@ -193,44 +205,56 @@
+@@ -199,44 +217,56 @@
  j11_medium_par_executor: &j11_medium_par_executor
    executor:
      name: java11-executor
@@ -112,7 +126,7 @@
    executor:
      name: java8-executor
 -  parallelism: 4
-+    exec_resource_class: large
++    exec_resource_class: medium
 +  parallelism: 25
  
  j11_repeated_utest_executor: &j11_repeated_utest_executor
@@ -131,7 +145,7 @@
  
  j8_separate_jobs: &j8_separate_jobs
    jobs:
-@@ -1700,7 +1724,7 @@
+@@ -1706,7 +1736,7 @@
            target: testclasslist-system-keyspace-directory
  
    j8_dtests_vnode:
@@ -140,7 +154,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1714,7 +1738,7 @@
+@@ -1720,7 +1750,7 @@
            pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
  
    j8_dtests_offheap:
@@ -149,7 +163,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1728,7 +1752,7 @@
+@@ -1734,7 +1764,7 @@
            pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
  
    j11_dtests_vnode:
@@ -158,7 +172,7 @@
      steps:
      - attach_workspace:
          at: /home/cassandra
-@@ -1743,7 +1767,7 @@
+@@ -1749,7 +1779,7 @@
          pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
  
    j11_dtests_offheap:
@@ -167,7 +181,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1758,7 +1782,7 @@
+@@ -1764,7 +1794,7 @@
            pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
  
    j8_dtests:
@@ -176,7 +190,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1772,7 +1796,7 @@
+@@ -1778,7 +1808,7 @@
            pytest_extra_args: '--skip-resource-intensive-tests'
  
    j11_dtests:
@@ -185,7 +199,7 @@
      steps:
      - attach_workspace:
          at: /home/cassandra
-@@ -1787,7 +1811,7 @@
+@@ -1793,7 +1823,7 @@
          pytest_extra_args: '--skip-resource-intensive-tests'
  
    j8_dtests_large_vnode:
@@ -194,7 +208,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1801,7 +1825,7 @@
+@@ -1807,7 +1837,7 @@
            pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
  
    j8_dtests_large:
@@ -203,7 +217,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1815,7 +1839,7 @@
+@@ -1821,7 +1851,7 @@
            pytest_extra_args: '--num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
  
    j11_dtests_large_vnode:
@@ -212,7 +226,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1829,7 +1853,7 @@
+@@ -1835,7 +1865,7 @@
            pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
  
    j11_dtests_large:
@@ -221,7 +235,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1843,7 +1867,7 @@
+@@ -1849,7 +1879,7 @@
            pytest_extra_args: '--num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
  
    j8_upgrade_dtests:
@@ -230,7 +244,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1857,7 +1881,7 @@
+@@ -1863,7 +1893,7 @@
            pytest_extra_args: '--execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all'
  
    j8_cqlsh-dtests-py2-with-vnodes:
@@ -239,7 +253,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1872,7 +1896,7 @@
+@@ -1878,7 +1908,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
  
    j8_cqlsh-dtests-py2-offheap:
@@ -248,7 +262,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1887,7 +1911,7 @@
+@@ -1893,7 +1923,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
  
    j8_cqlsh_dtests_py3_vnode:
@@ -257,7 +271,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1902,7 +1926,7 @@
+@@ -1908,7 +1938,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
  
    j8_cqlsh_dtests_py3_offheap:
@@ -266,7 +280,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1917,7 +1941,7 @@
+@@ -1923,7 +1953,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
  
    j8_cqlsh_dtests_py38_vnode:
@@ -275,7 +289,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1935,7 +1959,7 @@
+@@ -1941,7 +1971,7 @@
            python_version: '3.8'
  
    j8_cqlsh_dtests_py311_vnode:
@@ -284,7 +298,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1953,7 +1977,7 @@
+@@ -1959,7 +1989,7 @@
            python_version: '3.11'
  
    j8_cqlsh_dtests_py38_offheap:
@@ -293,7 +307,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1971,7 +1995,7 @@
+@@ -1977,7 +2007,7 @@
            python_version: '3.8'
  
    j8_cqlsh_dtests_py311_offheap:
@@ -302,7 +316,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1989,7 +2013,7 @@
+@@ -1995,7 +2025,7 @@
            python_version: '3.11'
  
    j8_cqlsh-dtests-py2-no-vnodes:
@@ -311,7 +325,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -2004,7 +2028,7 @@
+@@ -2010,7 +2040,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
  
    j8_cqlsh_dtests_py3:
@@ -320,7 +334,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -2019,7 +2043,7 @@
+@@ -2025,7 +2055,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
  
    j8_cqlsh_dtests_py38:
@@ -329,7 +343,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -2037,7 +2061,7 @@
+@@ -2043,7 +2073,7 @@
            python_version: '3.8'
  
    j8_cqlsh_dtests_py311:
@@ -338,7 +352,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -2055,7 +2079,7 @@
+@@ -2061,7 +2091,7 @@
            python_version: '3.11'
  
    j11_cqlsh-dtests-py2-with-vnodes:
@@ -347,7 +361,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -2070,7 +2094,7 @@
+@@ -2076,7 +2106,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
  
    j11_cqlsh-dtests-py2-offheap:
@@ -356,7 +370,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -2085,7 +2109,7 @@
+@@ -2091,7 +2121,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
  
    j11_cqlsh_dtests_py3_vnode:
@@ -365,7 +379,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -2100,7 +2124,7 @@
+@@ -2106,7 +2136,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
  
    j11_cqlsh_dtests_py3_offheap:
@@ -374,7 +388,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -2115,7 +2139,7 @@
+@@ -2121,7 +2151,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
  
    j11_cqlsh_dtests_py38_vnode:
@@ -383,7 +397,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -2133,7 +2157,7 @@
+@@ -2139,7 +2169,7 @@
            python_version: '3.8'
  
    j11_cqlsh_dtests_py311_vnode:
@@ -392,7 +406,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -2151,7 +2175,7 @@
+@@ -2157,7 +2187,7 @@
            python_version: '3.11'
  
    j11_cqlsh_dtests_py38_offheap:
@@ -401,7 +415,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -2169,7 +2193,7 @@
+@@ -2175,7 +2205,7 @@
            python_version: '3.8'
  
    j11_cqlsh_dtests_py311_offheap:
@@ -410,7 +424,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -2187,7 +2211,7 @@
+@@ -2193,7 +2223,7 @@
            python_version: '3.11'
  
    j11_cqlsh-dtests-py2-no-vnodes:
@@ -419,7 +433,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -2202,7 +2226,7 @@
+@@ -2208,7 +2238,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
  
    j11_cqlsh_dtests_py3:
@@ -428,7 +442,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -2217,7 +2241,7 @@
+@@ -2223,7 +2253,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
  
    j11_cqlsh_dtests_py38:
@@ -437,7 +451,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -2235,7 +2259,7 @@
+@@ -2241,7 +2271,7 @@
            python_version: '3.8'
  
    j11_cqlsh_dtests_py311:
@@ -446,7 +460,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -3336,3 +3360,4 @@
+@@ -3342,3 +3372,4 @@
        - store_artifacts:
            path: ~/cassandra-dtest/logs
            destination: dtest_logs