diff --git a/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json
index 3a7366a274..496b2a2a95 100644
--- a/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json
@@ -2882,7 +2882,7 @@
               }
             },
             "options": {
-              "filename": "disk.img.xz"
+              "filename": "image.raw.xz"
             }
           }
         ]
@@ -5791,7 +5791,7 @@
                   "coreos.inst.crypt_root=1",
                   "coreos.inst.isoroot=CentOS-Stream-8-aarch64-dvd",
                   "coreos.inst.install_dev=/dev/vda",
-                  "coreos.inst.image_file=/run/media/iso/disk.img.xz",
+                  "coreos.inst.image_file=/run/media/iso/image.raw.xz",
                   "coreos.inst.insecure",
                   "fdo.manufacturing_server_url=https;//fdo.example.com",
                   "fdo.diun_pub_key_insecure=true"
@@ -5818,7 +5818,7 @@
                 "origin": "org.osbuild.pipeline",
                 "references": {
                   "name:archive": {
-                    "file": "disk.img.xz"
+                    "file": "image.raw.xz"
                   }
                 }
               }
@@ -5826,8 +5826,8 @@
             "options": {
               "paths": [
                 {
-                  "from": "input://file/disk.img.xz",
-                  "to": "tree:///disk.img.xz"
+                  "from": "input://file/image.raw.xz",
+                  "to": "tree:///image.raw.xz"
                 }
               ]
             }
diff --git a/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json
index 6ce588e4f8..8ad28c40a5 100644
--- a/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json
@@ -2973,7 +2973,7 @@
               }
             },
             "options": {
-              "filename": "disk.img.xz"
+              "filename": "image.raw.xz"
             }
           }
         ]
@@ -5931,7 +5931,7 @@
                   "coreos.inst.crypt_root=1",
                   "coreos.inst.isoroot=CentOS-Stream-8-x86_64-dvd",
                   "coreos.inst.install_dev=/dev/vda",
-                  "coreos.inst.image_file=/run/media/iso/disk.img.xz",
+                  "coreos.inst.image_file=/run/media/iso/image.raw.xz",
                   "coreos.inst.insecure",
                   "fdo.manufacturing_server_url=https;//fdo.example.com",
                   "fdo.diun_pub_key_insecure=true"
@@ -5959,7 +5959,7 @@
                 "origin": "org.osbuild.pipeline",
                 "references": {
                   "name:archive": {
-                    "file": "disk.img.xz"
+                    "file": "image.raw.xz"
                   }
                 }
               }
@@ -5967,8 +5967,8 @@
             "options": {
               "paths": [
                 {
-                  "from": "input://file/disk.img.xz",
-                  "to": "tree:///disk.img.xz"
+                  "from": "input://file/image.raw.xz",
+                  "to": "tree:///image.raw.xz"
                 }
               ]
             }
diff --git a/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json
index 276efb07f7..7b61053150 100644
--- a/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json
@@ -1380,7 +1380,7 @@
               }
             },
             "options": {
-              "filename": "disk.img.xz"
+              "filename": "image.raw.xz"
             }
           }
         ]
@@ -2541,7 +2541,7 @@
                   "coreos.inst.crypt_root=1",
                   "coreos.inst.isoroot=RHEL-8-6-0-BaseOS-aarch64",
                   "coreos.inst.install_dev=/dev/vda",
-                  "coreos.inst.image_file=/run/media/iso/disk.img.xz",
+                  "coreos.inst.image_file=/run/media/iso/image.raw.xz",
                   "coreos.inst.insecure",
                   "fdo.manufacturing_server_url=https;//fdo.example.com",
                   "fdo.diun_pub_key_insecure=true"
@@ -2568,7 +2568,7 @@
                 "origin": "org.osbuild.pipeline",
                 "references": {
                   "name:archive": {
-                    "file": "disk.img.xz"
+                    "file": "image.raw.xz"
                   }
                 }
               }
@@ -2576,8 +2576,8 @@
             "options": {
               "paths": [
                 {
-                  "from": "input://file/disk.img.xz",
-                  "to": "tree:///disk.img.xz"
+                  "from": "input://file/image.raw.xz",
+                  "to": "tree:///image.raw.xz"
                 }
               ]
             }
diff --git a/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json
index 7e6a5edc52..a69a31fbae 100644
--- a/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json
@@ -1431,7 +1431,7 @@
               }
             },
             "options": {
-              "filename": "disk.img.xz"
+              "filename": "image.raw.xz"
             }
           }
         ]
@@ -2611,7 +2611,7 @@
                   "coreos.inst.crypt_root=1",
                   "coreos.inst.isoroot=RHEL-8-6-0-BaseOS-x86_64",
                   "coreos.inst.install_dev=/dev/vda",
-                  "coreos.inst.image_file=/run/media/iso/disk.img.xz",
+                  "coreos.inst.image_file=/run/media/iso/image.raw.xz",
                   "coreos.inst.insecure",
                   "fdo.manufacturing_server_url=https;//fdo.example.com",
                   "fdo.diun_pub_key_insecure=true"
@@ -2639,7 +2639,7 @@
                 "origin": "org.osbuild.pipeline",
                 "references": {
                   "name:archive": {
-                    "file": "disk.img.xz"
+                    "file": "image.raw.xz"
                   }
                 }
               }
@@ -2647,8 +2647,8 @@
             "options": {
               "paths": [
                 {
-                  "from": "input://file/disk.img.xz",
-                  "to": "tree:///disk.img.xz"
+                  "from": "input://file/image.raw.xz",
+                  "to": "tree:///image.raw.xz"
                 }
               ]
             }
diff --git a/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json
index 65e9cfad57..576521e8c5 100644
--- a/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json
@@ -1380,7 +1380,7 @@
               }
             },
             "options": {
-              "filename": "disk.img.xz"
+              "filename": "image.raw.xz"
             }
           }
         ]
@@ -2541,7 +2541,7 @@
                   "coreos.inst.crypt_root=1",
                   "coreos.inst.isoroot=RHEL-8-6-0-BaseOS-aarch64",
                   "coreos.inst.install_dev=/dev/vda",
-                  "coreos.inst.image_file=/run/media/iso/disk.img.xz",
+                  "coreos.inst.image_file=/run/media/iso/image.raw.xz",
                   "coreos.inst.insecure",
                   "fdo.manufacturing_server_url=https;//fdo.example.com",
                   "fdo.diun_pub_key_insecure=true"
@@ -2568,7 +2568,7 @@
                 "origin": "org.osbuild.pipeline",
                 "references": {
                   "name:archive": {
-                    "file": "disk.img.xz"
+                    "file": "image.raw.xz"
                   }
                 }
               }
@@ -2576,8 +2576,8 @@
             "options": {
               "paths": [
                 {
-                  "from": "input://file/disk.img.xz",
-                  "to": "tree:///disk.img.xz"
+                  "from": "input://file/image.raw.xz",
+                  "to": "tree:///image.raw.xz"
                 }
               ]
             }
diff --git a/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json
index b2805fd1ee..40830fb4bb 100644
--- a/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json
@@ -1431,7 +1431,7 @@
               }
             },
             "options": {
-              "filename": "disk.img.xz"
+              "filename": "image.raw.xz"
             }
           }
         ]
@@ -2611,7 +2611,7 @@
                   "coreos.inst.crypt_root=1",
                   "coreos.inst.isoroot=RHEL-8-6-0-BaseOS-x86_64",
                   "coreos.inst.install_dev=/dev/vda",
-                  "coreos.inst.image_file=/run/media/iso/disk.img.xz",
+                  "coreos.inst.image_file=/run/media/iso/image.raw.xz",
                   "coreos.inst.insecure",
                   "fdo.manufacturing_server_url=https;//fdo.example.com",
                   "fdo.diun_pub_key_insecure=true"
@@ -2639,7 +2639,7 @@
                 "origin": "org.osbuild.pipeline",
                 "references": {
                   "name:archive": {
-                    "file": "disk.img.xz"
+                    "file": "image.raw.xz"
                   }
                 }
               }
@@ -2647,8 +2647,8 @@
             "options": {
               "paths": [
                 {
-                  "from": "input://file/disk.img.xz",
-                  "to": "tree:///disk.img.xz"
+                  "from": "input://file/image.raw.xz",
+                  "to": "tree:///image.raw.xz"
                 }
               ]
             }
diff --git a/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json
index b0fffe3837..9df9f98c55 100644
--- a/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json
@@ -1377,7 +1377,7 @@
               }
             },
             "options": {
-              "filename": "disk.img.xz"
+              "filename": "image.raw.xz"
             }
           }
         ]
@@ -2538,7 +2538,7 @@
                   "coreos.inst.crypt_root=1",
                   "coreos.inst.isoroot=RHEL-8-7-0-BaseOS-aarch64",
                   "coreos.inst.install_dev=/dev/vda",
-                  "coreos.inst.image_file=/run/media/iso/disk.img.xz",
+                  "coreos.inst.image_file=/run/media/iso/image.raw.xz",
                   "coreos.inst.insecure",
                   "fdo.manufacturing_server_url=https;//fdo.example.com",
                   "fdo.diun_pub_key_insecure=true"
@@ -2565,7 +2565,7 @@
                 "origin": "org.osbuild.pipeline",
                 "references": {
                   "name:archive": {
-                    "file": "disk.img.xz"
+                    "file": "image.raw.xz"
                   }
                 }
               }
@@ -2573,8 +2573,8 @@
             "options": {
               "paths": [
                 {
-                  "from": "input://file/disk.img.xz",
-                  "to": "tree:///disk.img.xz"
+                  "from": "input://file/image.raw.xz",
+                  "to": "tree:///image.raw.xz"
                 }
               ]
             }
diff --git a/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json
index 6550bf4b10..4ff0c1eae2 100644
--- a/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json
@@ -1428,7 +1428,7 @@
               }
             },
             "options": {
-              "filename": "disk.img.xz"
+              "filename": "image.raw.xz"
             }
           }
         ]
@@ -2608,7 +2608,7 @@
                   "coreos.inst.crypt_root=1",
                   "coreos.inst.isoroot=RHEL-8-7-0-BaseOS-x86_64",
                   "coreos.inst.install_dev=/dev/vda",
-                  "coreos.inst.image_file=/run/media/iso/disk.img.xz",
+                  "coreos.inst.image_file=/run/media/iso/image.raw.xz",
                   "coreos.inst.insecure",
                   "fdo.manufacturing_server_url=https;//fdo.example.com",
                   "fdo.diun_pub_key_insecure=true"
@@ -2636,7 +2636,7 @@
                 "origin": "org.osbuild.pipeline",
                 "references": {
                   "name:archive": {
-                    "file": "disk.img.xz"
+                    "file": "image.raw.xz"
                   }
                 }
               }
@@ -2644,8 +2644,8 @@
             "options": {
               "paths": [
                 {
-                  "from": "input://file/disk.img.xz",
-                  "to": "tree:///disk.img.xz"
+                  "from": "input://file/image.raw.xz",
+                  "to": "tree:///image.raw.xz"
                 }
               ]
             }
diff --git a/test/data/manifests/rhel_88-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_88-aarch64-edge_simplified_installer-boot.json
index 4c2ef62cd3..d6869a55f9 100644
--- a/test/data/manifests/rhel_88-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-edge_simplified_installer-boot.json
@@ -1377,7 +1377,7 @@
               }
             },
             "options": {
-              "filename": "disk.img.xz"
+              "filename": "image.raw.xz"
             }
           }
         ]
@@ -2538,7 +2538,7 @@
                   "coreos.inst.crypt_root=1",
                   "coreos.inst.isoroot=RHEL-8-8-0-BaseOS-aarch64",
                   "coreos.inst.install_dev=/dev/vda",
-                  "coreos.inst.image_file=/run/media/iso/disk.img.xz",
+                  "coreos.inst.image_file=/run/media/iso/image.raw.xz",
                   "coreos.inst.insecure",
                   "fdo.manufacturing_server_url=https;//fdo.example.com",
                   "fdo.diun_pub_key_insecure=true"
@@ -2565,7 +2565,7 @@
                 "origin": "org.osbuild.pipeline",
                 "references": {
                   "name:archive": {
-                    "file": "disk.img.xz"
+                    "file": "image.raw.xz"
                   }
                 }
               }
@@ -2573,8 +2573,8 @@
             "options": {
               "paths": [
                 {
-                  "from": "input://file/disk.img.xz",
-                  "to": "tree:///disk.img.xz"
+                  "from": "input://file/image.raw.xz",
+                  "to": "tree:///image.raw.xz"
                 }
               ]
             }
diff --git a/test/data/manifests/rhel_88-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_88-x86_64-edge_simplified_installer-boot.json
index ed7455850b..ddd1f20a4c 100644
--- a/test/data/manifests/rhel_88-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-edge_simplified_installer-boot.json
@@ -1428,7 +1428,7 @@
               }
             },
             "options": {
-              "filename": "disk.img.xz"
+              "filename": "image.raw.xz"
             }
           }
         ]
@@ -2608,7 +2608,7 @@
                   "coreos.inst.crypt_root=1",
                   "coreos.inst.isoroot=RHEL-8-8-0-BaseOS-x86_64",
                   "coreos.inst.install_dev=/dev/vda",
-                  "coreos.inst.image_file=/run/media/iso/disk.img.xz",
+                  "coreos.inst.image_file=/run/media/iso/image.raw.xz",
                   "coreos.inst.insecure",
                   "fdo.manufacturing_server_url=https;//fdo.example.com",
                   "fdo.diun_pub_key_insecure=true"
@@ -2636,7 +2636,7 @@
                 "origin": "org.osbuild.pipeline",
                 "references": {
                   "name:archive": {
-                    "file": "disk.img.xz"
+                    "file": "image.raw.xz"
                   }
                 }
               }
@@ -2644,8 +2644,8 @@
             "options": {
               "paths": [
                 {
-                  "from": "input://file/disk.img.xz",
-                  "to": "tree:///disk.img.xz"
+                  "from": "input://file/image.raw.xz",
+                  "to": "tree:///image.raw.xz"
                 }
               ]
             }