diff --git a/bom-2.204.x/pom.xml b/bom-2.204.x/pom.xml
deleted file mode 100644
index f5a4cabcb..000000000
--- a/bom-2.204.x/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>parent</artifactId>
-        <version>${revision}${changelist}</version>
-    </parent>
-    <artifactId>bom-2.204.x</artifactId>
-    <packaging>pom</packaging>
-    <properties>
-        <configuration-as-code-plugin.version>1.36.2</configuration-as-code-plugin.version>
-    </properties>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>bom-2.222.x</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins</groupId>
-                <artifactId>configuration-as-code</artifactId>
-                <version>${configuration-as-code-plugin.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.configuration-as-code</groupId>
-                <artifactId>test-harness</artifactId>
-                <version>${configuration-as-code-plugin.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>jackson2-api</artifactId>
-                <version>2.11.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>junit</artifactId>
-                <version>1.29</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>credentials</artifactId>
-                <version>2.3.11</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
diff --git a/bom-latest/pom.xml b/bom-latest/pom.xml
index 3ebc4eb0d..b02ec0652 100644
--- a/bom-latest/pom.xml
+++ b/bom-latest/pom.xml
@@ -266,6 +266,11 @@
                 <artifactId>mailer</artifactId>
                 <version>1.32.1</version>
             </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>matrix-auth</artifactId>
+                <version>2.6.4</version>
+            </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins</groupId>
                 <artifactId>matrix-project</artifactId>
diff --git a/pct.sh b/pct.sh
index 41b285ea8..800a9d7be 100755
--- a/pct.sh
+++ b/pct.sh
@@ -105,4 +105,13 @@ rm -fv pct-work/timestamper/target/surefire-reports/TEST-hudson.plugins.timestam
 # TODO https://github.com/jenkinsci/workflow-multibranch-plugin/pull/102
 rm -fv pct-work/workflow-multibranch/target/surefire-reports/TEST-org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProjectTest.xml
 
+# TODO https://github.com/jenkinsci/matrix-auth-plugin/pull/93
+rm -fv pct-work/matrix-auth/target/surefire-reports/TEST-org.jenkinsci.plugins.matrixauth.PermissionAdderTest.xml
+
+# TODO https://github.com/jenkinsci/workflow-basic-steps-plugin/pull/137
+rm -fv pct-work/workflow-basic-steps/target/surefire-reports/TEST-org.jenkinsci.plugins.workflow.support.steps.stash.StashTest.xml
+
+# TODO until dropping 2.235.x so can rely on https://github.com/jenkinsci/workflow-basic-steps-plugin/pull/120
+rm -fv pct-work/workflow-basic-steps/target/surefire-reports/TEST-org.jenkinsci.plugins.workflow.steps.TimeoutStepTest.xml
+
 # produces: **/target/surefire-reports/TEST-*.xml
diff --git a/pom.xml b/pom.xml
index b2a7fda9c..e27deb422 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,6 @@
         <module>bom-2.249.x</module>
         <module>bom-2.235.x</module>
         <module>bom-2.222.x</module>
-        <module>bom-2.204.x</module>
         <module>sample-plugin</module>
     </modules>
     <build>
diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml
index f99b2fe32..cb2af33a6 100644
--- a/sample-plugin/pom.xml
+++ b/sample-plugin/pom.xml
@@ -217,6 +217,11 @@
             <artifactId>junit-attachments</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>matrix-auth</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>pipeline-build-step</artifactId>
@@ -321,13 +326,6 @@
                 <jenkins.version>2.222.4</jenkins.version>
             </properties>
         </profile>
-        <profile>
-            <id>2.204.x</id>
-            <properties>
-                <bom>2.204.x</bom>
-                <jenkins.version>2.204.6</jenkins.version>
-            </properties>
-        </profile>
         <profile>
             <id>skip-tests-on-release</id>
             <activation>