Repository: osbuild/osbuild-composer
Pull request #3163 (2022-11-29 19:53:53)

gcp: Cross-reference to coreos-assembler code
At the moment we have duplicate logic here; ideally of course we consolidate (since both codebases are Go, perhaps we could create a tiny little Go library for "RHEL GCP stuff"?) but for now let's just cross-link for awareness.



This pull request includes:

- [x] adequate testing for the new functionality or fixed issue
- [x] adequate documentation informing people about the change such as
  - [x] submit a PR for the [guides](https://github.com/osbuild/guides) repository if this PR changed any behavior described there: https://www.osbuild.org/guides/


cgwalters: (Background: Trying to figure out whether we want the `GVNIC` feature for rhel8 or not, xref https://github.com/coreos/coreos-assembler/pull/3243 )

Patch:
diff --git a/cmd/gen-manifests/main.go b/cmd/gen-manifests/main.go
index e8856f5ef..2df3dae00 100644
--- a/cmd/gen-manifests/main.go
+++ b/cmd/gen-manifests/main.go
@@ -46,6 +46,7 @@ type repository struct {
 	RHSM           bool     `json:"rhsm,omitempty"`
 	MetadataExpire string   `json:"metadata_expire,omitempty"`
 	ImageTypeTags  []string `json:"image_type_tags,omitempty"`
+	PackageSets    []string `json:"package-sets,omitempty"`
 }
 
 type ostreeOptions struct {
@@ -121,6 +122,12 @@ func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, d
 			FetchChecksum: cr.OSTree.Parent,
 		}
 	}
+
+	// add RHSM fact to detect changes
+	options.Facts = &distro.FactsImageOptions{
+		ApiType: "test-manifest",
+	}
+
 	job := func(msgq chan string) (err error) {
 		defer func() {
 			msg := fmt.Sprintf("Finished job %s", filename)
diff --git a/internal/cloud/gcp/compute.go b/internal/cloud/gcp/compute.go
index 703090376..a0bcf14e6 100644
--- a/internal/cloud/gcp/compute.go
+++ b/internal/cloud/gcp/compute.go
@@ -18,7 +18,9 @@ var GuestOsFeaturesRHEL8 []*computepb.GuestOsFeature = []*computepb.GuestOsFeatu
 	{Type: common.StringToPtr(computepb.GuestOsFeature_SEV_CAPABLE.String())},
 }
 
-// Guest OS Features for RHEL9 images
+// Guest OS Features for RHEL9 images.  Note that if you update this, also
+// consider changing the code in https://github.com/coreos/coreos-assembler/blob/0083086c4720b602b8243effb85c0a1f73f013dd/mantle/platform/api/gcloud/image.go#L105
+// for RHEL CoreOS which uses coreos-assembler today.
 var GuestOsFeaturesRHEL9 []*computepb.GuestOsFeature = []*computepb.GuestOsFeature{
 	{Type: common.StringToPtr(computepb.GuestOsFeature_UEFI_COMPATIBLE.String())},
 	{Type: common.StringToPtr(computepb.GuestOsFeature_VIRTIO_SCSI_MULTIQUEUE.String())},
diff --git a/internal/distro/rhel9/images.go b/internal/distro/rhel9/images.go
index d7e27a7cf..9679b10d1 100644
--- a/internal/distro/rhel9/images.go
+++ b/internal/distro/rhel9/images.go
@@ -129,6 +129,10 @@ func osCustomizations(
 		)
 	}
 
+	if t.arch.distro.isRHEL() && options.Facts != nil {
+		osc.FactAPIType = options.Facts.ApiType
+	}
+
 	osc.Grub2Config = imageConfig.Grub2Config
 	osc.Sysconfig = imageConfig.Sysconfig
 	osc.SystemdLogind = imageConfig.SystemdLogind
diff --git a/internal/manifest/os.go b/internal/manifest/os.go
index 35a05df41..1b8998074 100644
--- a/internal/manifest/os.go
+++ b/internal/manifest/os.go
@@ -95,6 +95,7 @@ type OSCustomizations struct {
 	WAAgentConfig       *osbuild.WAAgentConfStageOptions
 	UdevRules           *osbuild.UdevRulesStageOptions
 	LeapSecTZ           *string
+	FactAPIType         string
 
 	Subscription *distro.SubscriptionImageOptions
 	RHSMConfig   map[distro.RHSMSubscriptionStatus]*osbuild.RHSMStageOptions
@@ -521,6 +522,14 @@ func (p *OS) serialize() osbuild.Pipeline {
 		pipeline.AddStage(osbuild.NewOscapRemediationStage(p.OpenSCAPConfig))
 	}
 
+	if p.FactAPIType != "" {
+		pipeline.AddStage(osbuild.NewRHSMFactsStage(&osbuild.RHSMFactsStageOptions{
+			Facts: osbuild.RHSMFacts{
+				ApiType: p.FactAPIType,
+			},
+		}))
+	}
+
 	if p.SElinux != "" {
 		pipeline.AddStage(osbuild.NewSELinuxStage(&osbuild.SELinuxStageOptions{
 			FileContexts: fmt.Sprintf("etc/selinux/%s/contexts/files/file_contexts", p.SElinux),
diff --git a/internal/rpmmd/repository.go b/internal/rpmmd/repository.go
index 75058a0c5..6292e3821 100644
--- a/internal/rpmmd/repository.go
+++ b/internal/rpmmd/repository.go
@@ -178,42 +178,6 @@ type PackageInfo struct {
 	Dependencies []PackageSpec  `json:"dependencies,omitempty"`
 }
 
-type RPMMD interface {
-	// FetchMetadata returns all metadata about the repositories we use in the code. Specifically it is a
-	// list of packages and dictionary of checksums of the repositories.
-	FetchMetadata(repos []RepoConfig, modulePlatformID, arch, releasever string) (PackageList, map[string]string, error)
-
-	// Depsolve takes a list of required content (specs), explicitly unwanted content (excludeSpecs), list
-	// or repositories, and platform ID for modularity. It returns a list of all packages (with solved
-	// dependencies) that will be installed into the system.
-	//
-	// NOTE: Kept for legacy purposes (Weldr). New code should default to using DepsolvePackageSets().
-	Depsolve(packageSet PackageSet, repos []RepoConfig, modulePlatformID, arch, releasever string) ([]PackageSpec, map[string]string, error)
-
-	// DepsolvePackageSets takes a map of package sets chains, which should be depsolved as separate transactions,
-	// a map of package sets (included and excluded), a list of common and package-set-specific repositories,
-	// platform ID for modularity, architecture and release version. It returns a map of Package Specs, depsolved
-	// in a chain or alone, as defined based on the provided arguments.
-	DepsolvePackageSets(packageSetsChains map[string][]string, packageSets map[string]PackageSet, repos []RepoConfig, packageSetsRepos map[string][]RepoConfig, modulePlatformID, arch, releasever string) (map[string][]PackageSpec, error)
-}
-
-type DNFError struct {
-	Kind   string `json:"kind"`
-	Reason string `json:"reason"`
-}
-
-func (err *DNFError) Error() string {
-	return fmt.Sprintf("DNF error occured: %s: %s", err.Kind, err.Reason)
-}
-
-type RepositoryError struct {
-	msg string
-}
-
-func (re *RepositoryError) Error() string {
-	return re.msg
-}
-
 func GetVerStrFromPackageSpecList(pkgs []PackageSpec, packageName string) (string, error) {
 	for _, pkg := range pkgs {
 		if pkg.Name == packageName {
@@ -338,7 +302,7 @@ func LoadRepositories(confPaths []string, distro string) (map[string][]RepoConfi
 	}
 
 	if repoConfigs == nil {
-		return nil, &RepositoryError{"LoadRepositories failed: none of the provided paths contain distro configuration"}
+		return nil, fmt.Errorf("LoadRepositories failed: none of the provided paths contain distro configuration")
 	}
 
 	return repoConfigs, nil
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index 21c4c41b4..60103d426 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -9,7 +9,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        69
+Version:        70
 
 %gometa
 


Test patch:
diff --git a/internal/distro/distro_test_common/distro_test_common.go b/internal/distro/distro_test_common/distro_test_common.go
index 58bc11b4d..41a816afc 100644
--- a/internal/distro/distro_test_common/distro_test_common.go
+++ b/internal/distro/distro_test_common/distro_test_common.go
@@ -105,6 +105,9 @@ func TestDistro_Manifest(t *testing.T, pipelinePath string, prefix string, regis
 			options := distro.ImageOptions{
 				Size:   imageType.Size(0),
 				OSTree: ostreeOptions,
+				Facts: &distro.FactsImageOptions{
+					ApiType: "test-manifest",
+				},
 			}
 
 			var imgPackageSpecSets map[string][]rpmmd.PackageSpec
diff --git a/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json
index b1c6faeed..e8d88ef8e 100644
--- a/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json
@@ -11441,5 +11441,6 @@
         "checksum": "sha256:000bd49aea30ee3534e6cde11188afa4b567711b13acbcf531e5542fc7b2aefe"
       }
     ]
-  }
+  },
+  "no-image-info": true
 }
diff --git a/test/data/manifests/rhel_7-x86_64-qcow2-boot.json b/test/data/manifests/rhel_7-x86_64-qcow2-boot.json
index b98e16d7c..d516f8d7f 100644
--- a/test/data/manifests/rhel_7-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_7-x86_64-qcow2-boot.json
@@ -22,7 +22,10 @@
       },
       {
         "name": "rhel-eng",
-        "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el7/el7-x86_64-eng-rel-20220530"
+        "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el7/el7-x86_64-eng-rel-20220530",
+        "package-sets": [
+          "build"
+        ]
       },
       {
         "name": "azure-rhui-7",
diff --git a/test/data/manifests/rhel_7-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_7-x86_64-qcow2_customize-boot.json
index 2bbd60bd0..8355a9ebd 100644
--- a/test/data/manifests/rhel_7-x86_64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_7-x86_64-qcow2_customize-boot.json
@@ -22,7 +22,10 @@
       },
       {
         "name": "rhel-eng",
-        "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el7/el7-x86_64-eng-rel-20220530"
+        "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el7/el7-x86_64-eng-rel-20220530",
+        "package-sets": [
+          "build"
+        ]
       },
       {
         "name": "azure-rhui-7",
diff --git a/test/data/manifests/rhel_8-aarch64-ami-boot.json b/test/data/manifests/rhel_8-aarch64-ami-boot.json
index 8bfb4ea5b..94cfc6ec3 100644
--- a/test/data/manifests/rhel_8-aarch64-ami-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-ami-boot.json
@@ -2287,6 +2287,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-aarch64-ec2-boot.json b/test/data/manifests/rhel_8-aarch64-ec2-boot.json
index f3cae95dd..575a52b4b 100644
--- a/test/data/manifests/rhel_8-aarch64-ec2-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-ec2-boot.json
@@ -2303,6 +2303,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_8-aarch64-edge_commit-boot.json
index 1c2a5d770..2d42a05d0 100644
--- a/test/data/manifests/rhel_8-aarch64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-edge_commit-boot.json
@@ -1957,6 +1957,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_8-aarch64-edge_commit_with_container-boot.json
index a19427c7b..a11456ba2 100644
--- a/test/data/manifests/rhel_8-aarch64-edge_commit_with_container-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-edge_commit_with_container-boot.json
@@ -2079,6 +2079,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-aarch64-edge_container-boot.json b/test/data/manifests/rhel_8-aarch64-edge_container-boot.json
index 98545f412..10efc0c70 100644
--- a/test/data/manifests/rhel_8-aarch64-edge_container-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-edge_container-boot.json
@@ -1957,6 +1957,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-aarch64-image_installer-boot.json b/test/data/manifests/rhel_8-aarch64-image_installer-boot.json
index 20e7097ce..6f774ed7c 100644
--- a/test/data/manifests/rhel_8-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-image_installer-boot.json
@@ -2447,6 +2447,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_8-aarch64-image_installer_with_users-boot.json
index e52cd92eb..1ab26e095 100644
--- a/test/data/manifests/rhel_8-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-image_installer_with_users-boot.json
@@ -2530,6 +2530,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-aarch64-openstack-boot.json b/test/data/manifests/rhel_8-aarch64-openstack-boot.json
index 8cbc97afe..cbad1a09f 100644
--- a/test/data/manifests/rhel_8-aarch64-openstack-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-openstack-boot.json
@@ -2247,6 +2247,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-aarch64-qcow2-boot.json b/test/data/manifests/rhel_8-aarch64-qcow2-boot.json
index 06be580ab..ca92ce50c 100644
--- a/test/data/manifests/rhel_8-aarch64-qcow2-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-qcow2-boot.json
@@ -2245,6 +2245,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_8-aarch64-qcow2_customize-boot.json
index 442c82a04..494cd72b1 100644
--- a/test/data/manifests/rhel_8-aarch64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-qcow2_customize-boot.json
@@ -2457,6 +2457,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-aarch64-tar-boot.json b/test/data/manifests/rhel_8-aarch64-tar-boot.json
index d4ae4f308..4875cd055 100644
--- a/test/data/manifests/rhel_8-aarch64-tar-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-tar-boot.json
@@ -1367,6 +1367,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_8-ppc64le-qcow2-boot.json
index bc99f9bf3..6bd514993 100644
--- a/test/data/manifests/rhel_8-ppc64le-qcow2-boot.json
+++ b/test/data/manifests/rhel_8-ppc64le-qcow2-boot.json
@@ -2389,6 +2389,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_8-ppc64le-qcow2_customize-boot.json
index 5e603bb87..0b43c78c6 100644
--- a/test/data/manifests/rhel_8-ppc64le-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_8-ppc64le-qcow2_customize-boot.json
@@ -2601,6 +2601,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-ppc64le-tar-boot.json b/test/data/manifests/rhel_8-ppc64le-tar-boot.json
index e02425973..72f2ae9e0 100644
--- a/test/data/manifests/rhel_8-ppc64le-tar-boot.json
+++ b/test/data/manifests/rhel_8-ppc64le-tar-boot.json
@@ -1388,6 +1388,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-s390x-qcow2-boot.json b/test/data/manifests/rhel_8-s390x-qcow2-boot.json
index 368ba4ea6..a8ff08f7a 100644
--- a/test/data/manifests/rhel_8-s390x-qcow2-boot.json
+++ b/test/data/manifests/rhel_8-s390x-qcow2-boot.json
@@ -2478,6 +2478,14 @@
             "type": "org.osbuild.zipl",
             "options": {}
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_8-s390x-qcow2_customize-boot.json
index 8b1b2dce7..18713ecf6 100644
--- a/test/data/manifests/rhel_8-s390x-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_8-s390x-qcow2_customize-boot.json
@@ -2690,6 +2690,14 @@
             "type": "org.osbuild.zipl",
             "options": {}
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-s390x-tar-boot.json b/test/data/manifests/rhel_8-s390x-tar-boot.json
index a28e3f645..b0fe58944 100644
--- a/test/data/manifests/rhel_8-s390x-tar-boot.json
+++ b/test/data/manifests/rhel_8-s390x-tar-boot.json
@@ -1664,6 +1664,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-ami-boot.json b/test/data/manifests/rhel_8-x86_64-ami-boot.json
index 34b299778..61b78f62d 100644
--- a/test/data/manifests/rhel_8-x86_64-ami-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-ami-boot.json
@@ -2218,6 +2218,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_8-x86_64-azure_rhui-boot.json
index e6fd0d254..71cc5b22e 100644
--- a/test/data/manifests/rhel_8-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-azure_rhui-boot.json
@@ -3045,6 +3045,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_8-x86_64-azure_sap_rhui-boot.json
index 6efbfe740..4f3c5d937 100644
--- a/test/data/manifests/rhel_8-x86_64-azure_sap_rhui-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-azure_sap_rhui-boot.json
@@ -3709,6 +3709,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-ec2-boot.json b/test/data/manifests/rhel_8-x86_64-ec2-boot.json
index 20c445457..a4debcf05 100644
--- a/test/data/manifests/rhel_8-x86_64-ec2-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-ec2-boot.json
@@ -2236,6 +2236,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_8-x86_64-ec2_ha-boot.json
index c23a1d865..ae85fb566 100644
--- a/test/data/manifests/rhel_8-x86_64-ec2_ha-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-ec2_ha-boot.json
@@ -2769,6 +2769,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_8-x86_64-ec2_sap-boot.json
index 491fff8da..714f67cfd 100644
--- a/test/data/manifests/rhel_8-x86_64-ec2_sap-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-ec2_sap-boot.json
@@ -3625,6 +3625,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_8-x86_64-edge_commit-boot.json
index a84bdcb5a..9465baa35 100644
--- a/test/data/manifests/rhel_8-x86_64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-edge_commit-boot.json
@@ -2036,6 +2036,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_8-x86_64-edge_commit_rt-boot.json
index 840bfe79f..a6cd898a8 100644
--- a/test/data/manifests/rhel_8-x86_64-edge_commit_rt-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-edge_commit_rt-boot.json
@@ -2112,6 +2112,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_8-x86_64-edge_commit_with_container-boot.json
index a2780cf36..073ce753b 100644
--- a/test/data/manifests/rhel_8-x86_64-edge_commit_with_container-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-edge_commit_with_container-boot.json
@@ -2158,6 +2158,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-edge_container-boot.json b/test/data/manifests/rhel_8-x86_64-edge_container-boot.json
index 5269f6c0b..ea47b85e5 100644
--- a/test/data/manifests/rhel_8-x86_64-edge_container-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-edge_container-boot.json
@@ -2026,6 +2026,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-gce-boot.json b/test/data/manifests/rhel_8-x86_64-gce-boot.json
index d9c43b8a8..e095335e2 100644
--- a/test/data/manifests/rhel_8-x86_64-gce-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-gce-boot.json
@@ -2380,6 +2380,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_8-x86_64-gce_rhui-boot.json
index e403af63c..b50647f81 100644
--- a/test/data/manifests/rhel_8-x86_64-gce_rhui-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-gce_rhui-boot.json
@@ -2391,6 +2391,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-image_installer-boot.json b/test/data/manifests/rhel_8-x86_64-image_installer-boot.json
index 1f0598722..6bbf9e79c 100644
--- a/test/data/manifests/rhel_8-x86_64-image_installer-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-image_installer-boot.json
@@ -2489,6 +2489,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_8-x86_64-image_installer_with_users-boot.json
index 61cd4ed19..6c8b5e980 100644
--- a/test/data/manifests/rhel_8-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-image_installer_with_users-boot.json
@@ -2572,6 +2572,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-oci-boot.json b/test/data/manifests/rhel_8-x86_64-oci-boot.json
index 500fc1982..591def398 100644
--- a/test/data/manifests/rhel_8-x86_64-oci-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-oci-boot.json
@@ -2261,6 +2261,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-openstack-boot.json b/test/data/manifests/rhel_8-x86_64-openstack-boot.json
index 3c083c092..cfaa12825 100644
--- a/test/data/manifests/rhel_8-x86_64-openstack-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-openstack-boot.json
@@ -2293,6 +2293,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-qcow2-boot.json b/test/data/manifests/rhel_8-x86_64-qcow2-boot.json
index b0a5df881..7f98264e3 100644
--- a/test/data/manifests/rhel_8-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-qcow2-boot.json
@@ -2282,6 +2282,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_8-x86_64-qcow2_customize-boot.json
index 7533b746f..5b464c1cb 100644
--- a/test/data/manifests/rhel_8-x86_64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-qcow2_customize-boot.json
@@ -2497,6 +2497,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-tar-boot.json b/test/data/manifests/rhel_8-x86_64-tar-boot.json
index cc44d005e..84e9e75f0 100644
--- a/test/data/manifests/rhel_8-x86_64-tar-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-tar-boot.json
@@ -1391,6 +1391,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-vhd-boot.json b/test/data/manifests/rhel_8-x86_64-vhd-boot.json
index 988f18328..2f440c6e7 100644
--- a/test/data/manifests/rhel_8-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-vhd-boot.json
@@ -3011,6 +3011,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_8-x86_64-vmdk-boot.json b/test/data/manifests/rhel_8-x86_64-vmdk-boot.json
index 2018f3fe1..d2fe67746 100644
--- a/test/data/manifests/rhel_8-x86_64-vmdk-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-vmdk-boot.json
@@ -2293,6 +2293,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-aarch64-ami-boot.json b/test/data/manifests/rhel_84-aarch64-ami-boot.json
index 3783e1671..60cc59cbd 100644
--- a/test/data/manifests/rhel_84-aarch64-ami-boot.json
+++ b/test/data/manifests/rhel_84-aarch64-ami-boot.json
@@ -2320,6 +2320,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-aarch64-ec2-boot.json b/test/data/manifests/rhel_84-aarch64-ec2-boot.json
index 67d0d1a06..82da074f0 100644
--- a/test/data/manifests/rhel_84-aarch64-ec2-boot.json
+++ b/test/data/manifests/rhel_84-aarch64-ec2-boot.json
@@ -2336,6 +2336,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_84-aarch64-edge_commit-boot.json
index c8ca23226..d88d0a3bd 100644
--- a/test/data/manifests/rhel_84-aarch64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_84-aarch64-edge_commit-boot.json
@@ -2021,6 +2021,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_84-aarch64-edge_commit_with_container-boot.json
index f792d5db8..20548188c 100644
--- a/test/data/manifests/rhel_84-aarch64-edge_commit_with_container-boot.json
+++ b/test/data/manifests/rhel_84-aarch64-edge_commit_with_container-boot.json
@@ -2086,6 +2086,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-aarch64-edge_container-boot.json b/test/data/manifests/rhel_84-aarch64-edge_container-boot.json
index 78d03d7c0..267234e42 100644
--- a/test/data/manifests/rhel_84-aarch64-edge_container-boot.json
+++ b/test/data/manifests/rhel_84-aarch64-edge_container-boot.json
@@ -2021,6 +2021,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-aarch64-image_installer-boot.json b/test/data/manifests/rhel_84-aarch64-image_installer-boot.json
index de2f9e812..2085a47fb 100644
--- a/test/data/manifests/rhel_84-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_84-aarch64-image_installer-boot.json
@@ -2480,6 +2480,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_84-aarch64-image_installer_with_users-boot.json
index 1e2d7ec77..6a91d86c5 100644
--- a/test/data/manifests/rhel_84-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_84-aarch64-image_installer_with_users-boot.json
@@ -2563,6 +2563,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-aarch64-openstack-boot.json b/test/data/manifests/rhel_84-aarch64-openstack-boot.json
index 2a09ba58c..696d4d9f8 100644
--- a/test/data/manifests/rhel_84-aarch64-openstack-boot.json
+++ b/test/data/manifests/rhel_84-aarch64-openstack-boot.json
@@ -2247,6 +2247,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-aarch64-qcow2-boot.json b/test/data/manifests/rhel_84-aarch64-qcow2-boot.json
index 7de3ae7a4..23593c15f 100644
--- a/test/data/manifests/rhel_84-aarch64-qcow2-boot.json
+++ b/test/data/manifests/rhel_84-aarch64-qcow2-boot.json
@@ -2269,6 +2269,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_84-aarch64-qcow2_customize-boot.json
index 6aabc5a19..500c1a8c6 100644
--- a/test/data/manifests/rhel_84-aarch64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_84-aarch64-qcow2_customize-boot.json
@@ -2472,6 +2472,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-aarch64-tar-boot.json b/test/data/manifests/rhel_84-aarch64-tar-boot.json
index 70e4e998e..85f404d20 100644
--- a/test/data/manifests/rhel_84-aarch64-tar-boot.json
+++ b/test/data/manifests/rhel_84-aarch64-tar-boot.json
@@ -1415,6 +1415,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json
index f9249860e..5dadf4927 100644
--- a/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json
+++ b/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json
@@ -2413,6 +2413,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_84-ppc64le-qcow2_customize-boot.json
index b4495a45f..be52d445e 100644
--- a/test/data/manifests/rhel_84-ppc64le-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_84-ppc64le-qcow2_customize-boot.json
@@ -2616,6 +2616,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-ppc64le-tar-boot.json b/test/data/manifests/rhel_84-ppc64le-tar-boot.json
index 1e94f234b..63074fca6 100644
--- a/test/data/manifests/rhel_84-ppc64le-tar-boot.json
+++ b/test/data/manifests/rhel_84-ppc64le-tar-boot.json
@@ -1436,6 +1436,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-s390x-qcow2-boot.json b/test/data/manifests/rhel_84-s390x-qcow2-boot.json
index 5ac51918a..15625ac67 100644
--- a/test/data/manifests/rhel_84-s390x-qcow2-boot.json
+++ b/test/data/manifests/rhel_84-s390x-qcow2-boot.json
@@ -2511,6 +2511,14 @@
             "type": "org.osbuild.zipl",
             "options": {}
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_84-s390x-qcow2_customize-boot.json
index 83c0a68a4..5eb8b4917 100644
--- a/test/data/manifests/rhel_84-s390x-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_84-s390x-qcow2_customize-boot.json
@@ -2714,6 +2714,14 @@
             "type": "org.osbuild.zipl",
             "options": {}
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-s390x-tar-boot.json b/test/data/manifests/rhel_84-s390x-tar-boot.json
index 5e890225b..1c183d874 100644
--- a/test/data/manifests/rhel_84-s390x-tar-boot.json
+++ b/test/data/manifests/rhel_84-s390x-tar-boot.json
@@ -1715,6 +1715,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-ami-boot.json b/test/data/manifests/rhel_84-x86_64-ami-boot.json
index 346102f71..0ce7111d6 100644
--- a/test/data/manifests/rhel_84-x86_64-ami-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-ami-boot.json
@@ -2248,6 +2248,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_84-x86_64-azure_rhui-boot.json
index d31052e39..dafae34f9 100644
--- a/test/data/manifests/rhel_84-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-azure_rhui-boot.json
@@ -3075,6 +3075,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_84-x86_64-azure_sap_rhui-boot.json
index b52dfda0d..075190e16 100644
--- a/test/data/manifests/rhel_84-x86_64-azure_sap_rhui-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-azure_sap_rhui-boot.json
@@ -3672,6 +3672,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-ec2-boot.json b/test/data/manifests/rhel_84-x86_64-ec2-boot.json
index 7fd6845f0..0ac9575a7 100644
--- a/test/data/manifests/rhel_84-x86_64-ec2-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-ec2-boot.json
@@ -2266,6 +2266,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_84-x86_64-ec2_ha-boot.json
index 64287a609..9cabe5b4e 100644
--- a/test/data/manifests/rhel_84-x86_64-ec2_ha-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-ec2_ha-boot.json
@@ -2802,6 +2802,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_84-x86_64-ec2_sap-boot.json
index df54ddf65..467192185 100644
--- a/test/data/manifests/rhel_84-x86_64-ec2_sap-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-ec2_sap-boot.json
@@ -3572,6 +3572,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_84-x86_64-edge_commit-boot.json
index 7f9d595e5..ba36208ae 100644
--- a/test/data/manifests/rhel_84-x86_64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-edge_commit-boot.json
@@ -2100,6 +2100,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_84-x86_64-edge_commit_rt-boot.json
index de078f8fc..f51a2538d 100644
--- a/test/data/manifests/rhel_84-x86_64-edge_commit_rt-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-edge_commit_rt-boot.json
@@ -2176,6 +2176,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_84-x86_64-edge_commit_with_container-boot.json
index a286ce022..57c525deb 100644
--- a/test/data/manifests/rhel_84-x86_64-edge_commit_with_container-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-edge_commit_with_container-boot.json
@@ -2165,6 +2165,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-edge_container-boot.json b/test/data/manifests/rhel_84-x86_64-edge_container-boot.json
index d93932861..2bb19f437 100644
--- a/test/data/manifests/rhel_84-x86_64-edge_container-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-edge_container-boot.json
@@ -2090,6 +2090,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-gce-boot.json b/test/data/manifests/rhel_84-x86_64-gce-boot.json
index 9946bf4a6..f3bb45878 100644
--- a/test/data/manifests/rhel_84-x86_64-gce-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-gce-boot.json
@@ -2412,6 +2412,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json
index e87cd8c63..008438347 100644
--- a/test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json
@@ -2423,6 +2423,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-image_installer-boot.json b/test/data/manifests/rhel_84-x86_64-image_installer-boot.json
index c606e8300..1efeebd9c 100644
--- a/test/data/manifests/rhel_84-x86_64-image_installer-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-image_installer-boot.json
@@ -2525,6 +2525,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_84-x86_64-image_installer_with_users-boot.json
index 8ce5cad9a..335304755 100644
--- a/test/data/manifests/rhel_84-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-image_installer_with_users-boot.json
@@ -2608,6 +2608,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-oci-boot.json b/test/data/manifests/rhel_84-x86_64-oci-boot.json
index 1e2e09fe4..cc5603c91 100644
--- a/test/data/manifests/rhel_84-x86_64-oci-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-oci-boot.json
@@ -2288,6 +2288,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-openstack-boot.json b/test/data/manifests/rhel_84-x86_64-openstack-boot.json
index 9556894ee..0a1e2cbcb 100644
--- a/test/data/manifests/rhel_84-x86_64-openstack-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-openstack-boot.json
@@ -2296,6 +2296,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-qcow2-boot.json b/test/data/manifests/rhel_84-x86_64-qcow2-boot.json
index d6295355e..24d7d6710 100644
--- a/test/data/manifests/rhel_84-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-qcow2-boot.json
@@ -2309,6 +2309,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_84-x86_64-qcow2_customize-boot.json
index e38d7e0bb..3bba48eb5 100644
--- a/test/data/manifests/rhel_84-x86_64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-qcow2_customize-boot.json
@@ -2515,6 +2515,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-tar-boot.json b/test/data/manifests/rhel_84-x86_64-tar-boot.json
index 0309ce8c9..4ed7c5626 100644
--- a/test/data/manifests/rhel_84-x86_64-tar-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-tar-boot.json
@@ -1439,6 +1439,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-vhd-boot.json b/test/data/manifests/rhel_84-x86_64-vhd-boot.json
index 2996c4218..a4ccb3163 100644
--- a/test/data/manifests/rhel_84-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-vhd-boot.json
@@ -3041,6 +3041,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_84-x86_64-vmdk-boot.json b/test/data/manifests/rhel_84-x86_64-vmdk-boot.json
index ba92ec5af..b02fd8dd9 100644
--- a/test/data/manifests/rhel_84-x86_64-vmdk-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-vmdk-boot.json
@@ -2317,6 +2317,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-aarch64-ami-boot.json b/test/data/manifests/rhel_85-aarch64-ami-boot.json
index 8ddccc0bc..7ad678eed 100644
--- a/test/data/manifests/rhel_85-aarch64-ami-boot.json
+++ b/test/data/manifests/rhel_85-aarch64-ami-boot.json
@@ -2284,6 +2284,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-aarch64-ec2-boot.json b/test/data/manifests/rhel_85-aarch64-ec2-boot.json
index a2c45017d..1f402a287 100644
--- a/test/data/manifests/rhel_85-aarch64-ec2-boot.json
+++ b/test/data/manifests/rhel_85-aarch64-ec2-boot.json
@@ -2300,6 +2300,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_85-aarch64-edge_commit-boot.json
index 0e8f8be91..c752bc6b4 100644
--- a/test/data/manifests/rhel_85-aarch64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_85-aarch64-edge_commit-boot.json
@@ -1962,6 +1962,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_85-aarch64-edge_commit_with_container-boot.json
index 547d6474f..c8b027a92 100644
--- a/test/data/manifests/rhel_85-aarch64-edge_commit_with_container-boot.json
+++ b/test/data/manifests/rhel_85-aarch64-edge_commit_with_container-boot.json
@@ -2096,6 +2096,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-aarch64-edge_container-boot.json b/test/data/manifests/rhel_85-aarch64-edge_container-boot.json
index b2b6b7f08..0962deaa1 100644
--- a/test/data/manifests/rhel_85-aarch64-edge_container-boot.json
+++ b/test/data/manifests/rhel_85-aarch64-edge_container-boot.json
@@ -1962,6 +1962,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-aarch64-image_installer-boot.json b/test/data/manifests/rhel_85-aarch64-image_installer-boot.json
index 2b2770ccf..8e8b6e446 100644
--- a/test/data/manifests/rhel_85-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_85-aarch64-image_installer-boot.json
@@ -2456,6 +2456,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_85-aarch64-image_installer_with_users-boot.json
index 6a3e3bbd0..359286fe5 100644
--- a/test/data/manifests/rhel_85-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_85-aarch64-image_installer_with_users-boot.json
@@ -2539,6 +2539,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-aarch64-openstack-boot.json b/test/data/manifests/rhel_85-aarch64-openstack-boot.json
index c086be5ac..1dff023a5 100644
--- a/test/data/manifests/rhel_85-aarch64-openstack-boot.json
+++ b/test/data/manifests/rhel_85-aarch64-openstack-boot.json
@@ -2247,6 +2247,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-aarch64-qcow2-boot.json b/test/data/manifests/rhel_85-aarch64-qcow2-boot.json
index 0d9e57b0c..30915ed25 100644
--- a/test/data/manifests/rhel_85-aarch64-qcow2-boot.json
+++ b/test/data/manifests/rhel_85-aarch64-qcow2-boot.json
@@ -2242,6 +2242,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json
index 24d6af6b7..57a45a1b1 100644
--- a/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json
@@ -2501,6 +2501,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-aarch64-tar-boot.json b/test/data/manifests/rhel_85-aarch64-tar-boot.json
index 71e05bf29..c541fd3c2 100644
--- a/test/data/manifests/rhel_85-aarch64-tar-boot.json
+++ b/test/data/manifests/rhel_85-aarch64-tar-boot.json
@@ -1361,6 +1361,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_85-ppc64le-qcow2-boot.json
index 08f6819b9..dfe0499b0 100644
--- a/test/data/manifests/rhel_85-ppc64le-qcow2-boot.json
+++ b/test/data/manifests/rhel_85-ppc64le-qcow2-boot.json
@@ -2398,6 +2398,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json
index 080d634ad..daca65884 100644
--- a/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json
@@ -2654,6 +2654,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-ppc64le-tar-boot.json b/test/data/manifests/rhel_85-ppc64le-tar-boot.json
index b63ec0f29..64e6c57cb 100644
--- a/test/data/manifests/rhel_85-ppc64le-tar-boot.json
+++ b/test/data/manifests/rhel_85-ppc64le-tar-boot.json
@@ -1436,6 +1436,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-s390x-qcow2-boot.json b/test/data/manifests/rhel_85-s390x-qcow2-boot.json
index f265a25fc..1e07e70a3 100644
--- a/test/data/manifests/rhel_85-s390x-qcow2-boot.json
+++ b/test/data/manifests/rhel_85-s390x-qcow2-boot.json
@@ -2496,6 +2496,14 @@
             "type": "org.osbuild.zipl",
             "options": {}
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json
index cec97373f..aece8efbf 100644
--- a/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json
@@ -2751,6 +2751,14 @@
             "type": "org.osbuild.zipl",
             "options": {}
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-s390x-tar-boot.json b/test/data/manifests/rhel_85-s390x-tar-boot.json
index 24203f455..514d3a2a0 100644
--- a/test/data/manifests/rhel_85-s390x-tar-boot.json
+++ b/test/data/manifests/rhel_85-s390x-tar-boot.json
@@ -1715,6 +1715,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-ami-boot.json b/test/data/manifests/rhel_85-x86_64-ami-boot.json
index e923a0fb1..76189ef2f 100644
--- a/test/data/manifests/rhel_85-x86_64-ami-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-ami-boot.json
@@ -2209,6 +2209,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json
index af79bcb3f..91fa5bcc6 100644
--- a/test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json
@@ -3048,6 +3048,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_85-x86_64-azure_sap_rhui-boot.json
index 0d54e7a65..c2ff87eed 100644
--- a/test/data/manifests/rhel_85-x86_64-azure_sap_rhui-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-azure_sap_rhui-boot.json
@@ -3648,6 +3648,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-ec2-boot.json b/test/data/manifests/rhel_85-x86_64-ec2-boot.json
index 481d03cf7..bcaba56f5 100644
--- a/test/data/manifests/rhel_85-x86_64-ec2-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-ec2-boot.json
@@ -2226,6 +2226,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_85-x86_64-ec2_ha-boot.json
index 6ce478cf1..5b2c0b3d7 100644
--- a/test/data/manifests/rhel_85-x86_64-ec2_ha-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-ec2_ha-boot.json
@@ -2758,6 +2758,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_85-x86_64-edge_commit-boot.json
index 1ec8cea83..68ccf163f 100644
--- a/test/data/manifests/rhel_85-x86_64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-edge_commit-boot.json
@@ -2041,6 +2041,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_85-x86_64-edge_commit_rt-boot.json
index ffdd3b566..d608740b3 100644
--- a/test/data/manifests/rhel_85-x86_64-edge_commit_rt-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-edge_commit_rt-boot.json
@@ -2114,6 +2114,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_85-x86_64-edge_commit_with_container-boot.json
index aa3cd8dc4..d06539a86 100644
--- a/test/data/manifests/rhel_85-x86_64-edge_commit_with_container-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-edge_commit_with_container-boot.json
@@ -2175,6 +2175,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-edge_container-boot.json b/test/data/manifests/rhel_85-x86_64-edge_container-boot.json
index af86312a7..683402039 100644
--- a/test/data/manifests/rhel_85-x86_64-edge_container-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-edge_container-boot.json
@@ -2031,6 +2031,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-gce-boot.json b/test/data/manifests/rhel_85-x86_64-gce-boot.json
index 47920fb7a..1342b9842 100644
--- a/test/data/manifests/rhel_85-x86_64-gce-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-gce-boot.json
@@ -2380,6 +2380,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json
index b9b314c6a..aa7ec036d 100644
--- a/test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json
@@ -2391,6 +2391,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-image_installer-boot.json b/test/data/manifests/rhel_85-x86_64-image_installer-boot.json
index 702908acd..3b5820c4e 100644
--- a/test/data/manifests/rhel_85-x86_64-image_installer-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-image_installer-boot.json
@@ -2498,6 +2498,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_85-x86_64-image_installer_with_users-boot.json
index 86f4e346a..239b4414a 100644
--- a/test/data/manifests/rhel_85-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-image_installer_with_users-boot.json
@@ -2581,6 +2581,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-oci-boot.json b/test/data/manifests/rhel_85-x86_64-oci-boot.json
index 60601ee67..b092c1f4e 100644
--- a/test/data/manifests/rhel_85-x86_64-oci-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-oci-boot.json
@@ -2258,6 +2258,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-openstack-boot.json b/test/data/manifests/rhel_85-x86_64-openstack-boot.json
index a2136f4e6..17de3ceb7 100644
--- a/test/data/manifests/rhel_85-x86_64-openstack-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-openstack-boot.json
@@ -2293,6 +2293,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-qcow2-boot.json b/test/data/manifests/rhel_85-x86_64-qcow2-boot.json
index 1c4cf726e..a0cbefc5d 100644
--- a/test/data/manifests/rhel_85-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-qcow2-boot.json
@@ -2279,6 +2279,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json
index d2bc6a126..d8f6106bf 100644
--- a/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json
@@ -2541,6 +2541,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-tar-boot.json b/test/data/manifests/rhel_85-x86_64-tar-boot.json
index adcbd290a..9ca884159 100644
--- a/test/data/manifests/rhel_85-x86_64-tar-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-tar-boot.json
@@ -1385,6 +1385,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-vhd-boot.json b/test/data/manifests/rhel_85-x86_64-vhd-boot.json
index 26c0a5f38..1e872bd3c 100644
--- a/test/data/manifests/rhel_85-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-vhd-boot.json
@@ -3014,6 +3014,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_85-x86_64-vmdk-boot.json b/test/data/manifests/rhel_85-x86_64-vmdk-boot.json
index 64a820f6a..ce1f50d40 100644
--- a/test/data/manifests/rhel_85-x86_64-vmdk-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-vmdk-boot.json
@@ -2290,6 +2290,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-aarch64-ami-boot.json b/test/data/manifests/rhel_86-aarch64-ami-boot.json
index 471a15939..e0baddf80 100644
--- a/test/data/manifests/rhel_86-aarch64-ami-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-ami-boot.json
@@ -2287,6 +2287,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-aarch64-ec2-boot.json b/test/data/manifests/rhel_86-aarch64-ec2-boot.json
index 0e77ddc2c..45a8ad17f 100644
--- a/test/data/manifests/rhel_86-aarch64-ec2-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-ec2-boot.json
@@ -2303,6 +2303,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_86-aarch64-edge_commit-boot.json
index 6b472654c..12edbc953 100644
--- a/test/data/manifests/rhel_86-aarch64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-edge_commit-boot.json
@@ -1957,6 +1957,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_86-aarch64-edge_commit_with_container-boot.json
index 840bb1c99..093a3a630 100644
--- a/test/data/manifests/rhel_86-aarch64-edge_commit_with_container-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-edge_commit_with_container-boot.json
@@ -2079,6 +2079,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-aarch64-edge_container-boot.json b/test/data/manifests/rhel_86-aarch64-edge_container-boot.json
index fdc2eece5..60c5674a7 100644
--- a/test/data/manifests/rhel_86-aarch64-edge_container-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-edge_container-boot.json
@@ -1957,6 +1957,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-aarch64-image_installer-boot.json b/test/data/manifests/rhel_86-aarch64-image_installer-boot.json
index 16c3c2a9a..031d3d02f 100644
--- a/test/data/manifests/rhel_86-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-image_installer-boot.json
@@ -2447,6 +2447,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_86-aarch64-image_installer_with_users-boot.json
index eb265e58c..7b6c18146 100644
--- a/test/data/manifests/rhel_86-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-image_installer_with_users-boot.json
@@ -2530,6 +2530,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-aarch64-openstack-boot.json b/test/data/manifests/rhel_86-aarch64-openstack-boot.json
index 420b2ec5b..1e57f05d0 100644
--- a/test/data/manifests/rhel_86-aarch64-openstack-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-openstack-boot.json
@@ -2247,6 +2247,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-aarch64-qcow2-boot.json b/test/data/manifests/rhel_86-aarch64-qcow2-boot.json
index feb296253..60db4ff7c 100644
--- a/test/data/manifests/rhel_86-aarch64-qcow2-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-qcow2-boot.json
@@ -2245,6 +2245,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json
index 8a7363c04..d6e9adb49 100644
--- a/test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json
@@ -2496,6 +2496,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-aarch64-tar-boot.json b/test/data/manifests/rhel_86-aarch64-tar-boot.json
index 8de15bd16..98b0214fa 100644
--- a/test/data/manifests/rhel_86-aarch64-tar-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-tar-boot.json
@@ -1367,6 +1367,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_86-ppc64le-qcow2-boot.json
index cccf30d8e..b74c90401 100644
--- a/test/data/manifests/rhel_86-ppc64le-qcow2-boot.json
+++ b/test/data/manifests/rhel_86-ppc64le-qcow2-boot.json
@@ -2389,6 +2389,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json
index 833c74b03..92f591f94 100644
--- a/test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json
@@ -2640,6 +2640,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-ppc64le-tar-boot.json b/test/data/manifests/rhel_86-ppc64le-tar-boot.json
index 22312ebdb..00cb81ba2 100644
--- a/test/data/manifests/rhel_86-ppc64le-tar-boot.json
+++ b/test/data/manifests/rhel_86-ppc64le-tar-boot.json
@@ -1388,6 +1388,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-s390x-qcow2-boot.json b/test/data/manifests/rhel_86-s390x-qcow2-boot.json
index 207e97009..09dbdb3f0 100644
--- a/test/data/manifests/rhel_86-s390x-qcow2-boot.json
+++ b/test/data/manifests/rhel_86-s390x-qcow2-boot.json
@@ -2478,6 +2478,14 @@
             "type": "org.osbuild.zipl",
             "options": {}
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json
index e89180308..869d4ab38 100644
--- a/test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json
@@ -2728,6 +2728,14 @@
             "type": "org.osbuild.zipl",
             "options": {}
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-s390x-tar-boot.json b/test/data/manifests/rhel_86-s390x-tar-boot.json
index 97f2f1c5e..c5fe73092 100644
--- a/test/data/manifests/rhel_86-s390x-tar-boot.json
+++ b/test/data/manifests/rhel_86-s390x-tar-boot.json
@@ -1664,6 +1664,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-ami-boot.json b/test/data/manifests/rhel_86-x86_64-ami-boot.json
index baa4d3b3a..9105a7377 100644
--- a/test/data/manifests/rhel_86-x86_64-ami-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-ami-boot.json
@@ -2218,6 +2218,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json
index 694c3f305..7d74f6eb3 100644
--- a/test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json
@@ -3045,6 +3045,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_86-x86_64-azure_sap_rhui-boot.json
index b74b17a75..6bb4259d6 100644
--- a/test/data/manifests/rhel_86-x86_64-azure_sap_rhui-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-azure_sap_rhui-boot.json
@@ -3720,6 +3720,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-ec2-boot.json b/test/data/manifests/rhel_86-x86_64-ec2-boot.json
index e3f7a939a..28e5945a5 100644
--- a/test/data/manifests/rhel_86-x86_64-ec2-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-ec2-boot.json
@@ -2236,6 +2236,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_86-x86_64-ec2_ha-boot.json
index e64567af4..f21ac4c4c 100644
--- a/test/data/manifests/rhel_86-x86_64-ec2_ha-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-ec2_ha-boot.json
@@ -2769,6 +2769,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_86-x86_64-ec2_sap-boot.json
index abea25485..08e0f061c 100644
--- a/test/data/manifests/rhel_86-x86_64-ec2_sap-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-ec2_sap-boot.json
@@ -3626,6 +3626,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_86-x86_64-edge_commit-boot.json
index 4102668bd..01e201a16 100644
--- a/test/data/manifests/rhel_86-x86_64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-edge_commit-boot.json
@@ -2036,6 +2036,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_86-x86_64-edge_commit_rt-boot.json
index cdacef8d7..06b7a9796 100644
--- a/test/data/manifests/rhel_86-x86_64-edge_commit_rt-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-edge_commit_rt-boot.json
@@ -2112,6 +2112,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_86-x86_64-edge_commit_with_container-boot.json
index 9bb5b10f8..28affab2c 100644
--- a/test/data/manifests/rhel_86-x86_64-edge_commit_with_container-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-edge_commit_with_container-boot.json
@@ -2158,6 +2158,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-edge_container-boot.json b/test/data/manifests/rhel_86-x86_64-edge_container-boot.json
index b19b34776..4f37aed3a 100644
--- a/test/data/manifests/rhel_86-x86_64-edge_container-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-edge_container-boot.json
@@ -2026,6 +2026,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-gce-boot.json b/test/data/manifests/rhel_86-x86_64-gce-boot.json
index c90d6766d..4d9020462 100644
--- a/test/data/manifests/rhel_86-x86_64-gce-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-gce-boot.json
@@ -2380,6 +2380,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json
index ee0620bdf..d0e13eb1e 100644
--- a/test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json
@@ -2391,6 +2391,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-image_installer-boot.json b/test/data/manifests/rhel_86-x86_64-image_installer-boot.json
index 9781f214e..df691c691 100644
--- a/test/data/manifests/rhel_86-x86_64-image_installer-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-image_installer-boot.json
@@ -2489,6 +2489,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_86-x86_64-image_installer_with_users-boot.json
index fa9eec03e..fa2288984 100644
--- a/test/data/manifests/rhel_86-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-image_installer_with_users-boot.json
@@ -2572,6 +2572,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-oci-boot.json b/test/data/manifests/rhel_86-x86_64-oci-boot.json
index 7c6dfe0d2..e5eaa37d4 100644
--- a/test/data/manifests/rhel_86-x86_64-oci-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-oci-boot.json
@@ -2261,6 +2261,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-openstack-boot.json b/test/data/manifests/rhel_86-x86_64-openstack-boot.json
index 4822a15a3..fb70bc6ca 100644
--- a/test/data/manifests/rhel_86-x86_64-openstack-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-openstack-boot.json
@@ -2293,6 +2293,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-qcow2-boot.json b/test/data/manifests/rhel_86-x86_64-qcow2-boot.json
index 5092c70fc..b83c96a5b 100644
--- a/test/data/manifests/rhel_86-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-qcow2-boot.json
@@ -2282,6 +2282,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json
index e3fec7bdb..32ab3fa19 100644
--- a/test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json
@@ -2536,6 +2536,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-tar-boot.json b/test/data/manifests/rhel_86-x86_64-tar-boot.json
index 46e7eca8b..eaba1e1cc 100644
--- a/test/data/manifests/rhel_86-x86_64-tar-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-tar-boot.json
@@ -1391,6 +1391,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-vhd-boot.json b/test/data/manifests/rhel_86-x86_64-vhd-boot.json
index 0df5623aa..59be06ea1 100644
--- a/test/data/manifests/rhel_86-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-vhd-boot.json
@@ -3011,6 +3011,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_86-x86_64-vmdk-boot.json b/test/data/manifests/rhel_86-x86_64-vmdk-boot.json
index bb11643fc..46716f4f9 100644
--- a/test/data/manifests/rhel_86-x86_64-vmdk-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-vmdk-boot.json
@@ -2293,6 +2293,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-aarch64-ami-boot.json b/test/data/manifests/rhel_87-aarch64-ami-boot.json
index ce3bd10da..d88c6769a 100644
--- a/test/data/manifests/rhel_87-aarch64-ami-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-ami-boot.json
@@ -2284,6 +2284,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-aarch64-ec2-boot.json b/test/data/manifests/rhel_87-aarch64-ec2-boot.json
index 35dbbf22d..9480d9237 100644
--- a/test/data/manifests/rhel_87-aarch64-ec2-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-ec2-boot.json
@@ -2290,6 +2290,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_87-aarch64-edge_commit-boot.json
index 457f76000..82798cbe5 100644
--- a/test/data/manifests/rhel_87-aarch64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-edge_commit-boot.json
@@ -1960,6 +1960,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_87-aarch64-edge_commit_with_container-boot.json
index 3bc2f387f..c83f16dc5 100644
--- a/test/data/manifests/rhel_87-aarch64-edge_commit_with_container-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-edge_commit_with_container-boot.json
@@ -2082,6 +2082,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-aarch64-edge_container-boot.json b/test/data/manifests/rhel_87-aarch64-edge_container-boot.json
index bad5eeec9..aeb062942 100644
--- a/test/data/manifests/rhel_87-aarch64-edge_container-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-edge_container-boot.json
@@ -1960,6 +1960,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-aarch64-image_installer-boot.json b/test/data/manifests/rhel_87-aarch64-image_installer-boot.json
index 4c9de85a5..16c41249e 100644
--- a/test/data/manifests/rhel_87-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-image_installer-boot.json
@@ -2441,6 +2441,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_87-aarch64-image_installer_with_users-boot.json
index dfc9fdad3..510e888dc 100644
--- a/test/data/manifests/rhel_87-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-image_installer_with_users-boot.json
@@ -2527,6 +2527,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-aarch64-openstack-boot.json b/test/data/manifests/rhel_87-aarch64-openstack-boot.json
index 20c23bff0..c9bbc0628 100644
--- a/test/data/manifests/rhel_87-aarch64-openstack-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-openstack-boot.json
@@ -2256,6 +2256,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-aarch64-qcow2-boot.json b/test/data/manifests/rhel_87-aarch64-qcow2-boot.json
index 4d97285de..e15e059b9 100644
--- a/test/data/manifests/rhel_87-aarch64-qcow2-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-qcow2-boot.json
@@ -2248,6 +2248,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_87-aarch64-qcow2_customize-boot.json
index cc8def6a1..f20c18f94 100644
--- a/test/data/manifests/rhel_87-aarch64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-qcow2_customize-boot.json
@@ -2499,6 +2499,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-aarch64-tar-boot.json b/test/data/manifests/rhel_87-aarch64-tar-boot.json
index dafb3e195..43de834b6 100644
--- a/test/data/manifests/rhel_87-aarch64-tar-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-tar-boot.json
@@ -1367,6 +1367,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_87-ppc64le-qcow2-boot.json
index 5a123305b..1afd1f9f2 100644
--- a/test/data/manifests/rhel_87-ppc64le-qcow2-boot.json
+++ b/test/data/manifests/rhel_87-ppc64le-qcow2-boot.json
@@ -2392,6 +2392,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_87-ppc64le-qcow2_customize-boot.json
index ea788231d..e45e25fd7 100644
--- a/test/data/manifests/rhel_87-ppc64le-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_87-ppc64le-qcow2_customize-boot.json
@@ -2643,6 +2643,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-ppc64le-tar-boot.json b/test/data/manifests/rhel_87-ppc64le-tar-boot.json
index 267b79618..d57002830 100644
--- a/test/data/manifests/rhel_87-ppc64le-tar-boot.json
+++ b/test/data/manifests/rhel_87-ppc64le-tar-boot.json
@@ -1388,6 +1388,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-s390x-qcow2-boot.json b/test/data/manifests/rhel_87-s390x-qcow2-boot.json
index 1ea8b66b2..2356257a1 100644
--- a/test/data/manifests/rhel_87-s390x-qcow2-boot.json
+++ b/test/data/manifests/rhel_87-s390x-qcow2-boot.json
@@ -2496,6 +2496,14 @@
             "type": "org.osbuild.zipl",
             "options": {}
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_87-s390x-qcow2_customize-boot.json
index 2b9e9fd93..77adc247d 100644
--- a/test/data/manifests/rhel_87-s390x-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_87-s390x-qcow2_customize-boot.json
@@ -2746,6 +2746,14 @@
             "type": "org.osbuild.zipl",
             "options": {}
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-s390x-tar-boot.json b/test/data/manifests/rhel_87-s390x-tar-boot.json
index b4a359629..5a2792389 100644
--- a/test/data/manifests/rhel_87-s390x-tar-boot.json
+++ b/test/data/manifests/rhel_87-s390x-tar-boot.json
@@ -1676,6 +1676,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-ami-boot.json b/test/data/manifests/rhel_87-x86_64-ami-boot.json
index e19a5f3cf..33fa60d60 100644
--- a/test/data/manifests/rhel_87-x86_64-ami-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-ami-boot.json
@@ -2218,6 +2218,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_87-x86_64-azure_rhui-boot.json
index a29b62db1..590c56afd 100644
--- a/test/data/manifests/rhel_87-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-azure_rhui-boot.json
@@ -3042,6 +3042,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_87-x86_64-azure_sap_rhui-boot.json
index dc1c4700b..b82a6112b 100644
--- a/test/data/manifests/rhel_87-x86_64-azure_sap_rhui-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-azure_sap_rhui-boot.json
@@ -3679,6 +3679,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-ec2-boot.json b/test/data/manifests/rhel_87-x86_64-ec2-boot.json
index bc0891c53..449fc3b21 100644
--- a/test/data/manifests/rhel_87-x86_64-ec2-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-ec2-boot.json
@@ -2226,6 +2226,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_87-x86_64-ec2_ha-boot.json
index dd2941ccb..221e78429 100644
--- a/test/data/manifests/rhel_87-x86_64-ec2_ha-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-ec2_ha-boot.json
@@ -2759,6 +2759,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_87-x86_64-ec2_sap-boot.json
index bddda0d54..90826e397 100644
--- a/test/data/manifests/rhel_87-x86_64-ec2_sap-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-ec2_sap-boot.json
@@ -3585,6 +3585,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_87-x86_64-edge_commit-boot.json
index 933d90377..52493038b 100644
--- a/test/data/manifests/rhel_87-x86_64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-edge_commit-boot.json
@@ -2039,6 +2039,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_87-x86_64-edge_commit_rt-boot.json
index 4b284b8dc..1e3020f3d 100644
--- a/test/data/manifests/rhel_87-x86_64-edge_commit_rt-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-edge_commit_rt-boot.json
@@ -2112,6 +2112,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_87-x86_64-edge_commit_with_container-boot.json
index 45e131350..c2d48d1b7 100644
--- a/test/data/manifests/rhel_87-x86_64-edge_commit_with_container-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-edge_commit_with_container-boot.json
@@ -2161,6 +2161,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-edge_container-boot.json b/test/data/manifests/rhel_87-x86_64-edge_container-boot.json
index 479e60a1a..a07687c10 100644
--- a/test/data/manifests/rhel_87-x86_64-edge_container-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-edge_container-boot.json
@@ -2029,6 +2029,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-gce-boot.json b/test/data/manifests/rhel_87-x86_64-gce-boot.json
index d4a2716cb..3a8d06efd 100644
--- a/test/data/manifests/rhel_87-x86_64-gce-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-gce-boot.json
@@ -2374,6 +2374,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json
index a29ee65c2..81da1ebf2 100644
--- a/test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json
@@ -2385,6 +2385,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-image_installer-boot.json b/test/data/manifests/rhel_87-x86_64-image_installer-boot.json
index 3e2860d9e..c4acd8707 100644
--- a/test/data/manifests/rhel_87-x86_64-image_installer-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-image_installer-boot.json
@@ -2483,6 +2483,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_87-x86_64-image_installer_with_users-boot.json
index 72d75323b..41e5e4737 100644
--- a/test/data/manifests/rhel_87-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-image_installer_with_users-boot.json
@@ -2569,6 +2569,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-oci-boot.json b/test/data/manifests/rhel_87-x86_64-oci-boot.json
index c0fdd9b62..97d9c9479 100644
--- a/test/data/manifests/rhel_87-x86_64-oci-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-oci-boot.json
@@ -2264,6 +2264,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-openstack-boot.json b/test/data/manifests/rhel_87-x86_64-openstack-boot.json
index a24fbc73d..ae0961b63 100644
--- a/test/data/manifests/rhel_87-x86_64-openstack-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-openstack-boot.json
@@ -2302,6 +2302,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-qcow2-boot.json b/test/data/manifests/rhel_87-x86_64-qcow2-boot.json
index 6577f6283..e86766bec 100644
--- a/test/data/manifests/rhel_87-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-qcow2-boot.json
@@ -2285,6 +2285,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_87-x86_64-qcow2_customize-boot.json
index 91cd1e59f..ae7bec099 100644
--- a/test/data/manifests/rhel_87-x86_64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-qcow2_customize-boot.json
@@ -2539,6 +2539,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-tar-boot.json b/test/data/manifests/rhel_87-x86_64-tar-boot.json
index 0a52dfbb5..94a8fe254 100644
--- a/test/data/manifests/rhel_87-x86_64-tar-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-tar-boot.json
@@ -1391,6 +1391,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-vhd-boot.json b/test/data/manifests/rhel_87-x86_64-vhd-boot.json
index 05c7d0e7a..a7c737e01 100644
--- a/test/data/manifests/rhel_87-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-vhd-boot.json
@@ -3008,6 +3008,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_87-x86_64-vmdk-boot.json b/test/data/manifests/rhel_87-x86_64-vmdk-boot.json
index 5b5a80012..45559a5d7 100644
--- a/test/data/manifests/rhel_87-x86_64-vmdk-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-vmdk-boot.json
@@ -2296,6 +2296,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-aarch64-ami-boot.json b/test/data/manifests/rhel_88-aarch64-ami-boot.json
index cd996135f..c7f34e0a5 100644
--- a/test/data/manifests/rhel_88-aarch64-ami-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-ami-boot.json
@@ -2284,6 +2284,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-aarch64-ec2-boot.json b/test/data/manifests/rhel_88-aarch64-ec2-boot.json
index a2fc5e014..ad618f34c 100644
--- a/test/data/manifests/rhel_88-aarch64-ec2-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-ec2-boot.json
@@ -2290,6 +2290,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_88-aarch64-edge_commit-boot.json
index 618c10dc4..8dc4e0111 100644
--- a/test/data/manifests/rhel_88-aarch64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-edge_commit-boot.json
@@ -1960,6 +1960,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_88-aarch64-edge_commit_with_container-boot.json
index 829b1f2c0..6be9c7ed2 100644
--- a/test/data/manifests/rhel_88-aarch64-edge_commit_with_container-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-edge_commit_with_container-boot.json
@@ -2082,6 +2082,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-aarch64-edge_container-boot.json b/test/data/manifests/rhel_88-aarch64-edge_container-boot.json
index d3672cf28..063f444bc 100644
--- a/test/data/manifests/rhel_88-aarch64-edge_container-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-edge_container-boot.json
@@ -1960,6 +1960,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-aarch64-image_installer-boot.json b/test/data/manifests/rhel_88-aarch64-image_installer-boot.json
index 88efdcf3b..d8c49fc98 100644
--- a/test/data/manifests/rhel_88-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-image_installer-boot.json
@@ -2441,6 +2441,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_88-aarch64-image_installer_with_users-boot.json
index d8e434fcd..9c900dc69 100644
--- a/test/data/manifests/rhel_88-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-image_installer_with_users-boot.json
@@ -2527,6 +2527,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-aarch64-openstack-boot.json b/test/data/manifests/rhel_88-aarch64-openstack-boot.json
index 3bdbe29cb..03a0ec466 100644
--- a/test/data/manifests/rhel_88-aarch64-openstack-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-openstack-boot.json
@@ -2256,6 +2256,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-aarch64-qcow2-boot.json b/test/data/manifests/rhel_88-aarch64-qcow2-boot.json
index 2f1a1f88f..352cbfada 100644
--- a/test/data/manifests/rhel_88-aarch64-qcow2-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-qcow2-boot.json
@@ -2248,6 +2248,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_88-aarch64-qcow2_customize-boot.json
index b15041328..798f8f536 100644
--- a/test/data/manifests/rhel_88-aarch64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-qcow2_customize-boot.json
@@ -2499,6 +2499,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-aarch64-tar-boot.json b/test/data/manifests/rhel_88-aarch64-tar-boot.json
index 566b71bfe..6126b8a00 100644
--- a/test/data/manifests/rhel_88-aarch64-tar-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-tar-boot.json
@@ -1367,6 +1367,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_88-ppc64le-qcow2-boot.json
index 40cabb164..ec31eb907 100644
--- a/test/data/manifests/rhel_88-ppc64le-qcow2-boot.json
+++ b/test/data/manifests/rhel_88-ppc64le-qcow2-boot.json
@@ -2392,6 +2392,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_88-ppc64le-qcow2_customize-boot.json
index 7f14acf30..45b7e90bf 100644
--- a/test/data/manifests/rhel_88-ppc64le-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_88-ppc64le-qcow2_customize-boot.json
@@ -2643,6 +2643,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-ppc64le-tar-boot.json b/test/data/manifests/rhel_88-ppc64le-tar-boot.json
index 6ca109ee9..f164c1df8 100644
--- a/test/data/manifests/rhel_88-ppc64le-tar-boot.json
+++ b/test/data/manifests/rhel_88-ppc64le-tar-boot.json
@@ -1388,6 +1388,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-s390x-qcow2-boot.json b/test/data/manifests/rhel_88-s390x-qcow2-boot.json
index a30bd8b47..19da00919 100644
--- a/test/data/manifests/rhel_88-s390x-qcow2-boot.json
+++ b/test/data/manifests/rhel_88-s390x-qcow2-boot.json
@@ -2496,6 +2496,14 @@
             "type": "org.osbuild.zipl",
             "options": {}
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_88-s390x-qcow2_customize-boot.json
index a5f2c4535..911127d8e 100644
--- a/test/data/manifests/rhel_88-s390x-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_88-s390x-qcow2_customize-boot.json
@@ -2746,6 +2746,14 @@
             "type": "org.osbuild.zipl",
             "options": {}
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-s390x-tar-boot.json b/test/data/manifests/rhel_88-s390x-tar-boot.json
index c1a58386f..f6d31e0c8 100644
--- a/test/data/manifests/rhel_88-s390x-tar-boot.json
+++ b/test/data/manifests/rhel_88-s390x-tar-boot.json
@@ -1676,6 +1676,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-ami-boot.json b/test/data/manifests/rhel_88-x86_64-ami-boot.json
index 8edb352c7..9ea143945 100644
--- a/test/data/manifests/rhel_88-x86_64-ami-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-ami-boot.json
@@ -2218,6 +2218,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_88-x86_64-azure_rhui-boot.json
index 370ede8ca..f08abaef3 100644
--- a/test/data/manifests/rhel_88-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-azure_rhui-boot.json
@@ -3042,6 +3042,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_88-x86_64-azure_sap_rhui-boot.json
index 7744de1bf..53ae34685 100644
--- a/test/data/manifests/rhel_88-x86_64-azure_sap_rhui-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-azure_sap_rhui-boot.json
@@ -3679,6 +3679,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-ec2-boot.json b/test/data/manifests/rhel_88-x86_64-ec2-boot.json
index 4c9a1cab1..9e7edde73 100644
--- a/test/data/manifests/rhel_88-x86_64-ec2-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-ec2-boot.json
@@ -2226,6 +2226,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_88-x86_64-ec2_ha-boot.json
index 8e9052503..7f770db53 100644
--- a/test/data/manifests/rhel_88-x86_64-ec2_ha-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-ec2_ha-boot.json
@@ -2759,6 +2759,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_88-x86_64-ec2_sap-boot.json
index a126517ad..3419a4a76 100644
--- a/test/data/manifests/rhel_88-x86_64-ec2_sap-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-ec2_sap-boot.json
@@ -3585,6 +3585,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_88-x86_64-edge_commit-boot.json
index bdd1b615d..ae77f3815 100644
--- a/test/data/manifests/rhel_88-x86_64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-edge_commit-boot.json
@@ -2039,6 +2039,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_88-x86_64-edge_commit_rt-boot.json
index 66d5f1395..55e63668c 100644
--- a/test/data/manifests/rhel_88-x86_64-edge_commit_rt-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-edge_commit_rt-boot.json
@@ -2109,6 +2109,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_88-x86_64-edge_commit_with_container-boot.json
index 7000cd50b..c4def352c 100644
--- a/test/data/manifests/rhel_88-x86_64-edge_commit_with_container-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-edge_commit_with_container-boot.json
@@ -2161,6 +2161,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-edge_container-boot.json b/test/data/manifests/rhel_88-x86_64-edge_container-boot.json
index 1d6c05d30..d2548fe74 100644
--- a/test/data/manifests/rhel_88-x86_64-edge_container-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-edge_container-boot.json
@@ -2029,6 +2029,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-gce-boot.json b/test/data/manifests/rhel_88-x86_64-gce-boot.json
index 162403164..10ddcbc1e 100644
--- a/test/data/manifests/rhel_88-x86_64-gce-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-gce-boot.json
@@ -2374,6 +2374,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_88-x86_64-gce_rhui-boot.json
index 712af9f3c..5f77846a9 100644
--- a/test/data/manifests/rhel_88-x86_64-gce_rhui-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-gce_rhui-boot.json
@@ -2385,6 +2385,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-image_installer-boot.json b/test/data/manifests/rhel_88-x86_64-image_installer-boot.json
index b523f119f..11bf9dec9 100644
--- a/test/data/manifests/rhel_88-x86_64-image_installer-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-image_installer-boot.json
@@ -2483,6 +2483,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_88-x86_64-image_installer_with_users-boot.json
index ec274e6cc..73d0d2108 100644
--- a/test/data/manifests/rhel_88-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-image_installer_with_users-boot.json
@@ -2569,6 +2569,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-oci-boot.json b/test/data/manifests/rhel_88-x86_64-oci-boot.json
index 7a2c342be..04c34779c 100644
--- a/test/data/manifests/rhel_88-x86_64-oci-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-oci-boot.json
@@ -2264,6 +2264,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-openstack-boot.json b/test/data/manifests/rhel_88-x86_64-openstack-boot.json
index 83e07e767..ceb1b4659 100644
--- a/test/data/manifests/rhel_88-x86_64-openstack-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-openstack-boot.json
@@ -2302,6 +2302,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-qcow2-boot.json b/test/data/manifests/rhel_88-x86_64-qcow2-boot.json
index 77be892ce..3cc1d955b 100644
--- a/test/data/manifests/rhel_88-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-qcow2-boot.json
@@ -2285,6 +2285,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_88-x86_64-qcow2_customize-boot.json
index 3b526ff5d..74d75904a 100644
--- a/test/data/manifests/rhel_88-x86_64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-qcow2_customize-boot.json
@@ -2539,6 +2539,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-tar-boot.json b/test/data/manifests/rhel_88-x86_64-tar-boot.json
index b88f8fa6b..6b1fe47c9 100644
--- a/test/data/manifests/rhel_88-x86_64-tar-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-tar-boot.json
@@ -1391,6 +1391,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-vhd-boot.json b/test/data/manifests/rhel_88-x86_64-vhd-boot.json
index 5eb7602ee..b45c49ad0 100644
--- a/test/data/manifests/rhel_88-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-vhd-boot.json
@@ -3008,6 +3008,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_88-x86_64-vmdk-boot.json b/test/data/manifests/rhel_88-x86_64-vmdk-boot.json
index 11b764892..d90d0cdce 100644
--- a/test/data/manifests/rhel_88-x86_64-vmdk-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-vmdk-boot.json
@@ -2296,6 +2296,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-aarch64-ami-boot.json b/test/data/manifests/rhel_90-aarch64-ami-boot.json
index a16b45390..6fadaa1fe 100644
--- a/test/data/manifests/rhel_90-aarch64-ami-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-ami-boot.json
@@ -1917,6 +1917,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-aarch64-ec2-boot.json b/test/data/manifests/rhel_90-aarch64-ec2-boot.json
index 4eec9dd9f..baad05706 100644
--- a/test/data/manifests/rhel_90-aarch64-ec2-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-ec2-boot.json
@@ -1936,6 +1936,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_90-aarch64-edge_commit-boot.json
index a04349127..478d7f513 100644
--- a/test/data/manifests/rhel_90-aarch64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-edge_commit-boot.json
@@ -1680,6 +1680,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_90-aarch64-edge_commit_with_container-boot.json
index 5f9228e3f..d8530e546 100644
--- a/test/data/manifests/rhel_90-aarch64-edge_commit_with_container-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-edge_commit_with_container-boot.json
@@ -1793,6 +1793,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-aarch64-edge_container-boot.json b/test/data/manifests/rhel_90-aarch64-edge_container-boot.json
index 2a6bedecb..af3b81ab0 100644
--- a/test/data/manifests/rhel_90-aarch64-edge_container-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-edge_container-boot.json
@@ -1680,6 +1680,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-aarch64-image_installer-boot.json b/test/data/manifests/rhel_90-aarch64-image_installer-boot.json
index 0d6c28fa4..26dc46910 100644
--- a/test/data/manifests/rhel_90-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-image_installer-boot.json
@@ -5106,6 +5106,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json
index 974c55ea7..14449c778 100644
--- a/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json
@@ -5201,6 +5201,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-aarch64-openstack-boot.json b/test/data/manifests/rhel_90-aarch64-openstack-boot.json
index d13636013..8895d7854 100644
--- a/test/data/manifests/rhel_90-aarch64-openstack-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-openstack-boot.json
@@ -1819,6 +1819,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json
index 7e4509724..54fa2c31b 100644
--- a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json
@@ -1874,6 +1874,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json
index ef3851450..31f886681 100644
--- a/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json
@@ -2068,6 +2068,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-aarch64-tar-boot.json b/test/data/manifests/rhel_90-aarch64-tar-boot.json
index dd76b8a4c..e2e2bebfe 100644
--- a/test/data/manifests/rhel_90-aarch64-tar-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-tar-boot.json
@@ -860,6 +860,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json
index 6802bd52d..39153e002 100644
--- a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json
+++ b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json
@@ -2101,6 +2101,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json
index f4e31745a..f2612dbc6 100644
--- a/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json
@@ -2289,6 +2289,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-ppc64le-tar-boot.json b/test/data/manifests/rhel_90-ppc64le-tar-boot.json
index bbedc6697..7413e10a4 100644
--- a/test/data/manifests/rhel_90-ppc64le-tar-boot.json
+++ b/test/data/manifests/rhel_90-ppc64le-tar-boot.json
@@ -1223,6 +1223,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-s390x-qcow2-boot.json b/test/data/manifests/rhel_90-s390x-qcow2-boot.json
index e4872620e..ca2e337cd 100644
--- a/test/data/manifests/rhel_90-s390x-qcow2-boot.json
+++ b/test/data/manifests/rhel_90-s390x-qcow2-boot.json
@@ -1957,6 +1957,14 @@
             "type": "org.osbuild.zipl",
             "options": {}
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json
index d79b99652..905f4345b 100644
--- a/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json
@@ -2151,6 +2151,14 @@
             "type": "org.osbuild.zipl",
             "options": {}
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-s390x-tar-boot.json b/test/data/manifests/rhel_90-s390x-tar-boot.json
index 79c7ccabf..15f7ee7b5 100644
--- a/test/data/manifests/rhel_90-s390x-tar-boot.json
+++ b/test/data/manifests/rhel_90-s390x-tar-boot.json
@@ -1127,6 +1127,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-ami-boot.json b/test/data/manifests/rhel_90-x86_64-ami-boot.json
index a93373a3e..e17f90729 100644
--- a/test/data/manifests/rhel_90-x86_64-ami-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-ami-boot.json
@@ -1917,6 +1917,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_90-x86_64-azure_rhui-boot.json
index 75294e2e1..5834398af 100644
--- a/test/data/manifests/rhel_90-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-azure_rhui-boot.json
@@ -2718,6 +2718,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-ec2-boot.json b/test/data/manifests/rhel_90-x86_64-ec2-boot.json
index 060c514ac..8e488efdf 100644
--- a/test/data/manifests/rhel_90-x86_64-ec2-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-ec2-boot.json
@@ -1938,6 +1938,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json
index e22e6ef58..d1abc6f2e 100644
--- a/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json
@@ -2510,6 +2510,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json
index 3289d20df..e252fda59 100644
--- a/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json
@@ -3430,6 +3430,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_90-x86_64-edge_commit-boot.json
index b48ec4277..740af0af6 100644
--- a/test/data/manifests/rhel_90-x86_64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-edge_commit-boot.json
@@ -1768,6 +1768,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_90-x86_64-edge_commit_rt-boot.json
index 71311f8c6..4b28d7753 100644
--- a/test/data/manifests/rhel_90-x86_64-edge_commit_rt-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-edge_commit_rt-boot.json
@@ -1937,6 +1937,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_90-x86_64-edge_commit_with_container-boot.json
index b8d41edac..37b9d677f 100644
--- a/test/data/manifests/rhel_90-x86_64-edge_commit_with_container-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-edge_commit_with_container-boot.json
@@ -1881,6 +1881,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-edge_container-boot.json b/test/data/manifests/rhel_90-x86_64-edge_container-boot.json
index 51119fb2b..71d4ff243 100644
--- a/test/data/manifests/rhel_90-x86_64-edge_container-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-edge_container-boot.json
@@ -1758,6 +1758,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-gce-boot.json b/test/data/manifests/rhel_90-x86_64-gce-boot.json
index d0709908b..e1ca568dc 100644
--- a/test/data/manifests/rhel_90-x86_64-gce-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-gce-boot.json
@@ -2004,6 +2004,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json
index a2e28a202..f8973414e 100644
--- a/test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json
@@ -2010,6 +2010,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-image_installer-boot.json b/test/data/manifests/rhel_90-x86_64-image_installer-boot.json
index b2f273ca7..f08c2fdc3 100644
--- a/test/data/manifests/rhel_90-x86_64-image_installer-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-image_installer-boot.json
@@ -5197,6 +5197,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_90-x86_64-image_installer_with_users-boot.json
index f16920201..fb1b0a7e5 100644
--- a/test/data/manifests/rhel_90-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-image_installer_with_users-boot.json
@@ -5292,6 +5292,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-oci-boot.json b/test/data/manifests/rhel_90-x86_64-oci-boot.json
index 47eba559e..005daf34d 100644
--- a/test/data/manifests/rhel_90-x86_64-oci-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-oci-boot.json
@@ -1956,6 +1956,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-openstack-boot.json b/test/data/manifests/rhel_90-x86_64-openstack-boot.json
index e43ed4ece..12849b2b6 100644
--- a/test/data/manifests/rhel_90-x86_64-openstack-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-openstack-boot.json
@@ -1964,6 +1964,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json
index 293e9bd41..8aa58ac6b 100644
--- a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json
@@ -1977,6 +1977,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json
index cdc7adc8d..73283f802 100644
--- a/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json
@@ -2201,6 +2201,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-tar-boot.json b/test/data/manifests/rhel_90-x86_64-tar-boot.json
index d41e19568..0610b8551 100644
--- a/test/data/manifests/rhel_90-x86_64-tar-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-tar-boot.json
@@ -863,6 +863,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-vhd-boot.json b/test/data/manifests/rhel_90-x86_64-vhd-boot.json
index 75606bfe6..1970bb749 100644
--- a/test/data/manifests/rhel_90-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-vhd-boot.json
@@ -2678,6 +2678,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-vmdk-boot.json b/test/data/manifests/rhel_90-x86_64-vmdk-boot.json
index 9f4dcc4c8..d8ac8f757 100644
--- a/test/data/manifests/rhel_90-x86_64-vmdk-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-vmdk-boot.json
@@ -1964,6 +1964,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-aarch64-ami-boot.json b/test/data/manifests/rhel_91-aarch64-ami-boot.json
index fb99213a0..d9a311db5 100644
--- a/test/data/manifests/rhel_91-aarch64-ami-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-ami-boot.json
@@ -4612,6 +4612,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-aarch64-ec2-boot.json b/test/data/manifests/rhel_91-aarch64-ec2-boot.json
index 60d630ed0..11f37be0f 100644
--- a/test/data/manifests/rhel_91-aarch64-ec2-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-ec2-boot.json
@@ -4645,6 +4645,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_91-aarch64-edge_commit-boot.json
index 90e26c184..d0657ee15 100644
--- a/test/data/manifests/rhel_91-aarch64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-edge_commit-boot.json
@@ -4487,6 +4487,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_91-aarch64-edge_commit_with_container-boot.json
index 4cb6c5ce6..e3b57e790 100644
--- a/test/data/manifests/rhel_91-aarch64-edge_commit_with_container-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-edge_commit_with_container-boot.json
@@ -4536,6 +4536,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-aarch64-edge_container-boot.json b/test/data/manifests/rhel_91-aarch64-edge_container-boot.json
index 1cef368f8..ab68dfde1 100644
--- a/test/data/manifests/rhel_91-aarch64-edge_container-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-edge_container-boot.json
@@ -4487,6 +4487,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-aarch64-image_installer-boot.json b/test/data/manifests/rhel_91-aarch64-image_installer-boot.json
index 73ed491b0..fb4c01332 100644
--- a/test/data/manifests/rhel_91-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-image_installer-boot.json
@@ -13302,6 +13302,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json
index 3c498b496..1c1a09cde 100644
--- a/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json
@@ -13489,6 +13489,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-aarch64-openstack-boot.json b/test/data/manifests/rhel_91-aarch64-openstack-boot.json
index d9edc28fb..e2c2624cd 100644
--- a/test/data/manifests/rhel_91-aarch64-openstack-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-openstack-boot.json
@@ -4569,6 +4569,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-aarch64-qcow2-boot.json b/test/data/manifests/rhel_91-aarch64-qcow2-boot.json
index cde5ba628..bf4f10b59 100644
--- a/test/data/manifests/rhel_91-aarch64-qcow2-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-qcow2-boot.json
@@ -4716,6 +4716,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_91-aarch64-qcow2_customize-boot.json
index c3286783a..828ccd4e6 100644
--- a/test/data/manifests/rhel_91-aarch64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-qcow2_customize-boot.json
@@ -5306,6 +5306,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-aarch64-tar-boot.json b/test/data/manifests/rhel_91-aarch64-tar-boot.json
index 9b4154c97..7d69c3a91 100644
--- a/test/data/manifests/rhel_91-aarch64-tar-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-tar-boot.json
@@ -2045,6 +2045,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_91-ppc64le-qcow2-boot.json
index 5c7020a97..5588de70a 100644
--- a/test/data/manifests/rhel_91-ppc64le-qcow2-boot.json
+++ b/test/data/manifests/rhel_91-ppc64le-qcow2-boot.json
@@ -5330,6 +5330,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_91-ppc64le-qcow2_customize-boot.json
index 0b9688ab5..67b11642a 100644
--- a/test/data/manifests/rhel_91-ppc64le-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_91-ppc64le-qcow2_customize-boot.json
@@ -5904,6 +5904,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-ppc64le-tar-boot.json b/test/data/manifests/rhel_91-ppc64le-tar-boot.json
index 8ac571504..8257cf54a 100644
--- a/test/data/manifests/rhel_91-ppc64le-tar-boot.json
+++ b/test/data/manifests/rhel_91-ppc64le-tar-boot.json
@@ -3013,6 +3013,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-s390x-qcow2-boot.json b/test/data/manifests/rhel_91-s390x-qcow2-boot.json
index 0a4e246fb..3b5ccec9c 100644
--- a/test/data/manifests/rhel_91-s390x-qcow2-boot.json
+++ b/test/data/manifests/rhel_91-s390x-qcow2-boot.json
@@ -4977,6 +4977,14 @@
             "type": "org.osbuild.zipl",
             "options": {}
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_91-s390x-qcow2_customize-boot.json
index ff5eb457c..3b54bf716 100644
--- a/test/data/manifests/rhel_91-s390x-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_91-s390x-qcow2_customize-boot.json
@@ -5567,6 +5567,14 @@
             "type": "org.osbuild.zipl",
             "options": {}
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-s390x-tar-boot.json b/test/data/manifests/rhel_91-s390x-tar-boot.json
index 359c57394..486338821 100644
--- a/test/data/manifests/rhel_91-s390x-tar-boot.json
+++ b/test/data/manifests/rhel_91-s390x-tar-boot.json
@@ -2765,6 +2765,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-ami-boot.json b/test/data/manifests/rhel_91-x86_64-ami-boot.json
index cdfeab594..3c83b640d 100644
--- a/test/data/manifests/rhel_91-x86_64-ami-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-ami-boot.json
@@ -4573,6 +4573,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_91-x86_64-azure_rhui-boot.json
index 516879e50..e06c57d90 100644
--- a/test/data/manifests/rhel_91-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-azure_rhui-boot.json
@@ -6652,6 +6652,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-ec2-boot.json b/test/data/manifests/rhel_91-x86_64-ec2-boot.json
index 83bcc4bbe..ccb0a640f 100644
--- a/test/data/manifests/rhel_91-x86_64-ec2-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-ec2-boot.json
@@ -4608,6 +4608,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_91-x86_64-ec2_ha-boot.json
index efef7beaa..484a6610e 100644
--- a/test/data/manifests/rhel_91-x86_64-ec2_ha-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-ec2_ha-boot.json
@@ -6052,6 +6052,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_91-x86_64-ec2_sap-boot.json
index 5d52fca81..6b979b97e 100644
--- a/test/data/manifests/rhel_91-x86_64-ec2_sap-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-ec2_sap-boot.json
@@ -8607,6 +8607,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_91-x86_64-edge_commit-boot.json
index cfc129627..5985aa628 100644
--- a/test/data/manifests/rhel_91-x86_64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-edge_commit-boot.json
@@ -4698,6 +4698,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_91-x86_64-edge_commit_rt-boot.json
index 40391adb7..4efd283d5 100644
--- a/test/data/manifests/rhel_91-x86_64-edge_commit_rt-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-edge_commit_rt-boot.json
@@ -5129,6 +5129,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_91-x86_64-edge_commit_with_container-boot.json
index df02d54e6..6dc2501a4 100644
--- a/test/data/manifests/rhel_91-x86_64-edge_commit_with_container-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-edge_commit_with_container-boot.json
@@ -4747,6 +4747,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-edge_container-boot.json b/test/data/manifests/rhel_91-x86_64-edge_container-boot.json
index 5c57691d0..f802e9eff 100644
--- a/test/data/manifests/rhel_91-x86_64-edge_container-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-edge_container-boot.json
@@ -4687,6 +4687,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-gce-boot.json b/test/data/manifests/rhel_91-x86_64-gce-boot.json
index 3e0184257..f4ef18c70 100644
--- a/test/data/manifests/rhel_91-x86_64-gce-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-gce-boot.json
@@ -4834,6 +4834,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json
index b913acc74..debaa125b 100644
--- a/test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json
@@ -4840,6 +4840,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-image_installer-boot.json b/test/data/manifests/rhel_91-x86_64-image_installer-boot.json
index 1afbcbc44..9f227260c 100644
--- a/test/data/manifests/rhel_91-x86_64-image_installer-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-image_installer-boot.json
@@ -13503,6 +13503,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_91-x86_64-image_installer_with_users-boot.json
index 24dd29d23..90a4d0ad2 100644
--- a/test/data/manifests/rhel_91-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-image_installer_with_users-boot.json
@@ -13690,6 +13690,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-oci-boot.json b/test/data/manifests/rhel_91-x86_64-oci-boot.json
index e8dfaddc4..fc9330658 100644
--- a/test/data/manifests/rhel_91-x86_64-oci-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-oci-boot.json
@@ -4952,6 +4952,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-openstack-boot.json b/test/data/manifests/rhel_91-x86_64-openstack-boot.json
index 1d18a9541..362daefef 100644
--- a/test/data/manifests/rhel_91-x86_64-openstack-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-openstack-boot.json
@@ -4930,6 +4930,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-qcow2-boot.json b/test/data/manifests/rhel_91-x86_64-qcow2-boot.json
index 1e133f942..e1962b6bf 100644
--- a/test/data/manifests/rhel_91-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-qcow2-boot.json
@@ -4973,6 +4973,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_91-x86_64-qcow2_customize-boot.json
index c1c60c61f..000e03c31 100644
--- a/test/data/manifests/rhel_91-x86_64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-qcow2_customize-boot.json
@@ -5643,6 +5643,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-tar-boot.json b/test/data/manifests/rhel_91-x86_64-tar-boot.json
index 084240f44..60302dc88 100644
--- a/test/data/manifests/rhel_91-x86_64-tar-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-tar-boot.json
@@ -2053,6 +2053,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-vhd-boot.json b/test/data/manifests/rhel_91-x86_64-vhd-boot.json
index 3e279818c..c65f306e5 100644
--- a/test/data/manifests/rhel_91-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-vhd-boot.json
@@ -6587,6 +6587,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-vmdk-boot.json b/test/data/manifests/rhel_91-x86_64-vmdk-boot.json
index cdeba96ff..2716c61dd 100644
--- a/test/data/manifests/rhel_91-x86_64-vmdk-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-vmdk-boot.json
@@ -4930,6 +4930,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-aarch64-ami-boot.json b/test/data/manifests/rhel_92-aarch64-ami-boot.json
index 7344463e2..2da884a3d 100644
--- a/test/data/manifests/rhel_92-aarch64-ami-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-ami-boot.json
@@ -4612,6 +4612,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-aarch64-ec2-boot.json b/test/data/manifests/rhel_92-aarch64-ec2-boot.json
index 68ecafa6a..f9bb87bfb 100644
--- a/test/data/manifests/rhel_92-aarch64-ec2-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-ec2-boot.json
@@ -4645,6 +4645,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_92-aarch64-edge_commit-boot.json
index 80c8a6ed3..e40918975 100644
--- a/test/data/manifests/rhel_92-aarch64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-edge_commit-boot.json
@@ -4487,6 +4487,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_92-aarch64-edge_commit_with_container-boot.json
index 31830ec29..87c6ce638 100644
--- a/test/data/manifests/rhel_92-aarch64-edge_commit_with_container-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-edge_commit_with_container-boot.json
@@ -4536,6 +4536,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-aarch64-edge_container-boot.json b/test/data/manifests/rhel_92-aarch64-edge_container-boot.json
index daef502be..979a9a8da 100644
--- a/test/data/manifests/rhel_92-aarch64-edge_container-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-edge_container-boot.json
@@ -4487,6 +4487,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-aarch64-image_installer-boot.json b/test/data/manifests/rhel_92-aarch64-image_installer-boot.json
index 6edb1268f..cd5ebdac4 100644
--- a/test/data/manifests/rhel_92-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-image_installer-boot.json
@@ -13326,6 +13326,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_92-aarch64-image_installer_with_users-boot.json
index c693e2f02..ec919e41d 100644
--- a/test/data/manifests/rhel_92-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-image_installer_with_users-boot.json
@@ -13513,6 +13513,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-aarch64-openstack-boot.json b/test/data/manifests/rhel_92-aarch64-openstack-boot.json
index 7525f9086..392b43e08 100644
--- a/test/data/manifests/rhel_92-aarch64-openstack-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-openstack-boot.json
@@ -4569,6 +4569,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-aarch64-qcow2-boot.json b/test/data/manifests/rhel_92-aarch64-qcow2-boot.json
index f4060a2ab..b077d9ca2 100644
--- a/test/data/manifests/rhel_92-aarch64-qcow2-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-qcow2-boot.json
@@ -4716,6 +4716,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_92-aarch64-qcow2_customize-boot.json
index 00f00cd44..a83f16ee9 100644
--- a/test/data/manifests/rhel_92-aarch64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-qcow2_customize-boot.json
@@ -5041,6 +5041,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-aarch64-tar-boot.json b/test/data/manifests/rhel_92-aarch64-tar-boot.json
index 46febf27c..1db90f5f8 100644
--- a/test/data/manifests/rhel_92-aarch64-tar-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-tar-boot.json
@@ -2045,6 +2045,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_92-ppc64le-qcow2-boot.json
index fd5efe611..ed9e9eeb9 100644
--- a/test/data/manifests/rhel_92-ppc64le-qcow2-boot.json
+++ b/test/data/manifests/rhel_92-ppc64le-qcow2-boot.json
@@ -5330,6 +5330,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_92-ppc64le-qcow2_customize-boot.json
index 649c5bc1f..7f873c44c 100644
--- a/test/data/manifests/rhel_92-ppc64le-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_92-ppc64le-qcow2_customize-boot.json
@@ -5639,6 +5639,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-ppc64le-tar-boot.json b/test/data/manifests/rhel_92-ppc64le-tar-boot.json
index 4c493da95..1e4285b4b 100644
--- a/test/data/manifests/rhel_92-ppc64le-tar-boot.json
+++ b/test/data/manifests/rhel_92-ppc64le-tar-boot.json
@@ -3013,6 +3013,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-s390x-qcow2-boot.json b/test/data/manifests/rhel_92-s390x-qcow2-boot.json
index 17a3f8ef3..9531dc719 100644
--- a/test/data/manifests/rhel_92-s390x-qcow2-boot.json
+++ b/test/data/manifests/rhel_92-s390x-qcow2-boot.json
@@ -4977,6 +4977,14 @@
             "type": "org.osbuild.zipl",
             "options": {}
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_92-s390x-qcow2_customize-boot.json
index ba560c0b3..b26b0de24 100644
--- a/test/data/manifests/rhel_92-s390x-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_92-s390x-qcow2_customize-boot.json
@@ -5302,6 +5302,14 @@
             "type": "org.osbuild.zipl",
             "options": {}
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-s390x-tar-boot.json b/test/data/manifests/rhel_92-s390x-tar-boot.json
index 6fffbb15e..25abd543f 100644
--- a/test/data/manifests/rhel_92-s390x-tar-boot.json
+++ b/test/data/manifests/rhel_92-s390x-tar-boot.json
@@ -2765,6 +2765,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-ami-boot.json b/test/data/manifests/rhel_92-x86_64-ami-boot.json
index 255ff769d..5e9bff97c 100644
--- a/test/data/manifests/rhel_92-x86_64-ami-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-ami-boot.json
@@ -4573,6 +4573,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_92-x86_64-azure_rhui-boot.json
index d872ef7aa..888e4030b 100644
--- a/test/data/manifests/rhel_92-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-azure_rhui-boot.json
@@ -6652,6 +6652,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-ec2-boot.json b/test/data/manifests/rhel_92-x86_64-ec2-boot.json
index ec8dbc5a8..28f2d18e9 100644
--- a/test/data/manifests/rhel_92-x86_64-ec2-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-ec2-boot.json
@@ -4608,6 +4608,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_92-x86_64-ec2_ha-boot.json
index fb2d91ff0..6e8d5dc8f 100644
--- a/test/data/manifests/rhel_92-x86_64-ec2_ha-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-ec2_ha-boot.json
@@ -6052,6 +6052,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_92-x86_64-ec2_sap-boot.json
index ee941ff5b..856251f2b 100644
--- a/test/data/manifests/rhel_92-x86_64-ec2_sap-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-ec2_sap-boot.json
@@ -8607,6 +8607,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_92-x86_64-edge_commit-boot.json
index 837574606..86dceabce 100644
--- a/test/data/manifests/rhel_92-x86_64-edge_commit-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-edge_commit-boot.json
@@ -4698,6 +4698,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_92-x86_64-edge_commit_rt-boot.json
index 8ba9e01e5..dc7c224c0 100644
--- a/test/data/manifests/rhel_92-x86_64-edge_commit_rt-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-edge_commit_rt-boot.json
@@ -5129,6 +5129,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_92-x86_64-edge_commit_with_container-boot.json
index 3a93fd649..aedf9d887 100644
--- a/test/data/manifests/rhel_92-x86_64-edge_commit_with_container-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-edge_commit_with_container-boot.json
@@ -4747,6 +4747,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-edge_container-boot.json b/test/data/manifests/rhel_92-x86_64-edge_container-boot.json
index f8638f133..918ea9c6e 100644
--- a/test/data/manifests/rhel_92-x86_64-edge_container-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-edge_container-boot.json
@@ -4687,6 +4687,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-gce-boot.json b/test/data/manifests/rhel_92-x86_64-gce-boot.json
index 6abc13c46..b5016b594 100644
--- a/test/data/manifests/rhel_92-x86_64-gce-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-gce-boot.json
@@ -4834,6 +4834,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_92-x86_64-gce_rhui-boot.json
index 5de3510f3..6846bed19 100644
--- a/test/data/manifests/rhel_92-x86_64-gce_rhui-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-gce_rhui-boot.json
@@ -4840,6 +4840,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-image_installer-boot.json b/test/data/manifests/rhel_92-x86_64-image_installer-boot.json
index ffe9e0dba..7c1399639 100644
--- a/test/data/manifests/rhel_92-x86_64-image_installer-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-image_installer-boot.json
@@ -13527,6 +13527,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_92-x86_64-image_installer_with_users-boot.json
index c85559721..e4e2108cb 100644
--- a/test/data/manifests/rhel_92-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-image_installer_with_users-boot.json
@@ -13714,6 +13714,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-oci-boot.json b/test/data/manifests/rhel_92-x86_64-oci-boot.json
index 0de0c339a..0086b73e5 100644
--- a/test/data/manifests/rhel_92-x86_64-oci-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-oci-boot.json
@@ -4952,6 +4952,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-openstack-boot.json b/test/data/manifests/rhel_92-x86_64-openstack-boot.json
index 005537d2d..2116ffea7 100644
--- a/test/data/manifests/rhel_92-x86_64-openstack-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-openstack-boot.json
@@ -4930,6 +4930,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-qcow2-boot.json b/test/data/manifests/rhel_92-x86_64-qcow2-boot.json
index 4288cd613..fc884d0b1 100644
--- a/test/data/manifests/rhel_92-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-qcow2-boot.json
@@ -4973,6 +4973,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_92-x86_64-qcow2_customize-boot.json
index 65fce611c..ef23aa641 100644
--- a/test/data/manifests/rhel_92-x86_64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-qcow2_customize-boot.json
@@ -5378,6 +5378,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-tar-boot.json b/test/data/manifests/rhel_92-x86_64-tar-boot.json
index e3eb50374..7251bd87f 100644
--- a/test/data/manifests/rhel_92-x86_64-tar-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-tar-boot.json
@@ -2053,6 +2053,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-vhd-boot.json b/test/data/manifests/rhel_92-x86_64-vhd-boot.json
index ff5f664c1..a0cfabcc5 100644
--- a/test/data/manifests/rhel_92-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-vhd-boot.json
@@ -6587,6 +6587,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-vmdk-boot.json b/test/data/manifests/rhel_92-x86_64-vmdk-boot.json
index b61bd17a8..1122bc775 100644
--- a/test/data/manifests/rhel_92-x86_64-vmdk-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-vmdk-boot.json
@@ -4930,6 +4930,14 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.rhsm.facts",
+            "options": {
+              "facts": {
+                "image-builder.osbuild-composer.api-type": "test-manifest"
+              }
+            }
+          },
           {
             "type": "org.osbuild.selinux",
             "options": {