Repository: osbuild/osbuild-composer
Pull request #3136 (2022-11-15 05:33:17)

Update snapshots to 20221115
Job(s) succeeded: 
Job(s) failed: 0
Workflow run: https://github.com/osbuild/rpmrepo/actions/runs/3466778398



Patch:
diff --git a/Schutzfile b/Schutzfile
index de3b95d24..ccfe6cbb6 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -46,14 +46,14 @@
           {
             "title": "updates",
             "name": "updates",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-20221115"
           }
         ],
         "aarch64": [
           {
             "title": "updates",
             "name": "updates",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-aarch64-updates-released-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-aarch64-updates-released-20221115"
           }
         ]
       },
@@ -63,14 +63,14 @@
           {
             "title": "updates-modular",
             "name": "updates-modular",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-modular-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-modular-20221115"
           }
         ],
         "aarch64": [
           {
             "title": "updates-modular",
             "name": "updates-modular",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-aarch64-updates-released-modular-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-aarch64-updates-released-modular-20221115"
           }
         ]
       }
@@ -123,14 +123,14 @@
           {
             "title": "updates",
             "name": "updates",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-updates-released-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-updates-released-20221115"
           }
         ],
         "aarch64": [
           {
             "title": "updates",
             "name": "updates",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-aarch64-updates-released-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-aarch64-updates-released-20221115"
           }
         ]
       },
@@ -140,14 +140,14 @@
           {
             "title": "updates-modular",
             "name": "updates-modular",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-updates-released-modular-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-updates-released-modular-20221115"
           }
         ],
         "aarch64": [
           {
             "title": "updates-modular",
             "name": "updates-modular",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-aarch64-updates-released-modular-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-aarch64-updates-released-modular-20221115"
           }
         ]
       }
@@ -166,14 +166,14 @@
           {
             "title": "fedora",
             "name": "fedora",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-development-20221025/"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-development-20221115/"
           }
         ],
         "aarch64": [
           {
             "title": "fedora",
             "name": "fedora",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-fedora-development-20221025/"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-fedora-development-20221115/"
           }
         ]
       },
@@ -183,14 +183,14 @@
           {
             "title": "fedora-modular",
             "name": "fedora-modular",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-modular-development-20221025/"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-modular-development-20221115/"
           }
         ],
         "aarch64": [
           {
             "title": "fedora-modular",
             "name": "fedora-modular",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-fedora-modular-development-20221025/"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-fedora-modular-development-20221115/"
           }
         ]
       },
@@ -200,14 +200,14 @@
           {
             "title": "updates",
             "name": "updates",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-development-20221025/"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-development-20221115/"
           }
         ],
         "aarch64": [
           {
             "title": "updates",
             "name": "updates",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-fedora-development-20221025/"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-fedora-development-20221115/"
           }
         ]
       },
@@ -217,14 +217,14 @@
           {
             "title": "updates-modular",
             "name": "updates-modular",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-modular-development-20221025/"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-modular-development-20221115/"
           }
         ],
         "aarch64": [
           {
             "title": "updates-modular",
             "name": "updates-modular",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-fedora-modular-development-20221025/"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-fedora-modular-development-20221115/"
           }
         ]
       }
@@ -257,34 +257,34 @@
           {
             "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS",
             "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221115"
           },
           {
             "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream",
             "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221115"
           },
           {
             "title": "RHEL-8-RPMREPO-NIGHTLY-CRB",
             "name": "crb",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.7-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.7-20221115"
           }
         ],
         "aarch64": [
           {
             "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS",
             "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.7-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.7-20221115"
           },
           {
             "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream",
             "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.7-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.7-20221115"
           },
           {
             "title": "RHEL-8-RPMREPO-NIGHTLY-CRB",
             "name": "crb",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.7-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.7-20221115"
           }
         ]
       }
@@ -298,34 +298,34 @@
           {
             "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS",
             "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221115"
           },
           {
             "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream",
             "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221115"
           },
           {
             "title": "RHEL-8-RPMREPO-NIGHTLY-CRB",
             "name": "crb",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.8-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.8-20221115"
           }
         ],
         "aarch64": [
           {
             "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS",
             "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.8-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.8-20221115"
           },
           {
             "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream",
             "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.8-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.8-20221115"
           },
           {
             "title": "RHEL-8-RPMREPO-NIGHTLY-CRB",
             "name": "crb",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.8-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.8-20221115"
           }
         ]
       }
@@ -351,34 +351,34 @@
           {
             "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
             "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20221115"
           },
           {
             "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
             "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.1-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.1-20221115"
           },
           {
             "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
             "name": "crb",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.1-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.1-20221115"
           }
         ],
         "aarch64": [
           {
             "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
             "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20221115"
           },
           {
             "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
             "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.1-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.1-20221115"
           },
           {
             "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
             "name": "crb",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.1-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.1-20221115"
           }
         ]
       }
@@ -392,34 +392,34 @@
           {
             "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
             "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.2-20221001"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.2-20221115"
           },
           {
             "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
             "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.2-20221001"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.2-20221115"
           },
           {
             "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
             "name": "crb",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.2-20221001"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.2-20221115"
           }
         ],
         "aarch64": [
           {
             "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
             "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.2-20221001"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.2-20221115"
           },
           {
             "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
             "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.2-20221001"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.2-20221115"
           },
           {
             "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
             "name": "crb",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.2-20221001"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.2-20221115"
           }
         ]
       }
@@ -452,34 +452,34 @@
           {
             "title": "baseos",
             "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220715"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20221115"
           },
           {
             "title": "appstream",
             "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20220715"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20221115"
           },
           {
             "title": "crb",
             "name": "crb",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-crb-20220715"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-crb-20221115"
           }
         ],
         "aarch64": [
           {
             "title": "baseos",
             "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220715"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20221115"
           },
           {
             "title": "appstream",
             "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20220715"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20221115"
           },
           {
             "title": "crb",
             "name": "crb",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-crb-20220715"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-crb-20221115"
           }
         ]
       }
@@ -498,14 +498,14 @@
           {
             "title": "baseos",
             "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-baseos-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-baseos-20221115"
           }
         ],
         "aarch64": [
           {
             "title": "baseos",
             "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-baseos-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-baseos-20221115"
           }
         ]
       },
@@ -515,14 +515,14 @@
           {
             "title": "appstream",
             "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-appstream-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-appstream-20221115"
           }
         ],
         "aarch64": [
           {
             "title": "appstream",
             "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-appstream-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-appstream-20221115"
           }
         ]
       },
@@ -532,17 +532,17 @@
           {
             "title": "powertools",
             "name": "powertools",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-powertools-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-powertools-20221115"
           }
         ],
         "aarch64": [
           {
             "title": "powertools",
             "name": "powertoosl",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-powertools-20221025"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-powertools-20221115"
           }
         ]
       }
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/internal/image/image_installer.go b/internal/image/image_installer.go
index d9879a1c0..1750b0606 100644
--- a/internal/image/image_installer.go
+++ b/internal/image/image_installer.go
@@ -62,7 +62,7 @@ func (img *ImageInstaller) InstantiateManifest(m *manifest.Manifest,
 		img.OSVersion)
 
 	interactiveDefaults := manifest.NewAnacondaInteractiveDefaults(
-		"file:///run/install/repo/liveimg.tar",
+		"file:///run/install/repo/liveimg.tar.gz",
 	)
 
 	anacondaPipeline.ExtraPackages = img.ExtraBasePackages.Include
diff --git a/internal/manifest/iso_tree.go b/internal/manifest/iso_tree.go
index 912bfbf3d..7137ffe89 100644
--- a/internal/manifest/iso_tree.go
+++ b/internal/manifest/iso_tree.go
@@ -209,7 +209,8 @@ func (p *ISOTree) serialize() osbuild.Pipeline {
 	}
 
 	if p.OSPipeline != nil {
-		pipeline.AddStage(osbuild.NewTarStage(&osbuild.TarStageOptions{Filename: "/liveimg.tar"}, p.OSPipeline.name))
+		// The TarStage has --autocompress
+		pipeline.AddStage(osbuild.NewTarStage(&osbuild.TarStageOptions{Filename: "/liveimg.tar.gz"}, p.OSPipeline.name))
 
 		// In the case of OSPipeline then the ImageInstaller has already set InteractiveDefaults on the anaconda-tree,
 		// eliminating the need to set a separate kickstart here.
diff --git a/tools/define-compose-url.sh b/tools/define-compose-url.sh
index d1febe3d7..477eb3e71 100755
--- a/tools/define-compose-url.sh
+++ b/tools/define-compose-url.sh
@@ -8,10 +8,10 @@ if [[ $ID != rhel ]]; then
 fi
 
 if [[ $ID == rhel && ${VERSION_ID%.*} == 8 ]]; then
-  COMPOSE_ID=$(curl -L http://download.eng.bos.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-"${VERSION_ID}"/COMPOSE_ID)
+  COMPOSE_ID=$(curl -L http://download.eng.bos.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-"${VERSION_ID}".0/COMPOSE_ID)
 
   # default to a nightly tree but respect values passed from ENV so we can test rel-eng composes as well
-  COMPOSE_URL="${COMPOSE_URL:-http://download.eng.bos.redhat.com/rhel-8/nightly/RHEL-8/$COMPOSE_ID}"
+  COMPOSE_URL="${COMPOSE_URL:-http://download.eng.bos.redhat.com/rhel-8/nightly/updates/RHEL-8/$COMPOSE_ID}"
 
 elif [[ $ID == rhel && ${VERSION_ID} == "9.1" ]]; then
   # RHEL 9.1 currently doesn't have a 'latest' compose; use most recent date-stamped build
@@ -20,10 +20,10 @@ elif [[ $ID == rhel && ${VERSION_ID} == "9.1" ]]; then
   # default to a nightly tree but respect values passed from ENV so we can test rel-eng composes as well
   COMPOSE_URL="${COMPOSE_URL:-http://download.eng.bos.redhat.com/rhel-9/nightly/RHEL-9/$COMPOSE_ID}"
 elif [[ $ID == rhel && ${VERSION_ID%.*} == 9 ]]; then
-  COMPOSE_ID=$(curl -L http://download.eng.bos.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-"${VERSION_ID}"/COMPOSE_ID)
+  COMPOSE_ID=$(curl -L http://download.eng.bos.redhat.com/rhel-9/nightly/updates/RHEL-9/latest-RHEL-"${VERSION_ID}".0/COMPOSE_ID)
 
   # default to a nightly tree but respect values passed from ENV so we can test rel-eng composes as well
-  COMPOSE_URL="${COMPOSE_URL:-http://download.eng.bos.redhat.com/rhel-9/nightly/RHEL-9/$COMPOSE_ID}"
+  COMPOSE_URL="${COMPOSE_URL:-http://download.eng.bos.redhat.com/rhel-9/nightly/updates/RHEL-9/$COMPOSE_ID}"
 fi
 
 # in case COMPOSE_URL was defined from the outside refresh COMPOSE_ID file,


Test patch:
diff --git a/test/cases/ostree-ng.sh b/test/cases/ostree-ng.sh
index c2244c34a..2a30fdfc6 100755
--- a/test/cases/ostree-ng.sh
+++ b/test/cases/ostree-ng.sh
@@ -77,6 +77,7 @@ INSTALLER_TYPE=edge-installer
 INSTALLER_FILENAME=installer.iso
 ANSIBLE_USER_FOR_BIOS="installeruser"
 OSTREE_OSNAME=rhel
+BOOT_ARGS="uefi"
 
 # Set up temporary files.
 TEMPDIR=$(mktemp -d)
@@ -119,6 +120,7 @@ case "${ID}-${VERSION_ID}" in
         OSTREE_REF="test/centos/9/${ARCH}/edge"
         OS_VARIANT="centos-stream9"
         EMBEDED_CONTAINER="true"
+        BOOT_ARGS="uefi,firmware.feature0.name=secure-boot,firmware.feature0.enabled=no"
         ;;
     *)
         echo "unsupported distro: ${ID}-${VERSION_ID}"
@@ -560,14 +562,6 @@ sudo rm -f "$LIBVIRT_BIOS_IMAGE_PATH"
 ##
 ##################################################
 
-# Since virt-install 4.0.0, loader attribute can't be configured here,
-# otherwise it'll report "loader attribute 'readonly' cannot be specified
-# when firmware autoselection is enabled"
-if nvrGreaterOrEqual "virt-install" "4.0.0"; then
-    BOOT_UEFI_ARGS="uefi"
-else
-    BOOT_UEFI_ARGS="uefi,loader_ro=yes,loader_type=pflash,nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd,loader_secure=no"
-fi
 # Install ostree image via anaconda.
 greenprint "💿 Install ostree image via installer(ISO) on UEFI VM"
 sudo virt-install  --name="${IMAGE_KEY}-uefi"\
@@ -578,7 +572,7 @@ sudo virt-install  --name="${IMAGE_KEY}-uefi"\
                    --os-type linux \
                    --os-variant ${OS_VARIANT} \
                    --cdrom "/var/lib/libvirt/images/${ISO_FILENAME}" \
-                   --boot "$BOOT_UEFI_ARGS" \
+                   --boot "$BOOT_ARGS" \
                    --nographics \
                    --noautoconsole \
                    --wait=-1 \
diff --git a/test/cases/ostree-raw-image.sh b/test/cases/ostree-raw-image.sh
index a5d55954c..571715115 100755
--- a/test/cases/ostree-raw-image.sh
+++ b/test/cases/ostree-raw-image.sh
@@ -71,6 +71,7 @@ CONTAINER_FILENAME=container.tar
 RAW_IMAGE_TYPE=edge-raw-image
 RAW_IMAGE_FILENAME=image.raw.xz
 OSTREE_OSNAME=redhat
+BOOT_ARGS="uefi"
 
 # Set up temporary files.
 TEMPDIR=$(mktemp -d)
@@ -100,6 +101,7 @@ case "${ID}-${VERSION_ID}" in
     "centos-9")
         OSTREE_REF="centos/9/${ARCH}/edge"
         OS_VARIANT="centos-stream9"
+        BOOT_ARGS="uefi,firmware.feature0.name=secure-boot,firmware.feature0.enabled=no"
         ;;
     "fedora-"*)
         CONTAINER_TYPE=iot-container
@@ -514,13 +516,6 @@ sudo cp "${IMAGE_KEY}.qcow2" /var/lib/libvirt/images/
 greenprint "👿 Running restorecon on image directory"
 sudo restorecon -Rv /var/lib/libvirt/images/
 
-greenprint "💿 Installing raw image on UEFI VM"
-if nvrGreaterOrEqual "virt-install" "4"; then
-    BOOT_UEFI_ARGS="uefi,firmware.feature0.name=secure-boot,firmware.feature0.enabled=no"
-else
-    BOOT_UEFI_ARGS="uefi,loader_ro=yes,loader_type=pflash,nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd,loader_secure=no"
-fi
-
 sudo virt-install --name="${IMAGE_KEY}-uefi"\
                --disk path="${LIBVIRT_IMAGE_PATH}",format=qcow2 \
                --ram 3072 \
@@ -529,7 +524,7 @@ sudo virt-install --name="${IMAGE_KEY}-uefi"\
                --os-type linux \
                --import \
                --os-variant ${OS_VARIANT} \
-               --boot "${BOOT_UEFI_ARGS}" \
+               --boot "$BOOT_ARGS" \
                --nographics \
                --noautoconsole \
                --wait=-1 \
diff --git a/test/cases/ostree-rebase-uefi.sh b/test/cases/ostree-rebase-uefi.sh
index 0119f14c6..f06cb7c9e 100755
--- a/test/cases/ostree-rebase-uefi.sh
+++ b/test/cases/ostree-rebase-uefi.sh
@@ -66,6 +66,7 @@ PROD_REPO_URL="http://${PROD_REPO_ADDRESS}:8080/repo/"
 ARTIFACTS="${ARTIFACTS:-/tmp/artifacts}"
 CONTAINER_TYPE=edge-container
 CONTAINER_FILENAME=container.tar
+BOOT_ARGS="uefi"
 
 # Set up temporary files.
 TEMPDIR=$(mktemp -d)
@@ -112,6 +113,7 @@ case "${ID}-${VERSION_ID}" in
         OS_VARIANT="centos-stream9"
         BOOT_LOCATION="https://odcs.stream.centos.org/production/latest-CentOS-Stream/compose/BaseOS/x86_64/os/"
         PARENT_REF="centos/9/${ARCH}/edge"
+        BOOT_ARGS="uefi,firmware.feature0.name=secure-boot,firmware.feature0.enabled=no"
         ;;
     *)
         echo "unsupported distro: ${ID}-${VERSION_ID}"
@@ -363,7 +365,7 @@ sudo virt-install  --initrd-inject="${KS_FILE}" \
                    --os-type linux \
                    --os-variant ${OS_VARIANT} \
                    --location "${BOOT_LOCATION}" \
-                   --boot uefi,loader_ro=yes,loader_type=pflash,nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd,loader_secure=no \
+                   --boot "$BOOT_ARGS"\
                    --nographics \
                    --noautoconsole \
                    --wait=-1 \
diff --git a/test/cases/ostree-simplified-installer.sh b/test/cases/ostree-simplified-installer.sh
index bfb15973c..949000691 100755
--- a/test/cases/ostree-simplified-installer.sh
+++ b/test/cases/ostree-simplified-installer.sh
@@ -83,6 +83,7 @@ CONTAINER_FILENAME=container.tar
 INSTALLER_TYPE=edge-simplified-installer
 INSTALLER_FILENAME=simplified-installer.iso
 MEMORY=3072
+BOOT_ARGS="uefi"
 
 # Set up temporary files.
 TEMPDIR=$(mktemp -d)
@@ -112,6 +113,7 @@ case "${ID}-${VERSION_ID}" in
     "centos-9")
         OSTREE_REF="centos/9/${ARCH}/edge"
         OS_VARIANT="centos-stream9"
+        BOOT_ARGS="uefi,firmware.feature0.name=secure-boot,firmware.feature0.enabled=no"
         ;;
     *)
         echo "unsupported distro: ${ID}-${VERSION_ID}"
@@ -467,7 +469,7 @@ sudo virt-install --name="${IMAGE_KEY}-http"\
                   --os-type linux \
                   --os-variant "${OS_VARIANT}" \
                   --pxe \
-                  --boot uefi,loader_ro=yes,loader_type=pflash,nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd,loader_secure=no \
+                  --boot "$BOOT_ARGS" \
                   --tpm backend.type=emulator,backend.version=2.0,model=tpm-crb \
                   --nographics \
                   --noautoconsole \
@@ -591,7 +593,7 @@ sudo virt-install  --name="${IMAGE_KEY}-fdosshkey"\
                    --os-type linux \
                    --os-variant ${OS_VARIANT} \
                    --cdrom "/var/lib/libvirt/images/${ISO_FILENAME}" \
-                   --boot uefi,loader_ro=yes,loader_type=pflash,nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd,loader_secure=no \
+                   --boot "$BOOT_ARGS" \
                    --tpm backend.type=emulator,backend.version=2.0,model=tpm-crb \
                    --nographics \
                    --noautoconsole \
@@ -713,7 +715,7 @@ sudo virt-install  --name="${IMAGE_KEY}-fdorootcert"\
                    --os-type linux \
                    --os-variant ${OS_VARIANT} \
                    --cdrom "/var/lib/libvirt/images/${ISO_FILENAME}" \
-                   --boot uefi,loader_ro=yes,loader_type=pflash,nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd,loader_secure=no \
+                   --boot "$BOOT_ARGS" \
                    --tpm backend.type=emulator,backend.version=2.0,model=tpm-crb \
                    --nographics \
                    --noautoconsole \
@@ -824,13 +826,13 @@ sudo qemu-img create -f qcow2 "${LIBVIRT_IMAGE_PATH}" 20G
 greenprint "💿 Install ostree image via installer(ISO) on UEFI VM"
 sudo virt-install  --name="${IMAGE_KEY}-simplified_iso_without_fdo"\
                    --disk path="${LIBVIRT_IMAGE_PATH}",format=qcow2 \
-                   --ram 3072 \
+                   --ram "${MEMORY}" \
                    --vcpus 2 \
                    --network network=integration,mac=34:49:22:B0:83:32 \
                    --os-type linux \
                    --os-variant ${OS_VARIANT} \
                    --cdrom "/var/lib/libvirt/images/${ISO_FILENAME}" \
-                   --boot uefi,loader_ro=yes,loader_type=pflash,nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd,loader_secure=no \
+                   --boot "$BOOT_ARGS" \
                    --tpm backend.type=emulator,backend.version=2.0,model=tpm-crb \
                    --nographics \
                    --noautoconsole \
diff --git a/test/data/manifests/fedora_35-aarch64-image_installer-boot.json b/test/data/manifests/fedora_35-aarch64-image_installer-boot.json
index e5f30776c..40c7317f9 100644
--- a/test/data/manifests/fedora_35-aarch64-image_installer-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-image_installer-boot.json
@@ -9931,7 +9931,7 @@
             "options": {
               "path": "/usr/share/anaconda/interactive-defaults.ks",
               "liveimg": {
-                "url": "file:///run/install/repo/liveimg.tar"
+                "url": "file:///run/install/repo/liveimg.tar.gz"
               }
             }
           }
@@ -12929,7 +12929,7 @@
               }
             },
             "options": {
-              "filename": "/liveimg.tar"
+              "filename": "/liveimg.tar.gz"
             }
           },
           {
diff --git a/test/data/manifests/fedora_35-aarch64-image_installer_with_users-boot.json b/test/data/manifests/fedora_35-aarch64-image_installer_with_users-boot.json
index 70ef01853..0038822d3 100644
--- a/test/data/manifests/fedora_35-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-image_installer_with_users-boot.json
@@ -9961,7 +9961,7 @@
             "options": {
               "path": "/usr/share/anaconda/interactive-defaults.ks",
               "liveimg": {
-                "url": "file:///run/install/repo/liveimg.tar"
+                "url": "file:///run/install/repo/liveimg.tar.gz"
               }
             }
           }
@@ -12959,7 +12959,7 @@
               }
             },
             "options": {
-              "filename": "/liveimg.tar"
+              "filename": "/liveimg.tar.gz"
             }
           },
           {
diff --git a/test/data/manifests/fedora_35-x86_64-image_installer-boot.json b/test/data/manifests/fedora_35-x86_64-image_installer-boot.json
index a26ce048c..b41a70add 100644
--- a/test/data/manifests/fedora_35-x86_64-image_installer-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-image_installer-boot.json
@@ -10124,7 +10124,7 @@
             "options": {
               "path": "/usr/share/anaconda/interactive-defaults.ks",
               "liveimg": {
-                "url": "file:///run/install/repo/liveimg.tar"
+                "url": "file:///run/install/repo/liveimg.tar.gz"
               }
             }
           }
@@ -13162,7 +13162,7 @@
               }
             },
             "options": {
-              "filename": "/liveimg.tar"
+              "filename": "/liveimg.tar.gz"
             }
           },
           {
diff --git a/test/data/manifests/fedora_35-x86_64-image_installer_with_users-boot.json b/test/data/manifests/fedora_35-x86_64-image_installer_with_users-boot.json
index 1d81208b2..e2dbc5353 100644
--- a/test/data/manifests/fedora_35-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-image_installer_with_users-boot.json
@@ -10154,7 +10154,7 @@
             "options": {
               "path": "/usr/share/anaconda/interactive-defaults.ks",
               "liveimg": {
-                "url": "file:///run/install/repo/liveimg.tar"
+                "url": "file:///run/install/repo/liveimg.tar.gz"
               }
             }
           }
@@ -13192,7 +13192,7 @@
               }
             },
             "options": {
-              "filename": "/liveimg.tar"
+              "filename": "/liveimg.tar.gz"
             }
           },
           {
diff --git a/test/data/manifests/fedora_36-aarch64-image_installer-boot.json b/test/data/manifests/fedora_36-aarch64-image_installer-boot.json
index 47ebd7291..be4b67db0 100644
--- a/test/data/manifests/fedora_36-aarch64-image_installer-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-image_installer-boot.json
@@ -10219,7 +10219,7 @@
             "options": {
               "path": "/usr/share/anaconda/interactive-defaults.ks",
               "liveimg": {
-                "url": "file:///run/install/repo/liveimg.tar"
+                "url": "file:///run/install/repo/liveimg.tar.gz"
               }
             }
           }
@@ -13585,7 +13585,7 @@
               }
             },
             "options": {
-              "filename": "/liveimg.tar"
+              "filename": "/liveimg.tar.gz"
             }
           },
           {
diff --git a/test/data/manifests/fedora_36-aarch64-image_installer_with_users-boot.json b/test/data/manifests/fedora_36-aarch64-image_installer_with_users-boot.json
index 50cbbd4f9..9d30e56ea 100644
--- a/test/data/manifests/fedora_36-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-image_installer_with_users-boot.json
@@ -10249,7 +10249,7 @@
             "options": {
               "path": "/usr/share/anaconda/interactive-defaults.ks",
               "liveimg": {
-                "url": "file:///run/install/repo/liveimg.tar"
+                "url": "file:///run/install/repo/liveimg.tar.gz"
               }
             }
           }
@@ -13615,7 +13615,7 @@
               }
             },
             "options": {
-              "filename": "/liveimg.tar"
+              "filename": "/liveimg.tar.gz"
             }
           },
           {
diff --git a/test/data/manifests/fedora_36-x86_64-image_installer-boot.json b/test/data/manifests/fedora_36-x86_64-image_installer-boot.json
index 4c6332933..93d71a3fb 100644
--- a/test/data/manifests/fedora_36-x86_64-image_installer-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-image_installer-boot.json
@@ -10412,7 +10412,7 @@
             "options": {
               "path": "/usr/share/anaconda/interactive-defaults.ks",
               "liveimg": {
-                "url": "file:///run/install/repo/liveimg.tar"
+                "url": "file:///run/install/repo/liveimg.tar.gz"
               }
             }
           }
@@ -13866,7 +13866,7 @@
               }
             },
             "options": {
-              "filename": "/liveimg.tar"
+              "filename": "/liveimg.tar.gz"
             }
           },
           {
diff --git a/test/data/manifests/fedora_36-x86_64-image_installer_with_users-boot.json b/test/data/manifests/fedora_36-x86_64-image_installer_with_users-boot.json
index cb8291cb4..0003054b7 100644
--- a/test/data/manifests/fedora_36-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-image_installer_with_users-boot.json
@@ -10442,7 +10442,7 @@
             "options": {
               "path": "/usr/share/anaconda/interactive-defaults.ks",
               "liveimg": {
-                "url": "file:///run/install/repo/liveimg.tar"
+                "url": "file:///run/install/repo/liveimg.tar.gz"
               }
             }
           }
@@ -13896,7 +13896,7 @@
               }
             },
             "options": {
-              "filename": "/liveimg.tar"
+              "filename": "/liveimg.tar.gz"
             }
           },
           {
diff --git a/test/data/manifests/fedora_37-aarch64-image_installer-boot.json b/test/data/manifests/fedora_37-aarch64-image_installer-boot.json
index f89889406..216004e62 100644
--- a/test/data/manifests/fedora_37-aarch64-image_installer-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-image_installer-boot.json
@@ -10345,7 +10345,7 @@
             "options": {
               "path": "/usr/share/anaconda/interactive-defaults.ks",
               "liveimg": {
-                "url": "file:///run/install/repo/liveimg.tar"
+                "url": "file:///run/install/repo/liveimg.tar.gz"
               }
             }
           }
@@ -13757,7 +13757,7 @@
               }
             },
             "options": {
-              "filename": "/liveimg.tar"
+              "filename": "/liveimg.tar.gz"
             }
           },
           {
diff --git a/test/data/manifests/fedora_37-aarch64-image_installer_with_users-boot.json b/test/data/manifests/fedora_37-aarch64-image_installer_with_users-boot.json
index b627d495c..8e5dccbf5 100644
--- a/test/data/manifests/fedora_37-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-image_installer_with_users-boot.json
@@ -10375,7 +10375,7 @@
             "options": {
               "path": "/usr/share/anaconda/interactive-defaults.ks",
               "liveimg": {
-                "url": "file:///run/install/repo/liveimg.tar"
+                "url": "file:///run/install/repo/liveimg.tar.gz"
               }
             }
           }
@@ -13787,7 +13787,7 @@
               }
             },
             "options": {
-              "filename": "/liveimg.tar"
+              "filename": "/liveimg.tar.gz"
             }
           },
           {
diff --git a/test/data/manifests/fedora_37-x86_64-image_installer-boot.json b/test/data/manifests/fedora_37-x86_64-image_installer-boot.json
index b8b78b7d1..15dcdef9d 100644
--- a/test/data/manifests/fedora_37-x86_64-image_installer-boot.json
+++ b/test/data/manifests/fedora_37-x86_64-image_installer-boot.json
@@ -10546,7 +10546,7 @@
             "options": {
               "path": "/usr/share/anaconda/interactive-defaults.ks",
               "liveimg": {
-                "url": "file:///run/install/repo/liveimg.tar"
+                "url": "file:///run/install/repo/liveimg.tar.gz"
               }
             }
           }
@@ -14046,7 +14046,7 @@
               }
             },
             "options": {
-              "filename": "/liveimg.tar"
+              "filename": "/liveimg.tar.gz"
             }
           },
           {
diff --git a/test/data/manifests/fedora_37-x86_64-image_installer_with_users-boot.json b/test/data/manifests/fedora_37-x86_64-image_installer_with_users-boot.json
index bcfffa40e..6e67359e9 100644
--- a/test/data/manifests/fedora_37-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_37-x86_64-image_installer_with_users-boot.json
@@ -10576,7 +10576,7 @@
             "options": {
               "path": "/usr/share/anaconda/interactive-defaults.ks",
               "liveimg": {
-                "url": "file:///run/install/repo/liveimg.tar"
+                "url": "file:///run/install/repo/liveimg.tar.gz"
               }
             }
           }
@@ -14076,7 +14076,7 @@
               }
             },
             "options": {
-              "filename": "/liveimg.tar"
+              "filename": "/liveimg.tar.gz"
             }
           },
           {
diff --git a/test/data/manifests/fedora_38-aarch64-image_installer-boot.json b/test/data/manifests/fedora_38-aarch64-image_installer-boot.json
index 5156bcc81..0a4f2313f 100644
--- a/test/data/manifests/fedora_38-aarch64-image_installer-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-image_installer-boot.json
@@ -10213,7 +10213,7 @@
             "options": {
               "path": "/usr/share/anaconda/interactive-defaults.ks",
               "liveimg": {
-                "url": "file:///run/install/repo/liveimg.tar"
+                "url": "file:///run/install/repo/liveimg.tar.gz"
               }
             }
           }
@@ -13637,7 +13637,7 @@
               }
             },
             "options": {
-              "filename": "/liveimg.tar"
+              "filename": "/liveimg.tar.gz"
             }
           },
           {
diff --git a/test/data/manifests/fedora_38-aarch64-image_installer_with_users-boot.json b/test/data/manifests/fedora_38-aarch64-image_installer_with_users-boot.json
index 5734aa98c..c0e0af7d3 100644
--- a/test/data/manifests/fedora_38-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-image_installer_with_users-boot.json
@@ -10243,7 +10243,7 @@
             "options": {
               "path": "/usr/share/anaconda/interactive-defaults.ks",
               "liveimg": {
-                "url": "file:///run/install/repo/liveimg.tar"
+                "url": "file:///run/install/repo/liveimg.tar.gz"
               }
             }
           }
@@ -13667,7 +13667,7 @@
               }
             },
             "options": {
-              "filename": "/liveimg.tar"
+              "filename": "/liveimg.tar.gz"
             }
           },
           {
diff --git a/test/data/manifests/fedora_38-x86_64-image_installer-boot.json b/test/data/manifests/fedora_38-x86_64-image_installer-boot.json
index be54ccbdb..bf3bf2a49 100644
--- a/test/data/manifests/fedora_38-x86_64-image_installer-boot.json
+++ b/test/data/manifests/fedora_38-x86_64-image_installer-boot.json
@@ -10398,7 +10398,7 @@
             "options": {
               "path": "/usr/share/anaconda/interactive-defaults.ks",
               "liveimg": {
-                "url": "file:///run/install/repo/liveimg.tar"
+                "url": "file:///run/install/repo/liveimg.tar.gz"
               }
             }
           }
@@ -13902,7 +13902,7 @@
               }
             },
             "options": {
-              "filename": "/liveimg.tar"
+              "filename": "/liveimg.tar.gz"
             }
           },
           {
diff --git a/test/data/manifests/fedora_38-x86_64-image_installer_with_users-boot.json b/test/data/manifests/fedora_38-x86_64-image_installer_with_users-boot.json
index e71a6dded..60065f998 100644
--- a/test/data/manifests/fedora_38-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_38-x86_64-image_installer_with_users-boot.json
@@ -10428,7 +10428,7 @@
             "options": {
               "path": "/usr/share/anaconda/interactive-defaults.ks",
               "liveimg": {
-                "url": "file:///run/install/repo/liveimg.tar"
+                "url": "file:///run/install/repo/liveimg.tar.gz"
               }
             }
           }
@@ -13932,7 +13932,7 @@
               }
             },
             "options": {
-              "filename": "/liveimg.tar"
+              "filename": "/liveimg.tar.gz"
             }
           },
           {
diff --git a/tools/libvirt_test.sh b/tools/libvirt_test.sh
index a993f58d6..4d444bf99 100755
--- a/tools/libvirt_test.sh
+++ b/tools/libvirt_test.sh
@@ -279,6 +279,12 @@ elif [[ $ARCH == 's390x' ]]; then
 else
     # Both aarch64 and x86_64 support hybrid boot
     if [[ $BOOT_TYPE == 'uefi' ]]; then
+        # Disable secure boot for CS9 due to bug bz#2108646
+        if [[ "${ID}-${VERSION_ID}" == "centos-9" ]] ; then
+            BOOT_ARGS="uefi,firmware.feature0.name=secure-boot,firmware.feature0.enabled=no"
+        else
+            BOOT_ARGS="uefi,nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd"
+        fi
         sudo virt-install \
             --name "$IMAGE_KEY" \
             --memory 1024 \
@@ -288,7 +294,7 @@ else
             --import \
             --os-variant rhel8-unknown \
             --noautoconsole \
-            --boot uefi,nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd \
+            --boot "${BOOT_ARGS}" \
             --network network=integration,mac=34:49:22:B0:83:30
     else
         sudo virt-install \