diff --git a/test/data/manifests/rhel_810-aarch64-ami-boot.json b/test/data/manifests/rhel_8.10-aarch64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-ami-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-ami-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_8.10-aarch64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-azure_rhui-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-ec2-boot.json b/test/data/manifests/rhel_8.10-aarch64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-ec2-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-ec2-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_8.10-aarch64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-edge_commit-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_8.10-aarch64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_8.10-aarch64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-edge_container-boot.json b/test/data/manifests/rhel_8.10-aarch64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-edge_container-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-edge_container_customizations-boot.json b/test/data/manifests/rhel_8.10-aarch64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_8.10-aarch64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-edge_installer-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_8.10-aarch64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_8.10-aarch64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8.10-aarch64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-image_installer-boot.json b/test/data/manifests/rhel_8.10-aarch64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-image_installer-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_8.10-aarch64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-minimal_raw-boot.json b/test/data/manifests/rhel_8.10-aarch64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-minimal_raw-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-openstack-boot.json b/test/data/manifests/rhel_8.10-aarch64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-openstack-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-openstack-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-qcow2-boot.json b/test/data/manifests/rhel_8.10-aarch64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-qcow2-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_8.10-aarch64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-tar-boot.json b/test/data/manifests/rhel_8.10-aarch64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-tar-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-tar-boot.json
diff --git a/test/data/manifests/rhel_810-aarch64-vhd-boot.json b/test/data/manifests/rhel_8.10-aarch64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-aarch64-vhd-boot.json
rename to test/data/manifests/rhel_8.10-aarch64-vhd-boot.json
diff --git a/test/data/manifests/rhel_810-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_8.10-ppc64le-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-ppc64le-qcow2-boot.json
rename to test/data/manifests/rhel_8.10-ppc64le-qcow2-boot.json
diff --git a/test/data/manifests/rhel_810-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_8.10-ppc64le-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-ppc64le-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.10-ppc64le-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_810-ppc64le-tar-boot.json b/test/data/manifests/rhel_8.10-ppc64le-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-ppc64le-tar-boot.json
rename to test/data/manifests/rhel_8.10-ppc64le-tar-boot.json
diff --git a/test/data/manifests/rhel_810-s390x-qcow2-boot.json b/test/data/manifests/rhel_8.10-s390x-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-s390x-qcow2-boot.json
rename to test/data/manifests/rhel_8.10-s390x-qcow2-boot.json
diff --git a/test/data/manifests/rhel_810-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_8.10-s390x-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-s390x-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.10-s390x-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_810-s390x-tar-boot.json b/test/data/manifests/rhel_8.10-s390x-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-s390x-tar-boot.json
rename to test/data/manifests/rhel_8.10-s390x-tar-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-ami-boot.json b/test/data/manifests/rhel_8.10-x86_64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-ami-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-ami-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-azure_eap7_rhui-boot.json b/test/data/manifests/rhel_8.10-x86_64-azure_eap7_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-azure_eap7_rhui-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-azure_eap7_rhui-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_8.10-x86_64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-azure_rhui-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_8.10-x86_64-azure_sap_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-azure_sap_rhui-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-azure_sap_rhui-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-ec2-boot.json b/test/data/manifests/rhel_8.10-x86_64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-ec2-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-ec2-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_8.10-x86_64-ec2_ha-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-ec2_ha-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-ec2_ha-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_8.10-x86_64-ec2_sap-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-ec2_sap-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-ec2_sap-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_8.10-x86_64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-edge_commit-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_8.10-x86_64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_8.10-x86_64-edge_commit_rt-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-edge_commit_rt-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-edge_commit_rt-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_8.10-x86_64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-edge_container-boot.json b/test/data/manifests/rhel_8.10-x86_64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-edge_container-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-edge_container_customizations-boot.json b/test/data/manifests/rhel_8.10-x86_64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_8.10-x86_64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-edge_installer-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_8.10-x86_64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_8.10-x86_64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8.10-x86_64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-gce-boot.json b/test/data/manifests/rhel_8.10-x86_64-gce-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-gce-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-gce-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_8.10-x86_64-gce_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-gce_rhui-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-gce_rhui-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-image_installer-boot.json b/test/data/manifests/rhel_8.10-x86_64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-image_installer-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_8.10-x86_64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-minimal_raw-boot.json b/test/data/manifests/rhel_8.10-x86_64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-minimal_raw-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-oci-boot.json b/test/data/manifests/rhel_8.10-x86_64-oci-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-oci-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-oci-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-openstack-boot.json b/test/data/manifests/rhel_8.10-x86_64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-openstack-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-openstack-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-ova-boot.json b/test/data/manifests/rhel_8.10-x86_64-ova-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-ova-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-ova-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-qcow2-boot.json b/test/data/manifests/rhel_8.10-x86_64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-qcow2-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_8.10-x86_64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-tar-boot.json b/test/data/manifests/rhel_8.10-x86_64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-tar-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-tar-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-vhd-boot.json b/test/data/manifests/rhel_8.10-x86_64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-vhd-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-vhd-boot.json
diff --git a/test/data/manifests/rhel_810-x86_64-vmdk-boot.json b/test/data/manifests/rhel_8.10-x86_64-vmdk-boot.json
similarity index 100%
rename from test/data/manifests/rhel_810-x86_64-vmdk-boot.json
rename to test/data/manifests/rhel_8.10-x86_64-vmdk-boot.json
diff --git a/test/data/manifests/rhel_84-aarch64-ami-boot.json b/test/data/manifests/rhel_8.4-aarch64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-aarch64-ami-boot.json
rename to test/data/manifests/rhel_8.4-aarch64-ami-boot.json
diff --git a/test/data/manifests/rhel_84-aarch64-ec2-boot.json b/test/data/manifests/rhel_8.4-aarch64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-aarch64-ec2-boot.json
rename to test/data/manifests/rhel_8.4-aarch64-ec2-boot.json
diff --git a/test/data/manifests/rhel_84-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_8.4-aarch64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-aarch64-edge_commit-boot.json
rename to test/data/manifests/rhel_8.4-aarch64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_84-aarch64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_8.4-aarch64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-aarch64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_8.4-aarch64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_84-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_8.4-aarch64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-aarch64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_8.4-aarch64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_84-aarch64-edge_container-boot.json b/test/data/manifests/rhel_8.4-aarch64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-aarch64-edge_container-boot.json
rename to test/data/manifests/rhel_8.4-aarch64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_84-aarch64-edge_container_customizations-boot.json b/test/data/manifests/rhel_8.4-aarch64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-aarch64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_8.4-aarch64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_84-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_8.4-aarch64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-aarch64-edge_installer-boot.json
rename to test/data/manifests/rhel_8.4-aarch64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_84-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_8.4-aarch64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-aarch64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.4-aarch64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_84-aarch64-image_installer-boot.json b/test/data/manifests/rhel_8.4-aarch64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-aarch64-image_installer-boot.json
rename to test/data/manifests/rhel_8.4-aarch64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_84-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_8.4-aarch64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-aarch64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.4-aarch64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_84-aarch64-minimal_raw-boot.json b/test/data/manifests/rhel_8.4-aarch64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-aarch64-minimal_raw-boot.json
rename to test/data/manifests/rhel_8.4-aarch64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_84-aarch64-openstack-boot.json b/test/data/manifests/rhel_8.4-aarch64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-aarch64-openstack-boot.json
rename to test/data/manifests/rhel_8.4-aarch64-openstack-boot.json
diff --git a/test/data/manifests/rhel_84-aarch64-qcow2-boot.json b/test/data/manifests/rhel_8.4-aarch64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-aarch64-qcow2-boot.json
rename to test/data/manifests/rhel_8.4-aarch64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_84-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_8.4-aarch64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-aarch64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.4-aarch64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_84-aarch64-tar-boot.json b/test/data/manifests/rhel_8.4-aarch64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-aarch64-tar-boot.json
rename to test/data/manifests/rhel_8.4-aarch64-tar-boot.json
diff --git a/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_8.4-ppc64le-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-ppc64le-qcow2-boot.json
rename to test/data/manifests/rhel_8.4-ppc64le-qcow2-boot.json
diff --git a/test/data/manifests/rhel_84-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_8.4-ppc64le-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-ppc64le-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.4-ppc64le-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_84-ppc64le-tar-boot.json b/test/data/manifests/rhel_8.4-ppc64le-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-ppc64le-tar-boot.json
rename to test/data/manifests/rhel_8.4-ppc64le-tar-boot.json
diff --git a/test/data/manifests/rhel_84-s390x-qcow2-boot.json b/test/data/manifests/rhel_8.4-s390x-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-s390x-qcow2-boot.json
rename to test/data/manifests/rhel_8.4-s390x-qcow2-boot.json
diff --git a/test/data/manifests/rhel_84-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_8.4-s390x-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-s390x-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.4-s390x-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_84-s390x-tar-boot.json b/test/data/manifests/rhel_8.4-s390x-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-s390x-tar-boot.json
rename to test/data/manifests/rhel_8.4-s390x-tar-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-ami-boot.json b/test/data/manifests/rhel_8.4-x86_64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-ami-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-ami-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_8.4-x86_64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-azure_rhui-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_8.4-x86_64-azure_sap_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-azure_sap_rhui-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-azure_sap_rhui-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-ec2-boot.json b/test/data/manifests/rhel_8.4-x86_64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-ec2-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-ec2-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_8.4-x86_64-ec2_ha-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-ec2_ha-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-ec2_ha-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_8.4-x86_64-ec2_sap-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-ec2_sap-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-ec2_sap-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_8.4-x86_64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-edge_commit-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_8.4-x86_64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_8.4-x86_64-edge_commit_rt-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-edge_commit_rt-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-edge_commit_rt-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_8.4-x86_64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-edge_container-boot.json b/test/data/manifests/rhel_8.4-x86_64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-edge_container-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-edge_container_customizations-boot.json b/test/data/manifests/rhel_8.4-x86_64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_8.4-x86_64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-edge_installer-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_8.4-x86_64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-gce-boot.json b/test/data/manifests/rhel_8.4-x86_64-gce-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-gce-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-gce-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_8.4-x86_64-gce_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-gce_rhui-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-image_installer-boot.json b/test/data/manifests/rhel_8.4-x86_64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-image_installer-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_8.4-x86_64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-minimal_raw-boot.json b/test/data/manifests/rhel_8.4-x86_64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-minimal_raw-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-oci-boot.json b/test/data/manifests/rhel_8.4-x86_64-oci-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-oci-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-oci-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-openstack-boot.json b/test/data/manifests/rhel_8.4-x86_64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-openstack-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-openstack-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-ova-boot.json b/test/data/manifests/rhel_8.4-x86_64-ova-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-ova-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-ova-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-qcow2-boot.json b/test/data/manifests/rhel_8.4-x86_64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-qcow2-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_8.4-x86_64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-tar-boot.json b/test/data/manifests/rhel_8.4-x86_64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-tar-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-tar-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-vhd-boot.json b/test/data/manifests/rhel_8.4-x86_64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-vhd-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-vhd-boot.json
diff --git a/test/data/manifests/rhel_84-x86_64-vmdk-boot.json b/test/data/manifests/rhel_8.4-x86_64-vmdk-boot.json
similarity index 100%
rename from test/data/manifests/rhel_84-x86_64-vmdk-boot.json
rename to test/data/manifests/rhel_8.4-x86_64-vmdk-boot.json
diff --git a/test/data/manifests/rhel_85-aarch64-ami-boot.json b/test/data/manifests/rhel_8.5-aarch64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-aarch64-ami-boot.json
rename to test/data/manifests/rhel_8.5-aarch64-ami-boot.json
diff --git a/test/data/manifests/rhel_85-aarch64-ec2-boot.json b/test/data/manifests/rhel_8.5-aarch64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-aarch64-ec2-boot.json
rename to test/data/manifests/rhel_8.5-aarch64-ec2-boot.json
diff --git a/test/data/manifests/rhel_85-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_8.5-aarch64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-aarch64-edge_commit-boot.json
rename to test/data/manifests/rhel_8.5-aarch64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_85-aarch64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_8.5-aarch64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-aarch64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_8.5-aarch64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_85-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_8.5-aarch64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-aarch64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_8.5-aarch64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_85-aarch64-edge_container-boot.json b/test/data/manifests/rhel_8.5-aarch64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-aarch64-edge_container-boot.json
rename to test/data/manifests/rhel_8.5-aarch64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_85-aarch64-edge_container_customizations-boot.json b/test/data/manifests/rhel_8.5-aarch64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-aarch64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_8.5-aarch64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_85-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_8.5-aarch64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-aarch64-edge_installer-boot.json
rename to test/data/manifests/rhel_8.5-aarch64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_85-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_8.5-aarch64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-aarch64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.5-aarch64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_85-aarch64-image_installer-boot.json b/test/data/manifests/rhel_8.5-aarch64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-aarch64-image_installer-boot.json
rename to test/data/manifests/rhel_8.5-aarch64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_85-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_8.5-aarch64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-aarch64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.5-aarch64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_85-aarch64-minimal_raw-boot.json b/test/data/manifests/rhel_8.5-aarch64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-aarch64-minimal_raw-boot.json
rename to test/data/manifests/rhel_8.5-aarch64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_85-aarch64-openstack-boot.json b/test/data/manifests/rhel_8.5-aarch64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-aarch64-openstack-boot.json
rename to test/data/manifests/rhel_8.5-aarch64-openstack-boot.json
diff --git a/test/data/manifests/rhel_85-aarch64-qcow2-boot.json b/test/data/manifests/rhel_8.5-aarch64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-aarch64-qcow2-boot.json
rename to test/data/manifests/rhel_8.5-aarch64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_8.5-aarch64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.5-aarch64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_85-aarch64-tar-boot.json b/test/data/manifests/rhel_8.5-aarch64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-aarch64-tar-boot.json
rename to test/data/manifests/rhel_8.5-aarch64-tar-boot.json
diff --git a/test/data/manifests/rhel_85-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_8.5-ppc64le-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-ppc64le-qcow2-boot.json
rename to test/data/manifests/rhel_8.5-ppc64le-qcow2-boot.json
diff --git a/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_8.5-ppc64le-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.5-ppc64le-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_85-ppc64le-tar-boot.json b/test/data/manifests/rhel_8.5-ppc64le-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-ppc64le-tar-boot.json
rename to test/data/manifests/rhel_8.5-ppc64le-tar-boot.json
diff --git a/test/data/manifests/rhel_85-s390x-qcow2-boot.json b/test/data/manifests/rhel_8.5-s390x-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-s390x-qcow2-boot.json
rename to test/data/manifests/rhel_8.5-s390x-qcow2-boot.json
diff --git a/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_8.5-s390x-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.5-s390x-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_85-s390x-tar-boot.json b/test/data/manifests/rhel_8.5-s390x-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-s390x-tar-boot.json
rename to test/data/manifests/rhel_8.5-s390x-tar-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-ami-boot.json b/test/data/manifests/rhel_8.5-x86_64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-ami-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-ami-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_8.5-x86_64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_8.5-x86_64-azure_sap_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-azure_sap_rhui-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-azure_sap_rhui-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-ec2-boot.json b/test/data/manifests/rhel_8.5-x86_64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-ec2-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-ec2-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_8.5-x86_64-ec2_ha-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-ec2_ha-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-ec2_ha-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_8.5-x86_64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-edge_commit-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_8.5-x86_64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_8.5-x86_64-edge_commit_rt-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-edge_commit_rt-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-edge_commit_rt-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_8.5-x86_64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-edge_container-boot.json b/test/data/manifests/rhel_8.5-x86_64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-edge_container-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-edge_container_customizations-boot.json b/test/data/manifests/rhel_8.5-x86_64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_8.5-x86_64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-edge_installer-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_8.5-x86_64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-gce-boot.json b/test/data/manifests/rhel_8.5-x86_64-gce-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-gce-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-gce-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_8.5-x86_64-gce_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-gce_rhui-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-image_installer-boot.json b/test/data/manifests/rhel_8.5-x86_64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-image_installer-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_8.5-x86_64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-minimal_raw-boot.json b/test/data/manifests/rhel_8.5-x86_64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-minimal_raw-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-oci-boot.json b/test/data/manifests/rhel_8.5-x86_64-oci-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-oci-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-oci-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-openstack-boot.json b/test/data/manifests/rhel_8.5-x86_64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-openstack-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-openstack-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-ova-boot.json b/test/data/manifests/rhel_8.5-x86_64-ova-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-ova-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-ova-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-qcow2-boot.json b/test/data/manifests/rhel_8.5-x86_64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-qcow2-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_8.5-x86_64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-tar-boot.json b/test/data/manifests/rhel_8.5-x86_64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-tar-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-tar-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-vhd-boot.json b/test/data/manifests/rhel_8.5-x86_64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-vhd-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-vhd-boot.json
diff --git a/test/data/manifests/rhel_85-x86_64-vmdk-boot.json b/test/data/manifests/rhel_8.5-x86_64-vmdk-boot.json
similarity index 100%
rename from test/data/manifests/rhel_85-x86_64-vmdk-boot.json
rename to test/data/manifests/rhel_8.5-x86_64-vmdk-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-ami-boot.json b/test/data/manifests/rhel_8.6-aarch64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-ami-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-ami-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_8.6-aarch64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-azure_rhui-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-ec2-boot.json b/test/data/manifests/rhel_8.6-aarch64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-ec2-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-ec2-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_8.6-aarch64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-edge_commit-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_8.6-aarch64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_8.6-aarch64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-edge_container-boot.json b/test/data/manifests/rhel_8.6-aarch64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-edge_container-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-edge_container_customizations-boot.json b/test/data/manifests/rhel_8.6-aarch64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_8.6-aarch64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-edge_installer-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_8.6-aarch64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_8.6-aarch64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8.6-aarch64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-image_installer-boot.json b/test/data/manifests/rhel_8.6-aarch64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-image_installer-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_8.6-aarch64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-minimal_raw-boot.json b/test/data/manifests/rhel_8.6-aarch64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-minimal_raw-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-openstack-boot.json b/test/data/manifests/rhel_8.6-aarch64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-openstack-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-openstack-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-qcow2-boot.json b/test/data/manifests/rhel_8.6-aarch64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-qcow2-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_8.6-aarch64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-tar-boot.json b/test/data/manifests/rhel_8.6-aarch64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-tar-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-tar-boot.json
diff --git a/test/data/manifests/rhel_86-aarch64-vhd-boot.json b/test/data/manifests/rhel_8.6-aarch64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-aarch64-vhd-boot.json
rename to test/data/manifests/rhel_8.6-aarch64-vhd-boot.json
diff --git a/test/data/manifests/rhel_86-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_8.6-ppc64le-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-ppc64le-qcow2-boot.json
rename to test/data/manifests/rhel_8.6-ppc64le-qcow2-boot.json
diff --git a/test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_8.6-ppc64le-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.6-ppc64le-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_86-ppc64le-tar-boot.json b/test/data/manifests/rhel_8.6-ppc64le-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-ppc64le-tar-boot.json
rename to test/data/manifests/rhel_8.6-ppc64le-tar-boot.json
diff --git a/test/data/manifests/rhel_86-s390x-qcow2-boot.json b/test/data/manifests/rhel_8.6-s390x-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-s390x-qcow2-boot.json
rename to test/data/manifests/rhel_8.6-s390x-qcow2-boot.json
diff --git a/test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_8.6-s390x-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.6-s390x-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_86-s390x-tar-boot.json b/test/data/manifests/rhel_8.6-s390x-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-s390x-tar-boot.json
rename to test/data/manifests/rhel_8.6-s390x-tar-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-ami-boot.json b/test/data/manifests/rhel_8.6-x86_64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-ami-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-ami-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-azure_eap7_rhui-boot.json b/test/data/manifests/rhel_8.6-x86_64-azure_eap7_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-azure_eap7_rhui-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-azure_eap7_rhui-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_8.6-x86_64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_8.6-x86_64-azure_sap_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-azure_sap_rhui-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-azure_sap_rhui-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-ec2-boot.json b/test/data/manifests/rhel_8.6-x86_64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-ec2-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-ec2-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_8.6-x86_64-ec2_ha-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-ec2_ha-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-ec2_ha-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_8.6-x86_64-ec2_sap-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-ec2_sap-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-ec2_sap-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_8.6-x86_64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-edge_commit-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_8.6-x86_64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_8.6-x86_64-edge_commit_rt-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-edge_commit_rt-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-edge_commit_rt-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_8.6-x86_64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-edge_container-boot.json b/test/data/manifests/rhel_8.6-x86_64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-edge_container-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-edge_container_customizations-boot.json b/test/data/manifests/rhel_8.6-x86_64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_8.6-x86_64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-edge_installer-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_8.6-x86_64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_8.6-x86_64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8.6-x86_64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-gce-boot.json b/test/data/manifests/rhel_8.6-x86_64-gce-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-gce-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-gce-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_8.6-x86_64-gce_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-gce_rhui-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-image_installer-boot.json b/test/data/manifests/rhel_8.6-x86_64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-image_installer-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_8.6-x86_64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-minimal_raw-boot.json b/test/data/manifests/rhel_8.6-x86_64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-minimal_raw-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-oci-boot.json b/test/data/manifests/rhel_8.6-x86_64-oci-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-oci-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-oci-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-openstack-boot.json b/test/data/manifests/rhel_8.6-x86_64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-openstack-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-openstack-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-ova-boot.json b/test/data/manifests/rhel_8.6-x86_64-ova-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-ova-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-ova-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-qcow2-boot.json b/test/data/manifests/rhel_8.6-x86_64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-qcow2-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_8.6-x86_64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-tar-boot.json b/test/data/manifests/rhel_8.6-x86_64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-tar-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-tar-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-vhd-boot.json b/test/data/manifests/rhel_8.6-x86_64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-vhd-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-vhd-boot.json
diff --git a/test/data/manifests/rhel_86-x86_64-vmdk-boot.json b/test/data/manifests/rhel_8.6-x86_64-vmdk-boot.json
similarity index 100%
rename from test/data/manifests/rhel_86-x86_64-vmdk-boot.json
rename to test/data/manifests/rhel_8.6-x86_64-vmdk-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-ami-boot.json b/test/data/manifests/rhel_8.7-aarch64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-ami-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-ami-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_8.7-aarch64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-azure_rhui-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-ec2-boot.json b/test/data/manifests/rhel_8.7-aarch64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-ec2-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-ec2-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_8.7-aarch64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-edge_commit-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_8.7-aarch64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_8.7-aarch64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-edge_container-boot.json b/test/data/manifests/rhel_8.7-aarch64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-edge_container-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-edge_container_customizations-boot.json b/test/data/manifests/rhel_8.7-aarch64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_8.7-aarch64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-edge_installer-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_8.7-aarch64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_8.7-aarch64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8.7-aarch64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-image_installer-boot.json b/test/data/manifests/rhel_8.7-aarch64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-image_installer-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_8.7-aarch64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-minimal_raw-boot.json b/test/data/manifests/rhel_8.7-aarch64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-minimal_raw-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-openstack-boot.json b/test/data/manifests/rhel_8.7-aarch64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-openstack-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-openstack-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-qcow2-boot.json b/test/data/manifests/rhel_8.7-aarch64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-qcow2-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_8.7-aarch64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-tar-boot.json b/test/data/manifests/rhel_8.7-aarch64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-tar-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-tar-boot.json
diff --git a/test/data/manifests/rhel_87-aarch64-vhd-boot.json b/test/data/manifests/rhel_8.7-aarch64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-aarch64-vhd-boot.json
rename to test/data/manifests/rhel_8.7-aarch64-vhd-boot.json
diff --git a/test/data/manifests/rhel_87-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_8.7-ppc64le-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-ppc64le-qcow2-boot.json
rename to test/data/manifests/rhel_8.7-ppc64le-qcow2-boot.json
diff --git a/test/data/manifests/rhel_87-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_8.7-ppc64le-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-ppc64le-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.7-ppc64le-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_87-ppc64le-tar-boot.json b/test/data/manifests/rhel_8.7-ppc64le-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-ppc64le-tar-boot.json
rename to test/data/manifests/rhel_8.7-ppc64le-tar-boot.json
diff --git a/test/data/manifests/rhel_87-s390x-qcow2-boot.json b/test/data/manifests/rhel_8.7-s390x-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-s390x-qcow2-boot.json
rename to test/data/manifests/rhel_8.7-s390x-qcow2-boot.json
diff --git a/test/data/manifests/rhel_87-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_8.7-s390x-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-s390x-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.7-s390x-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_87-s390x-tar-boot.json b/test/data/manifests/rhel_8.7-s390x-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-s390x-tar-boot.json
rename to test/data/manifests/rhel_8.7-s390x-tar-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-ami-boot.json b/test/data/manifests/rhel_8.7-x86_64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-ami-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-ami-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-azure_eap7_rhui-boot.json b/test/data/manifests/rhel_8.7-x86_64-azure_eap7_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-azure_eap7_rhui-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-azure_eap7_rhui-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_8.7-x86_64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-azure_rhui-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_8.7-x86_64-azure_sap_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-azure_sap_rhui-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-azure_sap_rhui-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-ec2-boot.json b/test/data/manifests/rhel_8.7-x86_64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-ec2-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-ec2-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_8.7-x86_64-ec2_ha-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-ec2_ha-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-ec2_ha-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_8.7-x86_64-ec2_sap-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-ec2_sap-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-ec2_sap-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_8.7-x86_64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-edge_commit-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_8.7-x86_64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_8.7-x86_64-edge_commit_rt-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-edge_commit_rt-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-edge_commit_rt-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_8.7-x86_64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-edge_container-boot.json b/test/data/manifests/rhel_8.7-x86_64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-edge_container-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-edge_container_customizations-boot.json b/test/data/manifests/rhel_8.7-x86_64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_8.7-x86_64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-edge_installer-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_8.7-x86_64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_8.7-x86_64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8.7-x86_64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-gce-boot.json b/test/data/manifests/rhel_8.7-x86_64-gce-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-gce-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-gce-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_8.7-x86_64-gce_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-gce_rhui-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-image_installer-boot.json b/test/data/manifests/rhel_8.7-x86_64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-image_installer-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_8.7-x86_64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-minimal_raw-boot.json b/test/data/manifests/rhel_8.7-x86_64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-minimal_raw-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-oci-boot.json b/test/data/manifests/rhel_8.7-x86_64-oci-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-oci-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-oci-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-openstack-boot.json b/test/data/manifests/rhel_8.7-x86_64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-openstack-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-openstack-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-ova-boot.json b/test/data/manifests/rhel_8.7-x86_64-ova-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-ova-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-ova-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-qcow2-boot.json b/test/data/manifests/rhel_8.7-x86_64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-qcow2-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_8.7-x86_64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-tar-boot.json b/test/data/manifests/rhel_8.7-x86_64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-tar-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-tar-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-vhd-boot.json b/test/data/manifests/rhel_8.7-x86_64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-vhd-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-vhd-boot.json
diff --git a/test/data/manifests/rhel_87-x86_64-vmdk-boot.json b/test/data/manifests/rhel_8.7-x86_64-vmdk-boot.json
similarity index 100%
rename from test/data/manifests/rhel_87-x86_64-vmdk-boot.json
rename to test/data/manifests/rhel_8.7-x86_64-vmdk-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-ami-boot.json b/test/data/manifests/rhel_8.8-aarch64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-ami-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-ami-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_8.8-aarch64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-azure_rhui-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-ec2-boot.json b/test/data/manifests/rhel_8.8-aarch64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-ec2-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-ec2-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_8.8-aarch64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-edge_commit-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_8.8-aarch64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_8.8-aarch64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-edge_container-boot.json b/test/data/manifests/rhel_8.8-aarch64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-edge_container-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-edge_container_customizations-boot.json b/test/data/manifests/rhel_8.8-aarch64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_8.8-aarch64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-edge_installer-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_8.8-aarch64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_8.8-aarch64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8.8-aarch64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-image_installer-boot.json b/test/data/manifests/rhel_8.8-aarch64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-image_installer-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_8.8-aarch64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-minimal_raw-boot.json b/test/data/manifests/rhel_8.8-aarch64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-minimal_raw-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-openstack-boot.json b/test/data/manifests/rhel_8.8-aarch64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-openstack-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-openstack-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-qcow2-boot.json b/test/data/manifests/rhel_8.8-aarch64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-qcow2-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_8.8-aarch64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-tar-boot.json b/test/data/manifests/rhel_8.8-aarch64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-tar-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-tar-boot.json
diff --git a/test/data/manifests/rhel_88-aarch64-vhd-boot.json b/test/data/manifests/rhel_8.8-aarch64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-aarch64-vhd-boot.json
rename to test/data/manifests/rhel_8.8-aarch64-vhd-boot.json
diff --git a/test/data/manifests/rhel_88-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_8.8-ppc64le-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-ppc64le-qcow2-boot.json
rename to test/data/manifests/rhel_8.8-ppc64le-qcow2-boot.json
diff --git a/test/data/manifests/rhel_88-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_8.8-ppc64le-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-ppc64le-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.8-ppc64le-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_88-ppc64le-tar-boot.json b/test/data/manifests/rhel_8.8-ppc64le-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-ppc64le-tar-boot.json
rename to test/data/manifests/rhel_8.8-ppc64le-tar-boot.json
diff --git a/test/data/manifests/rhel_88-s390x-qcow2-boot.json b/test/data/manifests/rhel_8.8-s390x-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-s390x-qcow2-boot.json
rename to test/data/manifests/rhel_8.8-s390x-qcow2-boot.json
diff --git a/test/data/manifests/rhel_88-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_8.8-s390x-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-s390x-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.8-s390x-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_88-s390x-tar-boot.json b/test/data/manifests/rhel_8.8-s390x-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-s390x-tar-boot.json
rename to test/data/manifests/rhel_8.8-s390x-tar-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-ami-boot.json b/test/data/manifests/rhel_8.8-x86_64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-ami-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-ami-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-azure_eap7_rhui-boot.json b/test/data/manifests/rhel_8.8-x86_64-azure_eap7_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-azure_eap7_rhui-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-azure_eap7_rhui-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_8.8-x86_64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-azure_rhui-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_8.8-x86_64-azure_sap_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-azure_sap_rhui-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-azure_sap_rhui-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-ec2-boot.json b/test/data/manifests/rhel_8.8-x86_64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-ec2-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-ec2-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_8.8-x86_64-ec2_ha-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-ec2_ha-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-ec2_ha-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_8.8-x86_64-ec2_sap-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-ec2_sap-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-ec2_sap-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_8.8-x86_64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-edge_commit-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_8.8-x86_64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_8.8-x86_64-edge_commit_rt-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-edge_commit_rt-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-edge_commit_rt-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_8.8-x86_64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-edge_container-boot.json b/test/data/manifests/rhel_8.8-x86_64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-edge_container-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-edge_container_customizations-boot.json b/test/data/manifests/rhel_8.8-x86_64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_8.8-x86_64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-edge_installer-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_8.8-x86_64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_8.8-x86_64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8.8-x86_64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-gce-boot.json b/test/data/manifests/rhel_8.8-x86_64-gce-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-gce-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-gce-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_8.8-x86_64-gce_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-gce_rhui-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-gce_rhui-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-image_installer-boot.json b/test/data/manifests/rhel_8.8-x86_64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-image_installer-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_8.8-x86_64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-minimal_raw-boot.json b/test/data/manifests/rhel_8.8-x86_64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-minimal_raw-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-oci-boot.json b/test/data/manifests/rhel_8.8-x86_64-oci-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-oci-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-oci-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-openstack-boot.json b/test/data/manifests/rhel_8.8-x86_64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-openstack-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-openstack-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-ova-boot.json b/test/data/manifests/rhel_8.8-x86_64-ova-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-ova-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-ova-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-qcow2-boot.json b/test/data/manifests/rhel_8.8-x86_64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-qcow2-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_8.8-x86_64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-tar-boot.json b/test/data/manifests/rhel_8.8-x86_64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-tar-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-tar-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-vhd-boot.json b/test/data/manifests/rhel_8.8-x86_64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-vhd-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-vhd-boot.json
diff --git a/test/data/manifests/rhel_88-x86_64-vmdk-boot.json b/test/data/manifests/rhel_8.8-x86_64-vmdk-boot.json
similarity index 100%
rename from test/data/manifests/rhel_88-x86_64-vmdk-boot.json
rename to test/data/manifests/rhel_8.8-x86_64-vmdk-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-ami-boot.json b/test/data/manifests/rhel_8.9-aarch64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-ami-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-ami-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_8.9-aarch64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-azure_rhui-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-ec2-boot.json b/test/data/manifests/rhel_8.9-aarch64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-ec2-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-ec2-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_8.9-aarch64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-edge_commit-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_8.9-aarch64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_8.9-aarch64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-edge_container-boot.json b/test/data/manifests/rhel_8.9-aarch64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-edge_container-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-edge_container_customizations-boot.json b/test/data/manifests/rhel_8.9-aarch64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_8.9-aarch64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-edge_installer-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_8.9-aarch64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_8.9-aarch64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8.9-aarch64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-image_installer-boot.json b/test/data/manifests/rhel_8.9-aarch64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-image_installer-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_8.9-aarch64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-minimal_raw-boot.json b/test/data/manifests/rhel_8.9-aarch64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-minimal_raw-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-openstack-boot.json b/test/data/manifests/rhel_8.9-aarch64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-openstack-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-openstack-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-qcow2-boot.json b/test/data/manifests/rhel_8.9-aarch64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-qcow2-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_8.9-aarch64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-tar-boot.json b/test/data/manifests/rhel_8.9-aarch64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-tar-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-tar-boot.json
diff --git a/test/data/manifests/rhel_89-aarch64-vhd-boot.json b/test/data/manifests/rhel_8.9-aarch64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-aarch64-vhd-boot.json
rename to test/data/manifests/rhel_8.9-aarch64-vhd-boot.json
diff --git a/test/data/manifests/rhel_89-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_8.9-ppc64le-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-ppc64le-qcow2-boot.json
rename to test/data/manifests/rhel_8.9-ppc64le-qcow2-boot.json
diff --git a/test/data/manifests/rhel_89-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_8.9-ppc64le-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-ppc64le-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.9-ppc64le-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_89-ppc64le-tar-boot.json b/test/data/manifests/rhel_8.9-ppc64le-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-ppc64le-tar-boot.json
rename to test/data/manifests/rhel_8.9-ppc64le-tar-boot.json
diff --git a/test/data/manifests/rhel_89-s390x-qcow2-boot.json b/test/data/manifests/rhel_8.9-s390x-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-s390x-qcow2-boot.json
rename to test/data/manifests/rhel_8.9-s390x-qcow2-boot.json
diff --git a/test/data/manifests/rhel_89-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_8.9-s390x-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-s390x-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.9-s390x-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_89-s390x-tar-boot.json b/test/data/manifests/rhel_8.9-s390x-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-s390x-tar-boot.json
rename to test/data/manifests/rhel_8.9-s390x-tar-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-ami-boot.json b/test/data/manifests/rhel_8.9-x86_64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-ami-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-ami-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-azure_eap7_rhui-boot.json b/test/data/manifests/rhel_8.9-x86_64-azure_eap7_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-azure_eap7_rhui-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-azure_eap7_rhui-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_8.9-x86_64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-azure_rhui-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_8.9-x86_64-azure_sap_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-azure_sap_rhui-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-azure_sap_rhui-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-ec2-boot.json b/test/data/manifests/rhel_8.9-x86_64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-ec2-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-ec2-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_8.9-x86_64-ec2_ha-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-ec2_ha-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-ec2_ha-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_8.9-x86_64-ec2_sap-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-ec2_sap-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-ec2_sap-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_8.9-x86_64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-edge_commit-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_8.9-x86_64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_8.9-x86_64-edge_commit_rt-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-edge_commit_rt-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-edge_commit_rt-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_8.9-x86_64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-edge_container-boot.json b/test/data/manifests/rhel_8.9-x86_64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-edge_container-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-edge_container_customizations-boot.json b/test/data/manifests/rhel_8.9-x86_64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_8.9-x86_64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-edge_installer-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_8.9-x86_64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_8.9-x86_64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8.9-x86_64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-gce-boot.json b/test/data/manifests/rhel_8.9-x86_64-gce-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-gce-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-gce-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_8.9-x86_64-gce_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-gce_rhui-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-gce_rhui-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-image_installer-boot.json b/test/data/manifests/rhel_8.9-x86_64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-image_installer-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_8.9-x86_64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-minimal_raw-boot.json b/test/data/manifests/rhel_8.9-x86_64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-minimal_raw-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-oci-boot.json b/test/data/manifests/rhel_8.9-x86_64-oci-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-oci-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-oci-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-openstack-boot.json b/test/data/manifests/rhel_8.9-x86_64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-openstack-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-openstack-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-ova-boot.json b/test/data/manifests/rhel_8.9-x86_64-ova-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-ova-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-ova-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-qcow2-boot.json b/test/data/manifests/rhel_8.9-x86_64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-qcow2-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_8.9-x86_64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-tar-boot.json b/test/data/manifests/rhel_8.9-x86_64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-tar-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-tar-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-vhd-boot.json b/test/data/manifests/rhel_8.9-x86_64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-vhd-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-vhd-boot.json
diff --git a/test/data/manifests/rhel_89-x86_64-vmdk-boot.json b/test/data/manifests/rhel_8.9-x86_64-vmdk-boot.json
similarity index 100%
rename from test/data/manifests/rhel_89-x86_64-vmdk-boot.json
rename to test/data/manifests/rhel_8.9-x86_64-vmdk-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-ami-boot.json b/test/data/manifests/rhel_9.0-aarch64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-ami-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-ami-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_9.0-aarch64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-azure_rhui-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-ec2-boot.json b/test/data/manifests/rhel_9.0-aarch64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-ec2-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-ec2-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-edge_ami-boot.json b/test/data/manifests/rhel_9.0-aarch64-edge_ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-edge_ami-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-edge_ami-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_9.0-aarch64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-edge_commit-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_9.0-aarch64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_9.0-aarch64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-edge_container-boot.json b/test/data/manifests/rhel_9.0-aarch64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-edge_container-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-edge_container_customizations-boot.json b/test/data/manifests/rhel_9.0-aarch64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_9.0-aarch64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-edge_installer-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_9.0-aarch64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_9.0-aarch64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_9.0-aarch64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-image_installer-boot.json b/test/data/manifests/rhel_9.0-aarch64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-image_installer-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_9.0-aarch64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-minimal_raw-boot.json b/test/data/manifests/rhel_9.0-aarch64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-minimal_raw-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-openstack-boot.json b/test/data/manifests/rhel_9.0-aarch64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-openstack-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-openstack-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json b/test/data/manifests/rhel_9.0-aarch64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-qcow2-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_9.0-aarch64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-tar-boot.json b/test/data/manifests/rhel_9.0-aarch64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-tar-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-tar-boot.json
diff --git a/test/data/manifests/rhel_90-aarch64-vhd-boot.json b/test/data/manifests/rhel_9.0-aarch64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-aarch64-vhd-boot.json
rename to test/data/manifests/rhel_9.0-aarch64-vhd-boot.json
diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_9.0-ppc64le-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-ppc64le-qcow2-boot.json
rename to test/data/manifests/rhel_9.0-ppc64le-qcow2-boot.json
diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_9.0-ppc64le-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.0-ppc64le-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_90-ppc64le-tar-boot.json b/test/data/manifests/rhel_9.0-ppc64le-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-ppc64le-tar-boot.json
rename to test/data/manifests/rhel_9.0-ppc64le-tar-boot.json
diff --git a/test/data/manifests/rhel_90-s390x-qcow2-boot.json b/test/data/manifests/rhel_9.0-s390x-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-s390x-qcow2-boot.json
rename to test/data/manifests/rhel_9.0-s390x-qcow2-boot.json
diff --git a/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_9.0-s390x-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.0-s390x-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_90-s390x-tar-boot.json b/test/data/manifests/rhel_9.0-s390x-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-s390x-tar-boot.json
rename to test/data/manifests/rhel_9.0-s390x-tar-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-ami-boot.json b/test/data/manifests/rhel_9.0-x86_64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-ami-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-ami-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_9.0-x86_64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-azure_rhui-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-ec2-boot.json b/test/data/manifests/rhel_9.0-x86_64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-ec2-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-ec2-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_9.0-x86_64-ec2_ha-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-ec2_ha-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_9.0-x86_64-ec2_sap-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-ec2_sap-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-edge_ami-boot.json b/test/data/manifests/rhel_9.0-x86_64-edge_ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-edge_ami-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-edge_ami-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_9.0-x86_64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-edge_commit-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_9.0-x86_64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_9.0-x86_64-edge_commit_rt-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-edge_commit_rt-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-edge_commit_rt-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_9.0-x86_64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-edge_container-boot.json b/test/data/manifests/rhel_9.0-x86_64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-edge_container-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-edge_container_customizations-boot.json b/test/data/manifests/rhel_9.0-x86_64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_9.0-x86_64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-edge_installer-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_9.0-x86_64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_9.0-x86_64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_9.0-x86_64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-gce-boot.json b/test/data/manifests/rhel_9.0-x86_64-gce-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-gce-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-gce-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_9.0-x86_64-gce_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-gce_rhui-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-image_installer-boot.json b/test/data/manifests/rhel_9.0-x86_64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-image_installer-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_9.0-x86_64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-minimal_raw-boot.json b/test/data/manifests/rhel_9.0-x86_64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-minimal_raw-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-oci-boot.json b/test/data/manifests/rhel_9.0-x86_64-oci-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-oci-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-oci-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-openstack-boot.json b/test/data/manifests/rhel_9.0-x86_64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-openstack-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-openstack-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-ova-boot.json b/test/data/manifests/rhel_9.0-x86_64-ova-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-ova-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-ova-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json b/test/data/manifests/rhel_9.0-x86_64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-qcow2-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_9.0-x86_64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-tar-boot.json b/test/data/manifests/rhel_9.0-x86_64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-tar-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-tar-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-vhd-boot.json b/test/data/manifests/rhel_9.0-x86_64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-vhd-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-vhd-boot.json
diff --git a/test/data/manifests/rhel_90-x86_64-vmdk-boot.json b/test/data/manifests/rhel_9.0-x86_64-vmdk-boot.json
similarity index 100%
rename from test/data/manifests/rhel_90-x86_64-vmdk-boot.json
rename to test/data/manifests/rhel_9.0-x86_64-vmdk-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-ami-boot.json b/test/data/manifests/rhel_9.1-aarch64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-ami-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-ami-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_9.1-aarch64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-azure_rhui-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-ec2-boot.json b/test/data/manifests/rhel_9.1-aarch64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-ec2-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-ec2-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-edge_ami-boot.json b/test/data/manifests/rhel_9.1-aarch64-edge_ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-edge_ami-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-edge_ami-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_9.1-aarch64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-edge_commit-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_9.1-aarch64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_9.1-aarch64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-edge_container-boot.json b/test/data/manifests/rhel_9.1-aarch64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-edge_container-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-edge_container_customizations-boot.json b/test/data/manifests/rhel_9.1-aarch64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_9.1-aarch64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-edge_installer-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_9.1-aarch64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_9.1-aarch64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_9.1-aarch64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-image_installer-boot.json b/test/data/manifests/rhel_9.1-aarch64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-image_installer-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_9.1-aarch64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-minimal_raw-boot.json b/test/data/manifests/rhel_9.1-aarch64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-minimal_raw-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-openstack-boot.json b/test/data/manifests/rhel_9.1-aarch64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-openstack-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-openstack-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-qcow2-boot.json b/test/data/manifests/rhel_9.1-aarch64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-qcow2-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_9.1-aarch64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-tar-boot.json b/test/data/manifests/rhel_9.1-aarch64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-tar-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-tar-boot.json
diff --git a/test/data/manifests/rhel_91-aarch64-vhd-boot.json b/test/data/manifests/rhel_9.1-aarch64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-aarch64-vhd-boot.json
rename to test/data/manifests/rhel_9.1-aarch64-vhd-boot.json
diff --git a/test/data/manifests/rhel_91-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_9.1-ppc64le-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-ppc64le-qcow2-boot.json
rename to test/data/manifests/rhel_9.1-ppc64le-qcow2-boot.json
diff --git a/test/data/manifests/rhel_91-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_9.1-ppc64le-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-ppc64le-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.1-ppc64le-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_91-ppc64le-tar-boot.json b/test/data/manifests/rhel_9.1-ppc64le-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-ppc64le-tar-boot.json
rename to test/data/manifests/rhel_9.1-ppc64le-tar-boot.json
diff --git a/test/data/manifests/rhel_91-s390x-qcow2-boot.json b/test/data/manifests/rhel_9.1-s390x-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-s390x-qcow2-boot.json
rename to test/data/manifests/rhel_9.1-s390x-qcow2-boot.json
diff --git a/test/data/manifests/rhel_91-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_9.1-s390x-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-s390x-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.1-s390x-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_91-s390x-tar-boot.json b/test/data/manifests/rhel_9.1-s390x-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-s390x-tar-boot.json
rename to test/data/manifests/rhel_9.1-s390x-tar-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-ami-boot.json b/test/data/manifests/rhel_9.1-x86_64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-ami-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-ami-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_9.1-x86_64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-azure_rhui-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-ec2-boot.json b/test/data/manifests/rhel_9.1-x86_64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-ec2-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-ec2-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_9.1-x86_64-ec2_ha-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-ec2_ha-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-ec2_ha-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_9.1-x86_64-ec2_sap-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-ec2_sap-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-ec2_sap-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-edge_ami-boot.json b/test/data/manifests/rhel_9.1-x86_64-edge_ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-edge_ami-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-edge_ami-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_9.1-x86_64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-edge_commit-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_9.1-x86_64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_9.1-x86_64-edge_commit_rt-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-edge_commit_rt-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-edge_commit_rt-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_9.1-x86_64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-edge_container-boot.json b/test/data/manifests/rhel_9.1-x86_64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-edge_container-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-edge_container_customizations-boot.json b/test/data/manifests/rhel_9.1-x86_64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_9.1-x86_64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-edge_installer-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_9.1-x86_64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_9.1-x86_64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_9.1-x86_64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-gce-boot.json b/test/data/manifests/rhel_9.1-x86_64-gce-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-gce-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-gce-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_9.1-x86_64-gce_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-gce_rhui-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-image_installer-boot.json b/test/data/manifests/rhel_9.1-x86_64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-image_installer-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_9.1-x86_64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-minimal_raw-boot.json b/test/data/manifests/rhel_9.1-x86_64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-minimal_raw-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-oci-boot.json b/test/data/manifests/rhel_9.1-x86_64-oci-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-oci-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-oci-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-openstack-boot.json b/test/data/manifests/rhel_9.1-x86_64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-openstack-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-openstack-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-ova-boot.json b/test/data/manifests/rhel_9.1-x86_64-ova-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-ova-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-ova-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-qcow2-boot.json b/test/data/manifests/rhel_9.1-x86_64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-qcow2-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_9.1-x86_64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-tar-boot.json b/test/data/manifests/rhel_9.1-x86_64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-tar-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-tar-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-vhd-boot.json b/test/data/manifests/rhel_9.1-x86_64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-vhd-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-vhd-boot.json
diff --git a/test/data/manifests/rhel_91-x86_64-vmdk-boot.json b/test/data/manifests/rhel_9.1-x86_64-vmdk-boot.json
similarity index 100%
rename from test/data/manifests/rhel_91-x86_64-vmdk-boot.json
rename to test/data/manifests/rhel_9.1-x86_64-vmdk-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-ami-boot.json b/test/data/manifests/rhel_9.2-aarch64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-ami-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-ami-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_9.2-aarch64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-azure_rhui-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-ec2-boot.json b/test/data/manifests/rhel_9.2-aarch64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-ec2-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-ec2-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-edge_ami-boot.json b/test/data/manifests/rhel_9.2-aarch64-edge_ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-edge_ami-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-edge_ami-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_9.2-aarch64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-edge_commit-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_9.2-aarch64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_9.2-aarch64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-edge_container-boot.json b/test/data/manifests/rhel_9.2-aarch64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-edge_container-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-edge_container_customizations-boot.json b/test/data/manifests/rhel_9.2-aarch64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_9.2-aarch64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-edge_installer-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_9.2-aarch64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_9.2-aarch64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_9.2-aarch64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-image_installer-boot.json b/test/data/manifests/rhel_9.2-aarch64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-image_installer-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_9.2-aarch64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-minimal_raw-boot.json b/test/data/manifests/rhel_9.2-aarch64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-minimal_raw-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-openstack-boot.json b/test/data/manifests/rhel_9.2-aarch64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-openstack-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-openstack-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-qcow2-boot.json b/test/data/manifests/rhel_9.2-aarch64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-qcow2-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_9.2-aarch64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-tar-boot.json b/test/data/manifests/rhel_9.2-aarch64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-tar-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-tar-boot.json
diff --git a/test/data/manifests/rhel_92-aarch64-vhd-boot.json b/test/data/manifests/rhel_9.2-aarch64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-aarch64-vhd-boot.json
rename to test/data/manifests/rhel_9.2-aarch64-vhd-boot.json
diff --git a/test/data/manifests/rhel_92-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_9.2-ppc64le-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-ppc64le-qcow2-boot.json
rename to test/data/manifests/rhel_9.2-ppc64le-qcow2-boot.json
diff --git a/test/data/manifests/rhel_92-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_9.2-ppc64le-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-ppc64le-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.2-ppc64le-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_92-ppc64le-tar-boot.json b/test/data/manifests/rhel_9.2-ppc64le-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-ppc64le-tar-boot.json
rename to test/data/manifests/rhel_9.2-ppc64le-tar-boot.json
diff --git a/test/data/manifests/rhel_92-s390x-qcow2-boot.json b/test/data/manifests/rhel_9.2-s390x-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-s390x-qcow2-boot.json
rename to test/data/manifests/rhel_9.2-s390x-qcow2-boot.json
diff --git a/test/data/manifests/rhel_92-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_9.2-s390x-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-s390x-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.2-s390x-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_92-s390x-tar-boot.json b/test/data/manifests/rhel_9.2-s390x-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-s390x-tar-boot.json
rename to test/data/manifests/rhel_9.2-s390x-tar-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-ami-boot.json b/test/data/manifests/rhel_9.2-x86_64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-ami-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-ami-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_9.2-x86_64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-azure_rhui-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-ec2-boot.json b/test/data/manifests/rhel_9.2-x86_64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-ec2-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-ec2-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_9.2-x86_64-ec2_ha-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-ec2_ha-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-ec2_ha-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_9.2-x86_64-ec2_sap-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-ec2_sap-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-ec2_sap-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-edge_ami-boot.json b/test/data/manifests/rhel_9.2-x86_64-edge_ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-edge_ami-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-edge_ami-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_9.2-x86_64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-edge_commit-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_9.2-x86_64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_9.2-x86_64-edge_commit_rt-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-edge_commit_rt-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-edge_commit_rt-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_9.2-x86_64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-edge_container-boot.json b/test/data/manifests/rhel_9.2-x86_64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-edge_container-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-edge_container_customizations-boot.json b/test/data/manifests/rhel_9.2-x86_64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_9.2-x86_64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-edge_installer-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_9.2-x86_64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_9.2-x86_64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_9.2-x86_64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-gce-boot.json b/test/data/manifests/rhel_9.2-x86_64-gce-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-gce-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-gce-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_9.2-x86_64-gce_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-gce_rhui-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-gce_rhui-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-image_installer-boot.json b/test/data/manifests/rhel_9.2-x86_64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-image_installer-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_9.2-x86_64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-minimal_raw-boot.json b/test/data/manifests/rhel_9.2-x86_64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-minimal_raw-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-oci-boot.json b/test/data/manifests/rhel_9.2-x86_64-oci-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-oci-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-oci-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-openstack-boot.json b/test/data/manifests/rhel_9.2-x86_64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-openstack-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-openstack-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-ova-boot.json b/test/data/manifests/rhel_9.2-x86_64-ova-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-ova-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-ova-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-qcow2-boot.json b/test/data/manifests/rhel_9.2-x86_64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-qcow2-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_9.2-x86_64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-tar-boot.json b/test/data/manifests/rhel_9.2-x86_64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-tar-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-tar-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-vhd-boot.json b/test/data/manifests/rhel_9.2-x86_64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-vhd-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-vhd-boot.json
diff --git a/test/data/manifests/rhel_92-x86_64-vmdk-boot.json b/test/data/manifests/rhel_9.2-x86_64-vmdk-boot.json
similarity index 100%
rename from test/data/manifests/rhel_92-x86_64-vmdk-boot.json
rename to test/data/manifests/rhel_9.2-x86_64-vmdk-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-ami-boot.json b/test/data/manifests/rhel_9.3-aarch64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-ami-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-ami-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_9.3-aarch64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-azure_rhui-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-ec2-boot.json b/test/data/manifests/rhel_9.3-aarch64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-ec2-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-ec2-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-edge_ami-boot.json b/test/data/manifests/rhel_9.3-aarch64-edge_ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-edge_ami-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-edge_ami-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_9.3-aarch64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-edge_commit-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_9.3-aarch64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_9.3-aarch64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-edge_container-boot.json b/test/data/manifests/rhel_9.3-aarch64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-edge_container-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-edge_container_customizations-boot.json b/test/data/manifests/rhel_9.3-aarch64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_9.3-aarch64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-edge_installer-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_9.3-aarch64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_9.3-aarch64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_9.3-aarch64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-image_installer-boot.json b/test/data/manifests/rhel_9.3-aarch64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-image_installer-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_9.3-aarch64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-minimal_raw-boot.json b/test/data/manifests/rhel_9.3-aarch64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-minimal_raw-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-openstack-boot.json b/test/data/manifests/rhel_9.3-aarch64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-openstack-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-openstack-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-qcow2-boot.json b/test/data/manifests/rhel_9.3-aarch64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-qcow2-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_9.3-aarch64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-tar-boot.json b/test/data/manifests/rhel_9.3-aarch64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-tar-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-tar-boot.json
diff --git a/test/data/manifests/rhel_93-aarch64-vhd-boot.json b/test/data/manifests/rhel_9.3-aarch64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-aarch64-vhd-boot.json
rename to test/data/manifests/rhel_9.3-aarch64-vhd-boot.json
diff --git a/test/data/manifests/rhel_93-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_9.3-ppc64le-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-ppc64le-qcow2-boot.json
rename to test/data/manifests/rhel_9.3-ppc64le-qcow2-boot.json
diff --git a/test/data/manifests/rhel_93-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_9.3-ppc64le-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-ppc64le-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.3-ppc64le-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_93-ppc64le-tar-boot.json b/test/data/manifests/rhel_9.3-ppc64le-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-ppc64le-tar-boot.json
rename to test/data/manifests/rhel_9.3-ppc64le-tar-boot.json
diff --git a/test/data/manifests/rhel_93-s390x-qcow2-boot.json b/test/data/manifests/rhel_9.3-s390x-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-s390x-qcow2-boot.json
rename to test/data/manifests/rhel_9.3-s390x-qcow2-boot.json
diff --git a/test/data/manifests/rhel_93-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_9.3-s390x-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-s390x-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.3-s390x-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_93-s390x-tar-boot.json b/test/data/manifests/rhel_9.3-s390x-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-s390x-tar-boot.json
rename to test/data/manifests/rhel_9.3-s390x-tar-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-ami-boot.json b/test/data/manifests/rhel_9.3-x86_64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-ami-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-ami-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_9.3-x86_64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-azure_rhui-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-ec2-boot.json b/test/data/manifests/rhel_9.3-x86_64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-ec2-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-ec2-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_9.3-x86_64-ec2_ha-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-ec2_ha-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-ec2_ha-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_9.3-x86_64-ec2_sap-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-ec2_sap-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-ec2_sap-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-edge_ami-boot.json b/test/data/manifests/rhel_9.3-x86_64-edge_ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-edge_ami-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-edge_ami-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_9.3-x86_64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-edge_commit-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_9.3-x86_64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_9.3-x86_64-edge_commit_rt-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-edge_commit_rt-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-edge_commit_rt-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_9.3-x86_64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-edge_container-boot.json b/test/data/manifests/rhel_9.3-x86_64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-edge_container-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-edge_container_customizations-boot.json b/test/data/manifests/rhel_9.3-x86_64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_9.3-x86_64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-edge_installer-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_9.3-x86_64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_9.3-x86_64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_9.3-x86_64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-gce-boot.json b/test/data/manifests/rhel_9.3-x86_64-gce-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-gce-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-gce-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_9.3-x86_64-gce_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-gce_rhui-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-gce_rhui-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-image_installer-boot.json b/test/data/manifests/rhel_9.3-x86_64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-image_installer-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_9.3-x86_64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-minimal_raw-boot.json b/test/data/manifests/rhel_9.3-x86_64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-minimal_raw-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-oci-boot.json b/test/data/manifests/rhel_9.3-x86_64-oci-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-oci-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-oci-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-openstack-boot.json b/test/data/manifests/rhel_9.3-x86_64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-openstack-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-openstack-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-ova-boot.json b/test/data/manifests/rhel_9.3-x86_64-ova-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-ova-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-ova-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-qcow2-boot.json b/test/data/manifests/rhel_9.3-x86_64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-qcow2-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_9.3-x86_64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-tar-boot.json b/test/data/manifests/rhel_9.3-x86_64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-tar-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-tar-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-vhd-boot.json b/test/data/manifests/rhel_9.3-x86_64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-vhd-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-vhd-boot.json
diff --git a/test/data/manifests/rhel_93-x86_64-vmdk-boot.json b/test/data/manifests/rhel_9.3-x86_64-vmdk-boot.json
similarity index 100%
rename from test/data/manifests/rhel_93-x86_64-vmdk-boot.json
rename to test/data/manifests/rhel_9.3-x86_64-vmdk-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-ami-boot.json b/test/data/manifests/rhel_9.4-aarch64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-ami-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-ami-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_9.4-aarch64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-azure_rhui-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-ec2-boot.json b/test/data/manifests/rhel_9.4-aarch64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-ec2-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-ec2-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-edge_ami-boot.json b/test/data/manifests/rhel_9.4-aarch64-edge_ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-edge_ami-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-edge_ami-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_9.4-aarch64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-edge_commit-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_9.4-aarch64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_9.4-aarch64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-edge_container-boot.json b/test/data/manifests/rhel_9.4-aarch64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-edge_container-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-edge_container_customizations-boot.json b/test/data/manifests/rhel_9.4-aarch64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_9.4-aarch64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-edge_installer-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_9.4-aarch64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_9.4-aarch64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_9.4-aarch64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-image_installer-boot.json b/test/data/manifests/rhel_9.4-aarch64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-image_installer-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_9.4-aarch64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-minimal_raw-boot.json b/test/data/manifests/rhel_9.4-aarch64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-minimal_raw-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-openstack-boot.json b/test/data/manifests/rhel_9.4-aarch64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-openstack-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-openstack-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-qcow2-boot.json b/test/data/manifests/rhel_9.4-aarch64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-qcow2-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_9.4-aarch64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-tar-boot.json b/test/data/manifests/rhel_9.4-aarch64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-tar-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-tar-boot.json
diff --git a/test/data/manifests/rhel_94-aarch64-vhd-boot.json b/test/data/manifests/rhel_9.4-aarch64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-aarch64-vhd-boot.json
rename to test/data/manifests/rhel_9.4-aarch64-vhd-boot.json
diff --git a/test/data/manifests/rhel_94-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_9.4-ppc64le-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-ppc64le-qcow2-boot.json
rename to test/data/manifests/rhel_9.4-ppc64le-qcow2-boot.json
diff --git a/test/data/manifests/rhel_94-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_9.4-ppc64le-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-ppc64le-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.4-ppc64le-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_94-ppc64le-tar-boot.json b/test/data/manifests/rhel_9.4-ppc64le-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-ppc64le-tar-boot.json
rename to test/data/manifests/rhel_9.4-ppc64le-tar-boot.json
diff --git a/test/data/manifests/rhel_94-s390x-qcow2-boot.json b/test/data/manifests/rhel_9.4-s390x-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-s390x-qcow2-boot.json
rename to test/data/manifests/rhel_9.4-s390x-qcow2-boot.json
diff --git a/test/data/manifests/rhel_94-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_9.4-s390x-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-s390x-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.4-s390x-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_94-s390x-tar-boot.json b/test/data/manifests/rhel_9.4-s390x-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-s390x-tar-boot.json
rename to test/data/manifests/rhel_9.4-s390x-tar-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-ami-boot.json b/test/data/manifests/rhel_9.4-x86_64-ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-ami-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-ami-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_9.4-x86_64-azure_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-azure_rhui-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-azure_rhui-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-ec2-boot.json b/test/data/manifests/rhel_9.4-x86_64-ec2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-ec2-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-ec2-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_9.4-x86_64-ec2_ha-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-ec2_ha-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-ec2_ha-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_9.4-x86_64-ec2_sap-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-ec2_sap-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-ec2_sap-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-edge_ami-boot.json b/test/data/manifests/rhel_9.4-x86_64-edge_ami-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-edge_ami-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-edge_ami-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_9.4-x86_64-edge_commit-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-edge_commit-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-edge_commit-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-edge_commit_customizations-boot.json b/test/data/manifests/rhel_9.4-x86_64-edge_commit_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-edge_commit_customizations-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-edge_commit_customizations-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_9.4-x86_64-edge_commit_rt-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-edge_commit_rt-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-edge_commit_rt-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_9.4-x86_64-edge_commit_with_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-edge_commit_with_container-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-edge_commit_with_container-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-edge_container-boot.json b/test/data/manifests/rhel_9.4-x86_64-edge_container-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-edge_container-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-edge_container-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-edge_container_customizations-boot.json b/test/data/manifests/rhel_9.4-x86_64-edge_container_customizations-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-edge_container_customizations-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-edge_container_customizations-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_9.4-x86_64-edge_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-edge_installer-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-edge_installer-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_9.4-x86_64-edge_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-edge_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-edge_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_9.4-x86_64-edge_raw_image-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-edge_raw_image-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-edge_raw_image-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_9.4-x86_64-edge_simplified_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-edge_simplified_installer-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-edge_simplified_installer-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-gce-boot.json b/test/data/manifests/rhel_9.4-x86_64-gce-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-gce-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-gce-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_9.4-x86_64-gce_rhui-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-gce_rhui-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-gce_rhui-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-image_installer-boot.json b/test/data/manifests/rhel_9.4-x86_64-image_installer-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-image_installer-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-image_installer-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_9.4-x86_64-image_installer_with_users-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-image_installer_with_users-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-image_installer_with_users-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-minimal_raw-boot.json b/test/data/manifests/rhel_9.4-x86_64-minimal_raw-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-minimal_raw-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-minimal_raw-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-oci-boot.json b/test/data/manifests/rhel_9.4-x86_64-oci-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-oci-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-oci-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-openstack-boot.json b/test/data/manifests/rhel_9.4-x86_64-openstack-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-openstack-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-openstack-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-ova-boot.json b/test/data/manifests/rhel_9.4-x86_64-ova-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-ova-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-ova-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-qcow2-boot.json b/test/data/manifests/rhel_9.4-x86_64-qcow2-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-qcow2-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-qcow2-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_9.4-x86_64-qcow2_customize-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-qcow2_customize-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-qcow2_customize-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-tar-boot.json b/test/data/manifests/rhel_9.4-x86_64-tar-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-tar-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-tar-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-vhd-boot.json b/test/data/manifests/rhel_9.4-x86_64-vhd-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-vhd-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-vhd-boot.json
diff --git a/test/data/manifests/rhel_94-x86_64-vmdk-boot.json b/test/data/manifests/rhel_9.4-x86_64-vmdk-boot.json
similarity index 100%
rename from test/data/manifests/rhel_94-x86_64-vmdk-boot.json
rename to test/data/manifests/rhel_9.4-x86_64-vmdk-boot.json