diff --git a/src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml b/src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml
index 6a6b58c26a..01da561fee 100644
--- a/src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml
+++ b/src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml
@@ -32,7 +32,7 @@ mpp-vars:
   # the host (COSA) gets used as the buildroot there.
   buildroot:
     mpp-if: osname in ['rhcos', 'scos']
-    then: "name:build"
+    then: "name:plain-files-tree"
     else: ""
   # For the qemu stages we'll use the host buildroot (COSA)
   # because we definitely don't include qemu-img in CoreOS. ""
@@ -109,12 +109,17 @@ pipelines:
                 to: tree:///coreos.ociarchive
         else:
           type: org.osbuild.noop
-  # Construct a buildroot here from the input container reference (either
-  # ociarchive or registry/tag). Note that this is only used as a buildroot
-  # on RHCOS (FCOS doesn't ship python), but it is used everywhere as
-  # file_context input to the org.osbuild.selinux stages.
-  # unless used somewhere later in the manifest.
-  - name: build
+  # Construct a tree here that is a plain representation of the filesystem
+  # that you would see on a running OSTree system. i.e. instead of just
+  # /ostree and /sysroot at the toplevel we see /usr/ /var/ /etc/ ... that
+  # you would see inside an OSTree deployment. Having the plain files accessible
+  # allows for this pipeline to be used as a buildroot for some stages
+  # or as inputs for others (i.e. file_context input to the org.osbuild.selinux
+  # stages). This pipeline isn't actually used for built artifacts but
+  # to help during build.
+  #
+  # NOTE: this is only used as a buildroot on RHCOS (FCOS doesn't ship python).
+  - name: plain-files-tree
     stages:
       - mpp-if: ociarchive != ''
         then:
@@ -152,7 +157,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
       - type: org.osbuild.ostree.init-fs
       - type: org.osbuild.ostree.os-init
         options:
@@ -366,7 +371,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -389,7 +394,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -618,7 +623,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -643,7 +648,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
         devices:
           disk:
             type: org.osbuild.loopback
diff --git a/src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml b/src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml
index c3f29851c7..a2f10d0d4a 100644
--- a/src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml
+++ b/src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml
@@ -32,7 +32,7 @@ mpp-vars:
   # the host (COSA) gets used as the buildroot there.
   buildroot:
     mpp-if: osname in ['rhcos', 'scos']
-    then: "name:build"
+    then: "name:plain-files-tree"
     else: ""
   # For the qemu stages we'll use the host buildroot (COSA)
   # because we definitely don't include qemu-img in CoreOS. ""
@@ -111,12 +111,17 @@ pipelines:
                 to: tree:///coreos.ociarchive
         else:
           type: org.osbuild.noop
-  # Construct a buildroot here from the input container reference (either
-  # ociarchive or registry/tag). Note that this is only used as a buildroot
-  # on RHCOS (FCOS doesn't ship python), but it is used everywhere as
-  # file_context input to the org.osbuild.selinux stages.
-  # unless used somewhere later in the manifest.
-  - name: build
+  # Construct a tree here that is a plain representation of the filesystem
+  # that you would see on a running OSTree system. i.e. instead of just
+  # /ostree and /sysroot at the toplevel we see /usr/ /var/ /etc/ ... that
+  # you would see inside an OSTree deployment. Having the plain files accessible
+  # allows for this pipeline to be used as a buildroot for some stages
+  # or as inputs for others (i.e. file_context input to the org.osbuild.selinux
+  # stages). This pipeline isn't actually used for built artifacts but
+  # to help during build.
+  #
+  # NOTE: this is only used as a buildroot on RHCOS (FCOS doesn't ship python).
+  - name: plain-files-tree
     stages:
       - mpp-if: ociarchive != ''
         then:
@@ -154,7 +159,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
       - type: org.osbuild.ostree.init-fs
       - type: org.osbuild.ostree.os-init
         options:
@@ -351,7 +356,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -374,7 +379,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -572,7 +577,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -597,7 +602,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
         devices:
           disk:
             type: org.osbuild.loopback
diff --git a/src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml b/src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml
index c6d9cbe3f8..af1b0d38ad 100644
--- a/src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml
+++ b/src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml
@@ -36,7 +36,7 @@ mpp-vars:
   # the host (COSA) gets used as the buildroot there.
   buildroot:
     mpp-if: osname in ['rhcos', 'scos']
-    then: "name:build"
+    then: "name:plain-files-tree"
     else: ""
   # For the qemu stages we'll use the host buildroot (COSA)
   # because we definitely don't include qemu-img in CoreOS. ""
@@ -101,12 +101,17 @@ pipelines:
                 to: tree:///coreos.ociarchive
         else:
           type: org.osbuild.noop
-  # Construct a buildroot here from the input container reference (either
-  # ociarchive or registry/tag). Note that this is only used as a buildroot
-  # on RHCOS (FCOS doesn't ship python), but it is used everywhere as
-  # file_context input to the org.osbuild.selinux stages.
-  # unless used somewhere later in the manifest.
-  - name: build
+  # Construct a tree here that is a plain representation of the filesystem
+  # that you would see on a running OSTree system. i.e. instead of just
+  # /ostree and /sysroot at the toplevel we see /usr/ /var/ /etc/ ... that
+  # you would see inside an OSTree deployment. Having the plain files accessible
+  # allows for this pipeline to be used as a buildroot for some stages
+  # or as inputs for others (i.e. file_context input to the org.osbuild.selinux
+  # stages). This pipeline isn't actually used for built artifacts but
+  # to help during build.
+  #
+  # NOTE: this is only used as a buildroot on RHCOS (FCOS doesn't ship python).
+  - name: plain-files-tree
     stages:
       - mpp-if: ociarchive != ''
         then:
@@ -144,7 +149,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
       - type: org.osbuild.ostree.init-fs
       - type: org.osbuild.ostree.os-init
         options:
@@ -354,7 +359,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -377,7 +382,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -546,7 +551,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -571,7 +576,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
         devices:
           disk:
             type: org.osbuild.loopback
diff --git a/src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml b/src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml
index 837f666445..6bc015467c 100644
--- a/src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml
+++ b/src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml
@@ -32,7 +32,7 @@ mpp-vars:
   # the host (COSA) gets used as the buildroot there.
   buildroot:
     mpp-if: osname in ['rhcos', 'scos']
-    then: "name:build"
+    then: "name:plain-files-tree"
     else: ""
   # For the qemu stages we'll use the host buildroot (COSA)
   # because we definitely don't include qemu-img in CoreOS. ""
@@ -111,12 +111,17 @@ pipelines:
                 to: tree:///coreos.ociarchive
         else:
           type: org.osbuild.noop
-  # Construct a buildroot here from the input container reference (either
-  # ociarchive or registry/tag). Note that this is only used as a buildroot
-  # on RHCOS (FCOS doesn't ship python), but it is used everywhere as
-  # file_context input to the org.osbuild.selinux stages.
-  # unless used somewhere later in the manifest.
-  - name: build
+  # Construct a tree here that is a plain representation of the filesystem
+  # that you would see on a running OSTree system. i.e. instead of just
+  # /ostree and /sysroot at the toplevel we see /usr/ /var/ /etc/ ... that
+  # you would see inside an OSTree deployment. Having the plain files accessible
+  # allows for this pipeline to be used as a buildroot for some stages
+  # or as inputs for others (i.e. file_context input to the org.osbuild.selinux
+  # stages). This pipeline isn't actually used for built artifacts but
+  # to help during build.
+  #
+  # NOTE: this is only used as a buildroot on RHCOS (FCOS doesn't ship python).
+  - name: plain-files-tree
     stages:
       - mpp-if: ociarchive != ''
         then:
@@ -154,7 +159,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
       - type: org.osbuild.ostree.init-fs
       - type: org.osbuild.ostree.os-init
         options:
@@ -368,7 +373,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -391,7 +396,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -622,7 +627,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -647,7 +652,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
         devices:
           disk:
             type: org.osbuild.loopback
diff --git a/src/osbuild-manifests/platform.qemu-secex.ipp.yaml b/src/osbuild-manifests/platform.qemu-secex.ipp.yaml
index 88904c39cc..3f0326924c 100644
--- a/src/osbuild-manifests/platform.qemu-secex.ipp.yaml
+++ b/src/osbuild-manifests/platform.qemu-secex.ipp.yaml
@@ -142,7 +142,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
         devices:
           disk:
             type: org.osbuild.loopback
@@ -165,7 +165,7 @@ pipelines:
             type: org.osbuild.tree
             origin: org.osbuild.pipeline
             references:
-              - name:build
+              - name:plain-files-tree
         devices:
           disk:
             type: org.osbuild.loopback