diff --git a/internal/distro/fedora/distro.go b/internal/distro/fedora/distro.go
index 25ce1a9c6..2b88c6684 100644
--- a/internal/distro/fedora/distro.go
+++ b/internal/distro/fedora/distro.go
@@ -83,7 +83,7 @@ var (
 		rpmOstree:        true,
 		pipelines:        iotCommitPipelines,
 		buildPipelines:   []string{"build"},
-		payloadPipelines: []string{"ostree-tree", "ostree-commit", "commit-archive"},
+		payloadPipelines: []string{"os", "ostree-commit", "commit-archive"},
 		exports:          []string{"commit-archive"},
 	}
 
diff --git a/internal/manifest/os.go b/internal/manifest/os.go
index 13e4201a7..d1693756b 100644
--- a/internal/manifest/os.go
+++ b/internal/manifest/os.go
@@ -112,12 +112,8 @@ func NewOSPipeline(m *Manifest,
 	bootLoader BootLoader,
 	grubLegacy string,
 	kernelName string) *OSPipeline {
-	name := "os"
-	if osTree {
-		name = "ostree-tree"
-	}
 	p := &OSPipeline{
-		BasePipeline:   NewBasePipeline(m, name, buildPipeline, nil),
+		BasePipeline:   NewBasePipeline(m, "os", buildPipeline, nil),
 		osTree:         osTree,
 		osTreeParent:   osTreeParent,
 		osTreeURL:      osTreeURL,
diff --git a/test/data/manifests/fedora_34-aarch64-fedora_iot_commit-boot.json b/test/data/manifests/fedora_34-aarch64-fedora_iot_commit-boot.json
index 469b542c0..87f7637b2 100644
--- a/test/data/manifests/fedora_34-aarch64-fedora_iot_commit-boot.json
+++ b/test/data/manifests/fedora_34-aarch64-fedora_iot_commit-boot.json
@@ -1888,7 +1888,7 @@
         ]
       },
       {
-        "name": "ostree-tree",
+        "name": "os",
         "build": "name:build",
         "stages": [
           {
@@ -5421,7 +5421,7 @@
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
                 "references": [
-                  "name:ostree-tree"
+                  "name:os"
                 ]
               }
             },
@@ -9081,7 +9081,7 @@
         "check_gpg": true
       }
     ],
-    "ostree-tree": [
+    "os": [
       {
         "name": "acl",
         "epoch": 0,
diff --git a/test/data/manifests/fedora_34-aarch64-fedora_iot_container-boot.json b/test/data/manifests/fedora_34-aarch64-fedora_iot_container-boot.json
index 27ef511d9..0a78fd42f 100644
--- a/test/data/manifests/fedora_34-aarch64-fedora_iot_container-boot.json
+++ b/test/data/manifests/fedora_34-aarch64-fedora_iot_container-boot.json
@@ -1888,7 +1888,7 @@
         ]
       },
       {
-        "name": "ostree-tree",
+        "name": "os",
         "build": "name:build",
         "stages": [
           {
@@ -5421,7 +5421,7 @@
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
                 "references": [
-                  "name:ostree-tree"
+                  "name:os"
                 ]
               }
             },
@@ -12419,7 +12419,7 @@
         "check_gpg": true
       }
     ],
-    "ostree-tree": [
+    "os": [
       {
         "name": "acl",
         "epoch": 0,
diff --git a/test/data/manifests/fedora_34-x86_64-fedora_iot_commit-boot.json b/test/data/manifests/fedora_34-x86_64-fedora_iot_commit-boot.json
index c24f6bbed..9778850c0 100644
--- a/test/data/manifests/fedora_34-x86_64-fedora_iot_commit-boot.json
+++ b/test/data/manifests/fedora_34-x86_64-fedora_iot_commit-boot.json
@@ -1912,7 +1912,7 @@
         ]
       },
       {
-        "name": "ostree-tree",
+        "name": "os",
         "build": "name:build",
         "stages": [
           {
@@ -5533,7 +5533,7 @@
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
                 "references": [
-                  "name:ostree-tree"
+                  "name:os"
                 ]
               }
             },
@@ -9256,7 +9256,7 @@
         "check_gpg": true
       }
     ],
-    "ostree-tree": [
+    "os": [
       {
         "name": "acl",
         "epoch": 0,
diff --git a/test/data/manifests/fedora_34-x86_64-fedora_iot_commit_debug-boot.json b/test/data/manifests/fedora_34-x86_64-fedora_iot_commit_debug-boot.json
index 8c2298b2e..164dfe70a 100644
--- a/test/data/manifests/fedora_34-x86_64-fedora_iot_commit_debug-boot.json
+++ b/test/data/manifests/fedora_34-x86_64-fedora_iot_commit_debug-boot.json
@@ -1918,7 +1918,7 @@
         ]
       },
       {
-        "name": "ostree-tree",
+        "name": "os",
         "build": "name:build",
         "stages": [
           {
@@ -5539,7 +5539,7 @@
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
                 "references": [
-                  "name:ostree-tree"
+                  "name:os"
                 ]
               }
             },
@@ -9262,7 +9262,7 @@
         "check_gpg": true
       }
     ],
-    "ostree-tree": [
+    "os": [
       {
         "name": "acl",
         "epoch": 0,
diff --git a/test/data/manifests/fedora_34-x86_64-fedora_iot_container-boot.json b/test/data/manifests/fedora_34-x86_64-fedora_iot_container-boot.json
index a5ed8a943..3f9c2233b 100644
--- a/test/data/manifests/fedora_34-x86_64-fedora_iot_container-boot.json
+++ b/test/data/manifests/fedora_34-x86_64-fedora_iot_container-boot.json
@@ -1912,7 +1912,7 @@
         ]
       },
       {
-        "name": "ostree-tree",
+        "name": "os",
         "build": "name:build",
         "stages": [
           {
@@ -5533,7 +5533,7 @@
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
                 "references": [
-                  "name:ostree-tree"
+                  "name:os"
                 ]
               }
             },
@@ -12612,7 +12612,7 @@
         "check_gpg": true
       }
     ],
-    "ostree-tree": [
+    "os": [
       {
         "name": "acl",
         "epoch": 0,
diff --git a/test/data/manifests/fedora_35-aarch64-fedora_iot_commit-boot.json b/test/data/manifests/fedora_35-aarch64-fedora_iot_commit-boot.json
index d1577e7b5..33bcecf99 100644
--- a/test/data/manifests/fedora_35-aarch64-fedora_iot_commit-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-fedora_iot_commit-boot.json
@@ -1928,7 +1928,7 @@
         ]
       },
       {
-        "name": "ostree-tree",
+        "name": "os",
         "build": "name:build",
         "stages": [
           {
@@ -5445,7 +5445,7 @@
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
                 "references": [
-                  "name:ostree-tree"
+                  "name:os"
                 ]
               }
             },
@@ -9152,7 +9152,7 @@
         "check_gpg": true
       }
     ],
-    "ostree-tree": [
+    "os": [
       {
         "name": "ModemManager",
         "epoch": 0,
diff --git a/test/data/manifests/fedora_35-aarch64-fedora_iot_container-boot.json b/test/data/manifests/fedora_35-aarch64-fedora_iot_container-boot.json
index e71a14f3f..b2506c25f 100644
--- a/test/data/manifests/fedora_35-aarch64-fedora_iot_container-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-fedora_iot_container-boot.json
@@ -1928,7 +1928,7 @@
         ]
       },
       {
-        "name": "ostree-tree",
+        "name": "os",
         "build": "name:build",
         "stages": [
           {
@@ -5445,7 +5445,7 @@
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
                 "references": [
-                  "name:ostree-tree"
+                  "name:os"
                 ]
               }
             },
@@ -12433,7 +12433,7 @@
         "check_gpg": true
       }
     ],
-    "ostree-tree": [
+    "os": [
       {
         "name": "ModemManager",
         "epoch": 0,
diff --git a/test/data/manifests/fedora_35-x86_64-fedora_iot_commit-boot.json b/test/data/manifests/fedora_35-x86_64-fedora_iot_commit-boot.json
index 81e8c308f..af034f5d5 100644
--- a/test/data/manifests/fedora_35-x86_64-fedora_iot_commit-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-fedora_iot_commit-boot.json
@@ -1952,7 +1952,7 @@
         ]
       },
       {
-        "name": "ostree-tree",
+        "name": "os",
         "build": "name:build",
         "stages": [
           {
@@ -5557,7 +5557,7 @@
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
                 "references": [
-                  "name:ostree-tree"
+                  "name:os"
                 ]
               }
             },
@@ -9327,7 +9327,7 @@
         "check_gpg": true
       }
     ],
-    "ostree-tree": [
+    "os": [
       {
         "name": "ModemManager",
         "epoch": 0,
diff --git a/test/data/manifests/fedora_35-x86_64-fedora_iot_commit_debug-boot.json b/test/data/manifests/fedora_35-x86_64-fedora_iot_commit_debug-boot.json
index 4ef6590af..ee8c08d49 100644
--- a/test/data/manifests/fedora_35-x86_64-fedora_iot_commit_debug-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-fedora_iot_commit_debug-boot.json
@@ -1958,7 +1958,7 @@
         ]
       },
       {
-        "name": "ostree-tree",
+        "name": "os",
         "build": "name:build",
         "stages": [
           {
@@ -5563,7 +5563,7 @@
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
                 "references": [
-                  "name:ostree-tree"
+                  "name:os"
                 ]
               }
             },
@@ -9333,7 +9333,7 @@
         "check_gpg": true
       }
     ],
-    "ostree-tree": [
+    "os": [
       {
         "name": "ModemManager",
         "epoch": 0,
diff --git a/test/data/manifests/fedora_35-x86_64-fedora_iot_container-boot.json b/test/data/manifests/fedora_35-x86_64-fedora_iot_container-boot.json
index e55dcb1ca..2806d40ff 100644
--- a/test/data/manifests/fedora_35-x86_64-fedora_iot_container-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-fedora_iot_container-boot.json
@@ -1952,7 +1952,7 @@
         ]
       },
       {
-        "name": "ostree-tree",
+        "name": "os",
         "build": "name:build",
         "stages": [
           {
@@ -5557,7 +5557,7 @@
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
                 "references": [
-                  "name:ostree-tree"
+                  "name:os"
                 ]
               }
             },
@@ -12626,7 +12626,7 @@
         "check_gpg": true
       }
     ],
-    "ostree-tree": [
+    "os": [
       {
         "name": "ModemManager",
         "epoch": 0,
diff --git a/test/data/manifests/fedora_36-aarch64-fedora_iot_commit-boot.json b/test/data/manifests/fedora_36-aarch64-fedora_iot_commit-boot.json
index f1d4b50bb..143fe90ac 100644
--- a/test/data/manifests/fedora_36-aarch64-fedora_iot_commit-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-fedora_iot_commit-boot.json
@@ -2128,7 +2128,7 @@
         ]
       },
       {
-        "name": "ostree-tree",
+        "name": "os",
         "build": "name:build",
         "stages": [
           {
@@ -5635,7 +5635,7 @@
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
                 "references": [
-                  "name:ostree-tree"
+                  "name:os"
                 ]
               }
             },
@@ -9609,7 +9609,7 @@
         "check_gpg": true
       }
     ],
-    "ostree-tree": [
+    "os": [
       {
         "name": "ModemManager",
         "epoch": 0,
diff --git a/test/data/manifests/fedora_36-aarch64-fedora_iot_container-boot.json b/test/data/manifests/fedora_36-aarch64-fedora_iot_container-boot.json
index 35b5fa5e1..c1c7428ca 100644
--- a/test/data/manifests/fedora_36-aarch64-fedora_iot_container-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-fedora_iot_container-boot.json
@@ -2128,7 +2128,7 @@
         ]
       },
       {
-        "name": "ostree-tree",
+        "name": "os",
         "build": "name:build",
         "stages": [
           {
@@ -5635,7 +5635,7 @@
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
                 "references": [
-                  "name:ostree-tree"
+                  "name:os"
                 ]
               }
             },
@@ -12870,7 +12870,7 @@
         "check_gpg": true
       }
     ],
-    "ostree-tree": [
+    "os": [
       {
         "name": "ModemManager",
         "epoch": 0,
diff --git a/test/data/manifests/fedora_36-x86_64-fedora_iot_commit-boot.json b/test/data/manifests/fedora_36-x86_64-fedora_iot_commit-boot.json
index da907328f..9557a1224 100644
--- a/test/data/manifests/fedora_36-x86_64-fedora_iot_commit-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-fedora_iot_commit-boot.json
@@ -2160,7 +2160,7 @@
         ]
       },
       {
-        "name": "ostree-tree",
+        "name": "os",
         "build": "name:build",
         "stages": [
           {
@@ -5755,7 +5755,7 @@
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
                 "references": [
-                  "name:ostree-tree"
+                  "name:os"
                 ]
               }
             },
@@ -9802,7 +9802,7 @@
         "check_gpg": true
       }
     ],
-    "ostree-tree": [
+    "os": [
       {
         "name": "ModemManager",
         "epoch": 0,
diff --git a/test/data/manifests/fedora_36-x86_64-fedora_iot_commit_debug-boot.json b/test/data/manifests/fedora_36-x86_64-fedora_iot_commit_debug-boot.json
index 35db33804..39dec806b 100644
--- a/test/data/manifests/fedora_36-x86_64-fedora_iot_commit_debug-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-fedora_iot_commit_debug-boot.json
@@ -2166,7 +2166,7 @@
         ]
       },
       {
-        "name": "ostree-tree",
+        "name": "os",
         "build": "name:build",
         "stages": [
           {
@@ -5761,7 +5761,7 @@
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
                 "references": [
-                  "name:ostree-tree"
+                  "name:os"
                 ]
               }
             },
@@ -9808,7 +9808,7 @@
         "check_gpg": true
       }
     ],
-    "ostree-tree": [
+    "os": [
       {
         "name": "ModemManager",
         "epoch": 0,
diff --git a/test/data/manifests/fedora_36-x86_64-fedora_iot_container-boot.json b/test/data/manifests/fedora_36-x86_64-fedora_iot_container-boot.json
index 9ddeab088..9202c25c1 100644
--- a/test/data/manifests/fedora_36-x86_64-fedora_iot_container-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-fedora_iot_container-boot.json
@@ -2160,7 +2160,7 @@
         ]
       },
       {
-        "name": "ostree-tree",
+        "name": "os",
         "build": "name:build",
         "stages": [
           {
@@ -5755,7 +5755,7 @@
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
                 "references": [
-                  "name:ostree-tree"
+                  "name:os"
                 ]
               }
             },
@@ -13099,7 +13099,7 @@
         "check_gpg": true
       }
     ],
-    "ostree-tree": [
+    "os": [
       {
         "name": "ModemManager",
         "epoch": 0,