diff --git a/.cow.json b/.cow.json
index a1bb3f6..26241b5 100644
--- a/.cow.json
+++ b/.cow.json
@@ -7,20 +7,10 @@
   "child-stability-inherit": [
     "silverstripe/recipe-core",
     "silverstripe/recipe-cms",
-    "silverstripe/recipe-blog",
-    "silverstripe/recipe-form-building",
-    "silverstripe/recipe-authoring-tools",
-    "silverstripe/recipe-collaboration",
-    "silverstripe/recipe-reporting-tools",
-    "silverstripe/recipe-ccl",
-    "silverstripe/recipe-solr-search",
-    "silverstripe/recipe-services",
-    "silverstripe/recipe-content-blocks",
     "silverstripe/installer"
   ],
   "dependency-constraint": "loose",
   "vendors": [
-    "cwp",
     "silverstripe",
     "tractorcow",
     "symbiote",
diff --git a/composer.json b/composer.json
index c221807..32856b7 100644
--- a/composer.json
+++ b/composer.json
@@ -8,31 +8,26 @@
         "php": "^8.3",
         "silverstripe/recipe-plugin": "2.x-dev",
         "silverstripe/installer": "6.x-dev",
-        "silverstripe/recipe-authoring-tools": "3.x-dev",
-        "silverstripe/recipe-blog": "3.x-dev",
-        "silverstripe/recipe-collaboration": "3.x-dev",
-        "silverstripe/recipe-form-building": "3.x-dev",
-        "silverstripe/recipe-reporting-tools": "3.x-dev",
-        "silverstripe/recipe-services": "3.x-dev",
-        "silverstripe/recipe-content-blocks": "4.x-dev",
-        "silverstripe/auditor": "4.x-dev",
+        "silverstripe/blog": "5.x-dev",
         "silverstripe/developer-docs": "6.x-dev",
-        "silverstripe/environmentcheck": "4.x-dev",
         "silverstripe/hybridsessions": "4.x-dev",
-        "silverstripe/registry": "4.x-dev",
         "silverstripe/totp-authenticator": "6.x-dev",
         "silverstripe/mfa": "6.x-dev",
-        "silverstripe/crontask": "4.x-dev",
         "silverstripe/gridfieldqueuedexport": "4.x-dev",
-        "silverstripe/ldap": "3.x-dev",
-        "silverstripe/textextraction": "5.x-dev",
         "silverstripe/realme": "6.x-dev",
-        "silverstripe/webauthn-authenticator": "6.x-dev",
+        "silverstripe/segment-field": "4.x-dev",
+        "silverstripe/sharedraftcontent": "4.x-dev",
+        "silverstripe/spamprotection": "5.x-dev",
         "silverstripe/subsites": "4.x-dev",
         "silverstripe/lumberjack": "4.x-dev",
         "silverstripe/staticpublishqueue": "7.x-dev",
+        "silverstripe/tagfield": "4.x-dev",
+        "silverstripe/taxonomy": "4.x-dev",
+        "silverstripe/textextraction": "5.x-dev",
+        "silverstripe/userforms": "7.x-dev",
+        "dnadesign/silverstripe-elemental": "6.x-dev",
         "dnadesign/silverstripe-elemental-userforms": "5.x-dev",
-        "symbiote/silverstripe-multivaluefield": "7.x-dev",
+        "symbiote/silverstripe-advancedworkflow": "7.x-dev",
         "symbiote/silverstripe-gridfieldextensions": "5.x-dev",
         "symbiote/silverstripe-queuedjobs": "6.x-dev",
         "colymba/gridfield-bulk-editing-tools": "5.x-dev",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b7a5633..d142fdc 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -21,7 +21,6 @@
 
         <testsuite name="recipe-cms">
             <directory>vendor/silverstripe/admin/tests/php/</directory>
-            <directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
             <directory>vendor/silverstripe/asset-admin/tests/php/</directory>
             <directory>vendor/silverstripe/siteconfig/tests/php/</directory>
             <directory>vendor/silverstripe/reports/tests/</directory>
@@ -29,84 +28,50 @@
             <directory>vendor/silverstripe/cms/tests/</directory>
         </testsuite>
 
-        <!-- Optional modules that aren't in recipes -->
-        <testsuite name="Default">
-            <directory>vendor/silverstripe/subsites/tests</directory>
-            <directory>vendor/silverstripe/crontask/tests</directory>
+        <testsuite name="g1">
             <directory>vendor/silverstripe/gridfieldqueuedexport/tests</directory>
             <directory>vendor/silverstripe/errorpage/tests</directory>
-            <directory>vendor/silverstripe/registry/tests</directory>
             <directory>vendor/silverstripe/textextraction/tests</directory>
             <directory>vendor/tractorcow/silverstripe-fluent/tests</directory>
         </testsuite>
 
-        <testsuite name="recipe-ccl">
-            <directory>vendor/silverstripe/auditor/tests</directory>
-            <directory>vendor/silverstripe/environmentcheck/tests</directory>
+        <testsuite name="g2">
             <directory>vendor/silverstripe/hybridsessions/tests</directory>
-        </testsuite>
-
-        <!-- Optional SilverStripe recipes -->
-        <testsuite name="recipe-authoring-tools">
-            <directory>vendor/silverstripe/documentconverter/tests</directory>
-            <directory>vendor/silverstripe/iframe/tests</directory>
             <directory>vendor/silverstripe/tagfield/tests</directory>
             <directory>vendor/silverstripe/taxonomy/tests</directory>
         </testsuite>
 
-        <testsuite name="recipe-blog">
+        <testsuite name="g3">
             <directory>vendor/silverstripe/blog/tests</directory>
             <directory>vendor/silverstripe/lumberjack/tests</directory>
             <directory>vendor/silverstripe/spamprotection/tests</directory>
-        </testsuite>
-
-        <testsuite name="recipe-collaboration">
-            <directory>vendor/silverstripe/contentreview/tests</directory>
             <directory>vendor/silverstripe/sharedraftcontent/tests</directory>
             <directory>vendor/symbiote/silverstripe-advancedworkflow/tests</directory>
         </testsuite>
 
-        <testsuite name="recipe-content-blocks">
+        <testsuite name="g4">
             <directory>vendor/dnadesign/silverstripe-elemental/tests</directory>
             <directory>vendor/dnadesign/silverstripe-elemental-userforms/tests</directory>
-            <directory>vendor/silverstripe/elemental-fileblock/tests</directory>
-            <directory>vendor/silverstripe/elemental-bannerblock/tests</directory>
-            <directory>vendor/silverstripe/versioned-admin/tests</directory>
         </testsuite>
 
-        <testsuite name="recipe-form-building">
+        <testsuite name="g5">
+            <directory>vendor/silverstripe/versioned-admin/tests</directory>
             <directory>vendor/silverstripe/segment-field/tests</directory>
-            <directory>vendor/silverstripe/userforms/tests</directory>
-            <directory>vendor/symbiote/silverstripe-queuedjobs/tests</directory>
-        </testsuite>
-
-        <testsuite name="recipe-reporting-tools">
-            <directory>vendor/silverstripe/externallinks/tests</directory>
-            <directory>vendor/silverstripe/reports/tests</directory>
-            <directory>vendor/silverstripe/securityreport/tests</directory>
-            <directory>vendor/silverstripe/sitewidecontent-report/tests</directory>
-            <directory>vendor/bringyourownideas/silverstripe-maintenance/tests</directory>
-            <directory>vendor/bringyourownideas/silverstripe-composer-update-checker/tests</directory>
         </testsuite>
 
-        <testsuite name="recipe-services">
-            <directory>vendor/silverstripe/restfulserver/tests</directory>
-            <directory>vendor/silverstripe/versionfeed/tests</directory>
+        <testsuite name="g6">
+            <directory>vendor/symbiote/silverstripe-queuedjobs/tests</directory>
+            <directory>vendor/silverstripe/userforms/tests</directory>
         </testsuite>
 
-        <testsuite name="optional-authenticators">
-            <directory>vendor/silverstripe/ldap/tests</directory>
+        <testsuite name="g7">
             <directory>vendor/silverstripe/realme/tests</directory>
-        </testsuite>
-
-        <testsuite name="mfa">
             <directory>vendor/silverstripe/mfa/tests</directory>
             <directory>vendor/silverstripe/totp-authenticator/tests</directory>
-            <directory>vendor/silverstripe/webauthn-authenticator/tests</directory>
             <directory>vendor/silverstripe/login-forms/tests</directory>
         </testsuite>
 
-        <testsuite name="other">
+        <testsuite name="g8">
             <directory>vendor/silverstripe/graphql/tests/</directory>
             <directory>vendor/symbiote/silverstripe-gridfieldextensions/tests</directory>
             <directory>vendor/silverstripe/staticpublishqueue/tests</directory>