diff --git a/plugin/pom.xml b/plugin/pom.xml
index 10041e897..54d8890b1 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -54,6 +54,12 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <!-- TODO until in BOM: -->
+            <dependency>
+              <groupId>org.jenkins-ci.plugins</groupId>
+              <artifactId>support-core</artifactId>
+              <version>1366.v9d076592655d</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java
index ded38b7b0..683eecdf9 100644
--- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java
+++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java
@@ -2020,6 +2020,10 @@ public void autopersist(@NonNull FlowNode n) throws IOException {
             return "Timing data about recently completed Pipeline builds";
         }
 
+        @Override public ComponentCategory getCategory() {
+            return ComponentCategory.BUILDS;
+        }
+
         @Override public void addContents(Container container) {
             container.add(new Content("nodes/master/pipeline-timings.txt") {
                 @Override public void writeTo(OutputStream outputStream) throws IOException {
@@ -2067,6 +2071,10 @@ public void autopersist(@NonNull FlowNode n) throws IOException {
             return "List of internal API calls made by Pipeline builds (typically from trusted libraries)";
         }
 
+        @Override public ComponentCategory getCategory() {
+            return ComponentCategory.BUILDS;
+        }
+
         @Override public void addContents(Container container) {
             container.add(new Content("nodes/master/pipeline-internal-calls.txt") {
                 @Override public void writeTo(OutputStream outputStream) throws IOException {
diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java
index 8fdf86ad3..835f271de 100644
--- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java
+++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java
@@ -102,6 +102,10 @@ public CpsThreadDump getThreadDump() {
             return "Thread dumps of running Pipeline builds";
         }
 
+        @Override public ComponentCategory getCategory() {
+            return ComponentCategory.BUILDS;
+        }
+
         @Override public void addContents(Container container) {
             container.add(new Content("nodes/master/pipeline-thread-dump.txt") {
                 @Override public void writeTo(OutputStream outputStream) throws IOException {