diff --git a/stages/org.osbuild.ostree.encapsulate b/stages/org.osbuild.ostree.encapsulate
index caa9734e5..f2c9f01d3 100755
--- a/stages/org.osbuild.ostree.encapsulate
+++ b/stages/org.osbuild.ostree.encapsulate
@@ -10,11 +10,12 @@ For more information see [1].
 import subprocess
 import sys
 
+import yaml
+
 import osbuild.api
 
 CAPABILITIES = ["CAP_MAC_ADMIN"]
 
-
 SCHEMA_2 = """
 "options": {
   "additionalProperties": false,
@@ -69,6 +70,18 @@ SCHEMA_2 = """
 """
 
 
+def rpmostree_version():
+    result = subprocess.run(["rpm-ostree", "--version"],
+                            encoding="utf-8",
+                            stdout=subprocess.PIPE,
+                            check=True)
+
+    version = yaml.safe_load(result.stdout)["rpm-ostree"]["Version"]
+    year, release = version.split(".")
+
+    return int(year), int(release)
+
+
 def rpmostree(*args, **kwargs):
     args = list(args) + [f'--{k}={v}' for k, v in kwargs.items()]
     print("rpm-ostree " + " ".join(args), file=sys.stderr)
@@ -109,10 +122,20 @@ def main(tree, inputs, options):
     if maxlayers:
         extra_args += ["--max-layers", str(maxlayers)]
 
-    rpmostree("container-encapsulate", commit, container,
-              "--format-version", str(formatver),
-              "--repo", source_repo,
-              *extra_args)
+    args = []
+
+    # Use `rpm-ostree compose container-encapsulate` instead of
+    # removed `rpm-ostree container-encapsulate` when using rpm-ostree >= 2023.2
+    year, release = rpmostree_version()
+    if year >= 2024 or (year == 2023 and release >= 2):
+        args += ["compose"]
+
+    args += [
+        "container-encapsulate", commit, container, "--format-version",
+        str(formatver), "--repo", source_repo, *extra_args
+    ]
+
+    rpmostree(*args)
 
 
 if __name__ == '__main__':
diff --git a/test/data/manifests/fedora-build-v2.ipp.yaml b/test/data/manifests/fedora-build-v2.ipp.yaml
index cc73face1..ea10795a1 100644
--- a/test/data/manifests/fedora-build-v2.ipp.yaml
+++ b/test/data/manifests/fedora-build-v2.ipp.yaml
@@ -25,6 +25,7 @@ pipelines:
                 - policycoreutils
                 - python3-iniparse
                 - python3-toml
+                - python3-yaml
                 - qemu-img
                 - rpm-ostree
                 - systemd
diff --git a/test/data/manifests/fedora-container.json b/test/data/manifests/fedora-container.json
index ad23a6eee..60448a5b9 100644
--- a/test/data/manifests/fedora-container.json
+++ b/test/data/manifests/fedora-container.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -936,6 +937,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/manifests/fedora-ostree-bootiso-xz.json b/test/data/manifests/fedora-ostree-bootiso-xz.json
index 9948a9e91..c9bc35ba2 100644
--- a/test/data/manifests/fedora-ostree-bootiso-xz.json
+++ b/test/data/manifests/fedora-ostree-bootiso-xz.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -2807,6 +2808,7 @@
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
         "sha256:8bbcc9c9046470c71d78942380d14e62562881d624ee54af5bc205b0c88a0082": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyudev-0.24.0-2.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:52dd9988571562968f202532a8e504a833e4d59d5cc441885d8d1ded6c9de92f": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-file-1.5.1-8.fc38.noarch.rpm",
         "sha256:f028431139058301ac45de45f673af01d4a6cd89a349717327a68ef5ae43c7af": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-ftp-0.3.1-27.fc38.noarch.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
diff --git a/test/data/manifests/fedora-ostree-bootiso.json b/test/data/manifests/fedora-ostree-bootiso.json
index a2dae0820..8d896ac1b 100644
--- a/test/data/manifests/fedora-ostree-bootiso.json
+++ b/test/data/manifests/fedora-ostree-bootiso.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -2804,6 +2805,7 @@
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
         "sha256:8bbcc9c9046470c71d78942380d14e62562881d624ee54af5bc205b0c88a0082": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyudev-0.24.0-2.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:52dd9988571562968f202532a8e504a833e4d59d5cc441885d8d1ded6c9de92f": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-file-1.5.1-8.fc38.noarch.rpm",
         "sha256:f028431139058301ac45de45f673af01d4a6cd89a349717327a68ef5ae43c7af": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-ftp-0.3.1-27.fc38.noarch.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
diff --git a/test/data/manifests/fedora-ostree-commit.json b/test/data/manifests/fedora-ostree-commit.json
index 25fa87257..1e8dbc11e 100644
--- a/test/data/manifests/fedora-ostree-commit.json
+++ b/test/data/manifests/fedora-ostree-commit.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/manifests/fedora-ostree-container.json b/test/data/manifests/fedora-ostree-container.json
index 2ba4b1253..603f998c5 100644
--- a/test/data/manifests/fedora-ostree-container.json
+++ b/test/data/manifests/fedora-ostree-container.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/manifests/fedora-ostree-image.json b/test/data/manifests/fedora-ostree-image.json
index bb9bea7ed..8a131fae6 100644
--- a/test/data/manifests/fedora-ostree-image.json
+++ b/test/data/manifests/fedora-ostree-image.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/manifests/fedora-ostree-native-container.json b/test/data/manifests/fedora-ostree-native-container.json
index ffe98f765..3684f410c 100644
--- a/test/data/manifests/fedora-ostree-native-container.json
+++ b/test/data/manifests/fedora-ostree-native-container.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/manifests/fedora-ostree-tarball.json b/test/data/manifests/fedora-ostree-tarball.json
index 898f16e07..3c0a37194 100644
--- a/test/data/manifests/fedora-ostree-tarball.json
+++ b/test/data/manifests/fedora-ostree-tarball.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/manifests/fedora-uki.json b/test/data/manifests/fedora-uki.json
index 63a047322..6528f6a59 100644
--- a/test/data/manifests/fedora-uki.json
+++ b/test/data/manifests/fedora-uki.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -1208,6 +1209,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/chmod/a.json b/test/data/stages/chmod/a.json
index 11eee49d7..9dc9d3d55 100644
--- a/test/data/stages/chmod/a.json
+++ b/test/data/stages/chmod/a.json
@@ -234,6 +234,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
@@ -654,6 +655,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/stages/chmod/b.json b/test/data/stages/chmod/b.json
index 6d950a2f3..f8cdde617 100644
--- a/test/data/stages/chmod/b.json
+++ b/test/data/stages/chmod/b.json
@@ -234,6 +234,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
@@ -654,6 +655,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/stages/chown/a.json b/test/data/stages/chown/a.json
index 51637c1bb..a6bb0acba 100644
--- a/test/data/stages/chown/a.json
+++ b/test/data/stages/chown/a.json
@@ -234,6 +234,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
@@ -654,6 +655,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/stages/chown/b.json b/test/data/stages/chown/b.json
index 9d3c0b233..024a152cd 100644
--- a/test/data/stages/chown/b.json
+++ b/test/data/stages/chown/b.json
@@ -234,6 +234,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
@@ -654,6 +655,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/stages/containers.storage.conf/a.json b/test/data/stages/containers.storage.conf/a.json
index 1c3f5a249..625b60727 100644
--- a/test/data/stages/containers.storage.conf/a.json
+++ b/test/data/stages/containers.storage.conf/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -859,6 +860,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/containers.storage.conf/b.json b/test/data/stages/containers.storage.conf/b.json
index 528861696..53bfeb5bb 100644
--- a/test/data/stages/containers.storage.conf/b.json
+++ b/test/data/stages/containers.storage.conf/b.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -881,6 +882,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/copy/a.json b/test/data/stages/copy/a.json
index 4e3322ca0..c6b0cfffb 100644
--- a/test/data/stages/copy/a.json
+++ b/test/data/stages/copy/a.json
@@ -234,6 +234,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
@@ -654,6 +655,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/stages/copy/b.json b/test/data/stages/copy/b.json
index 613a3df3e..c93336920 100644
--- a/test/data/stages/copy/b.json
+++ b/test/data/stages/copy/b.json
@@ -234,6 +234,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
@@ -654,6 +655,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/stages/cpio.out/a.json b/test/data/stages/cpio.out/a.json
index 882082d6e..e94fc753b 100644
--- a/test/data/stages/cpio.out/a.json
+++ b/test/data/stages/cpio.out/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -677,6 +678,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/cpio.out/b.json b/test/data/stages/cpio.out/b.json
index 8ed13f2cf..f5af56eda 100644
--- a/test/data/stages/cpio.out/b.json
+++ b/test/data/stages/cpio.out/b.json
@@ -238,6 +238,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
@@ -658,6 +659,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/stages/cron.script/a.json b/test/data/stages/cron.script/a.json
index a5fc1304b..15de0ddaa 100644
--- a/test/data/stages/cron.script/a.json
+++ b/test/data/stages/cron.script/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -873,6 +874,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/cron.script/b.json b/test/data/stages/cron.script/b.json
index 18e3ffe09..e9dc5e50e 100644
--- a/test/data/stages/cron.script/b.json
+++ b/test/data/stages/cron.script/b.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -874,6 +875,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/fdo/a.json b/test/data/stages/fdo/a.json
index 882082d6e..e94fc753b 100644
--- a/test/data/stages/fdo/a.json
+++ b/test/data/stages/fdo/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -677,6 +678,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/fdo/b.json b/test/data/stages/fdo/b.json
index 022314414..99cf1dd2f 100644
--- a/test/data/stages/fdo/b.json
+++ b/test/data/stages/fdo/b.json
@@ -234,6 +234,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
@@ -654,6 +655,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/stages/grub2.legacy/a.json b/test/data/stages/grub2.legacy/a.json
index 882082d6e..e94fc753b 100644
--- a/test/data/stages/grub2.legacy/a.json
+++ b/test/data/stages/grub2.legacy/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -677,6 +678,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/grub2.legacy/b.json b/test/data/stages/grub2.legacy/b.json
index 4dba2a1d2..91c5c35f0 100644
--- a/test/data/stages/grub2.legacy/b.json
+++ b/test/data/stages/grub2.legacy/b.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -713,6 +714,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/grub2/a.json b/test/data/stages/grub2/a.json
index 882082d6e..e94fc753b 100644
--- a/test/data/stages/grub2/a.json
+++ b/test/data/stages/grub2/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -677,6 +678,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/grub2/b.json b/test/data/stages/grub2/b.json
index 4948ba193..d12e70d2b 100644
--- a/test/data/stages/grub2/b.json
+++ b/test/data/stages/grub2/b.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -701,6 +702,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/gunzip/a.json b/test/data/stages/gunzip/a.json
index 309055c9a..d11bd5d1e 100644
--- a/test/data/stages/gunzip/a.json
+++ b/test/data/stages/gunzip/a.json
@@ -234,6 +234,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
@@ -654,6 +655,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/stages/gunzip/b.json b/test/data/stages/gunzip/b.json
index 3f3cc55ae..10ee9b963 100644
--- a/test/data/stages/gunzip/b.json
+++ b/test/data/stages/gunzip/b.json
@@ -234,6 +234,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
@@ -654,6 +655,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/stages/gzip/a.json b/test/data/stages/gzip/a.json
index 882082d6e..e94fc753b 100644
--- a/test/data/stages/gzip/a.json
+++ b/test/data/stages/gzip/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -677,6 +678,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/gzip/b.json b/test/data/stages/gzip/b.json
index 309055c9a..d11bd5d1e 100644
--- a/test/data/stages/gzip/b.json
+++ b/test/data/stages/gzip/b.json
@@ -234,6 +234,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
@@ -654,6 +655,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/stages/mkdir/a.json b/test/data/stages/mkdir/a.json
index 84f7cfc1b..ef6377dc0 100644
--- a/test/data/stages/mkdir/a.json
+++ b/test/data/stages/mkdir/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -688,6 +689,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/mkdir/b.json b/test/data/stages/mkdir/b.json
index 21b8662ef..cfb7e7e05 100644
--- a/test/data/stages/mkdir/b.json
+++ b/test/data/stages/mkdir/b.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -701,6 +702,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/nginx.conf/a.json b/test/data/stages/nginx.conf/a.json
index bfd5b242f..0e45ffca6 100644
--- a/test/data/stages/nginx.conf/a.json
+++ b/test/data/stages/nginx.conf/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -870,6 +871,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/nginx.conf/b.json b/test/data/stages/nginx.conf/b.json
index 9ef86a24c..193195022 100644
--- a/test/data/stages/nginx.conf/b.json
+++ b/test/data/stages/nginx.conf/b.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -882,6 +883,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/oscap.autotailor/a.json b/test/data/stages/oscap.autotailor/a.json
index 882082d6e..e94fc753b 100644
--- a/test/data/stages/oscap.autotailor/a.json
+++ b/test/data/stages/oscap.autotailor/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -677,6 +678,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/oscap.autotailor/b.json b/test/data/stages/oscap.autotailor/b.json
index 60f8eead8..b7037ac1f 100644
--- a/test/data/stages/oscap.autotailor/b.json
+++ b/test/data/stages/oscap.autotailor/b.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -703,6 +704,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/oscap.remediation/a.json b/test/data/stages/oscap.remediation/a.json
index efb44634c..4b4abaf0c 100644
--- a/test/data/stages/oscap.remediation/a.json
+++ b/test/data/stages/oscap.remediation/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -876,6 +877,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/oscap.remediation/b.json b/test/data/stages/oscap.remediation/b.json
index 5eadaa9cf..6cac10f39 100644
--- a/test/data/stages/oscap.remediation/b.json
+++ b/test/data/stages/oscap.remediation/b.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -886,6 +887,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/ovf/ovf.json b/test/data/stages/ovf/ovf.json
index 9199e064a..f52cda65d 100644
--- a/test/data/stages/ovf/ovf.json
+++ b/test/data/stages/ovf/ovf.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -714,6 +715,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/parted/parted.json b/test/data/stages/parted/parted.json
index cb6dd14a9..e4f9804ec 100644
--- a/test/data/stages/parted/parted.json
+++ b/test/data/stages/parted/parted.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -720,6 +721,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/qemu/qemu.json b/test/data/stages/qemu/qemu.json
index 5ebc20283..afb7910be 100644
--- a/test/data/stages/qemu/qemu.json
+++ b/test/data/stages/qemu/qemu.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -892,6 +893,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/rhsm.facts/a.json b/test/data/stages/rhsm.facts/a.json
index 7272d5254..e71988825 100644
--- a/test/data/stages/rhsm.facts/a.json
+++ b/test/data/stages/rhsm.facts/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -875,6 +876,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/rhsm.facts/b.json b/test/data/stages/rhsm.facts/b.json
index d58f77478..414589857 100644
--- a/test/data/stages/rhsm.facts/b.json
+++ b/test/data/stages/rhsm.facts/b.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -884,6 +885,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/rpm.macros/a.json b/test/data/stages/rpm.macros/a.json
index 882082d6e..e94fc753b 100644
--- a/test/data/stages/rpm.macros/a.json
+++ b/test/data/stages/rpm.macros/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -677,6 +678,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/rpm.macros/b.json b/test/data/stages/rpm.macros/b.json
index d96a71738..dafeb78b8 100644
--- a/test/data/stages/rpm.macros/b.json
+++ b/test/data/stages/rpm.macros/b.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -685,6 +686,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/rpmkeys.import/a.json b/test/data/stages/rpmkeys.import/a.json
index 882082d6e..e94fc753b 100644
--- a/test/data/stages/rpmkeys.import/a.json
+++ b/test/data/stages/rpmkeys.import/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -677,6 +678,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/rpmkeys.import/b.json b/test/data/stages/rpmkeys.import/b.json
index 447daa195..3af6e52a4 100644
--- a/test/data/stages/rpmkeys.import/b.json
+++ b/test/data/stages/rpmkeys.import/b.json
@@ -234,6 +234,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
@@ -654,6 +655,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/stages/sfdisk/sfdisk.json b/test/data/stages/sfdisk/sfdisk.json
index fba13dedc..2e280b022 100644
--- a/test/data/stages/sfdisk/sfdisk.json
+++ b/test/data/stages/sfdisk/sfdisk.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -728,6 +729,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/sgdisk/sgdisk.json b/test/data/stages/sgdisk/sgdisk.json
index 0f654b28f..60bf72f73 100644
--- a/test/data/stages/sgdisk/sgdisk.json
+++ b/test/data/stages/sgdisk/sgdisk.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -728,6 +729,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/shell.init/a.json b/test/data/stages/shell.init/a.json
index 58f8db1fd..6b672c423 100644
--- a/test/data/stages/shell.init/a.json
+++ b/test/data/stages/shell.init/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -700,6 +701,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/shell.init/b.json b/test/data/stages/shell.init/b.json
index 97b8e8925..29cb6f037 100644
--- a/test/data/stages/shell.init/b.json
+++ b/test/data/stages/shell.init/b.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -727,6 +728,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/skopeo/a.json b/test/data/stages/skopeo/a.json
index f015fb9e9..10e53a942 100644
--- a/test/data/stages/skopeo/a.json
+++ b/test/data/stages/skopeo/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -747,6 +748,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/skopeo/b.json b/test/data/stages/skopeo/b.json
index 882082d6e..e94fc753b 100644
--- a/test/data/stages/skopeo/b.json
+++ b/test/data/stages/skopeo/b.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -677,6 +678,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/systemd-journald/a.json b/test/data/stages/systemd-journald/a.json
index 642af1ba7..c65bbdec4 100644
--- a/test/data/stages/systemd-journald/a.json
+++ b/test/data/stages/systemd-journald/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -854,6 +855,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/systemd-journald/b.json b/test/data/stages/systemd-journald/b.json
index a65f31eb6..5e4f635ef 100644
--- a/test/data/stages/systemd-journald/b.json
+++ b/test/data/stages/systemd-journald/b.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -868,6 +869,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/tar/tar.json b/test/data/stages/tar/tar.json
index c3d780796..e4d563337 100644
--- a/test/data/stages/tar/tar.json
+++ b/test/data/stages/tar/tar.json
@@ -234,6 +234,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
@@ -654,6 +655,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/stages/udev.rules/a.json b/test/data/stages/udev.rules/a.json
index b6eac5de5..ff558b9ad 100644
--- a/test/data/stages/udev.rules/a.json
+++ b/test/data/stages/udev.rules/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -1039,6 +1040,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/udev.rules/b.json b/test/data/stages/udev.rules/b.json
index e63c7ed7a..443e99e21 100644
--- a/test/data/stages/udev.rules/b.json
+++ b/test/data/stages/udev.rules/b.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -1104,6 +1105,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/untar/a.json b/test/data/stages/untar/a.json
index 882082d6e..e94fc753b 100644
--- a/test/data/stages/untar/a.json
+++ b/test/data/stages/untar/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -677,6 +678,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/untar/b.json b/test/data/stages/untar/b.json
index 1812de915..66a45e470 100644
--- a/test/data/stages/untar/b.json
+++ b/test/data/stages/untar/b.json
@@ -234,6 +234,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
@@ -654,6 +655,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/stages/wsl.conf/a.json b/test/data/stages/wsl.conf/a.json
index 58f8db1fd..6b672c423 100644
--- a/test/data/stages/wsl.conf/a.json
+++ b/test/data/stages/wsl.conf/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -700,6 +701,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/wsl.conf/b.json b/test/data/stages/wsl.conf/b.json
index 5daad8d8d..765b9ced7 100644
--- a/test/data/stages/wsl.conf/b.json
+++ b/test/data/stages/wsl.conf/b.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -708,6 +709,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/xz/a.json b/test/data/stages/xz/a.json
index 882082d6e..e94fc753b 100644
--- a/test/data/stages/xz/a.json
+++ b/test/data/stages/xz/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -677,6 +678,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/xz/b.json b/test/data/stages/xz/b.json
index 40808d2ba..1e8e51589 100644
--- a/test/data/stages/xz/b.json
+++ b/test/data/stages/xz/b.json
@@ -234,6 +234,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
@@ -654,6 +655,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
diff --git a/test/data/stages/zstd/a.json b/test/data/stages/zstd/a.json
index 35241011e..ab26afa18 100644
--- a/test/data/stages/zstd/a.json
+++ b/test/data/stages/zstd/a.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -715,6 +716,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",
diff --git a/test/data/stages/zstd/b.json b/test/data/stages/zstd/b.json
index 9f08e9cdf..9ca45f5c3 100644
--- a/test/data/stages/zstd/b.json
+++ b/test/data/stages/zstd/b.json
@@ -236,6 +236,7 @@
                 "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": {},
                 "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": {},
                 "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": {},
+                "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": {},
                 "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": {},
                 "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": {},
                 "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": {},
@@ -730,6 +731,7 @@
         "sha256:4c0a98cd79110fc394123f6b13e1967d9f5719d1045595818eda0ff9b31e8f29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pycparser-2.20-9.fc38.noarch.rpm",
         "sha256:bdf429e9e79cbaaf49a37d53ba96a4e3197a3410080968ac2d0e2bd5560521e2": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pysocks-1.7.1-16.fc38.noarch.rpm",
         "sha256:66e1fea6d0e73a0631f2926cc835e589eb9bb01791c0dea5bbe89b7d48e1bf29": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pytz-2023.3-1.fc38.noarch.rpm",
+        "sha256:6d809624847cf620e3060938474120a473572b0ffa3785013069c63c964b8b4b": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-pyyaml-6.0-6.fc38.x86_64.rpm",
         "sha256:0ac49fd1615cbbcd5dc87bfb8220a3953e23a309cdd1e791c6bd30babb7805d3": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-requests-gssapi-1.2.3-7.fc38.noarch.rpm",
         "sha256:57c012e31a9903c3bdc70cc636f016bf998dbacdd0918fc53dd21a154f491391": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-rpmautospec-0.3.5-1.fc38.noarch.rpm",
         "sha256:fa61f497c2f94b4bbe9022f2e7a1bb4138aa02db1b5f60706a0056cccf2eb7ac": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-fedora-20230413/Packages/p/python3-setuptools-65.5.1-2.fc38.noarch.rpm",