diff --git a/test/data/manifests/f34-build-v2.json b/test/data/manifests/f34-build-v2.json
index 3e91372a..4492237b 100644
--- a/test/data/manifests/f34-build-v2.json
+++ b/test/data/manifests/f34-build-v2.json
@@ -28,6 +28,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
@@ -362,6 +363,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
diff --git a/test/data/manifests/f34-build-v2.mpp.json b/test/data/manifests/f34-build-v2.mpp.json
index 8d9ed8ba..d5f40b47 100644
--- a/test/data/manifests/f34-build-v2.mpp.json
+++ b/test/data/manifests/f34-build-v2.mpp.json
@@ -21,6 +21,7 @@
                 ],
                 "packages": [
                   "btrfs-progs",
+                  "cryptsetup",
                   "dnf",
                   "dosfstools",
                   "e2fsprogs",
diff --git a/test/data/manifests/fedora-container.json b/test/data/manifests/fedora-container.json
index 2c5e1a53..f295379f 100644
--- a/test/data/manifests/fedora-container.json
+++ b/test/data/manifests/fedora-container.json
@@ -29,6 +29,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
@@ -601,6 +602,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
diff --git a/test/data/manifests/fedora-ostree-bootiso.json b/test/data/manifests/fedora-ostree-bootiso.json
index 92289ac0..351ed305 100644
--- a/test/data/manifests/fedora-ostree-bootiso.json
+++ b/test/data/manifests/fedora-ostree-bootiso.json
@@ -29,6 +29,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
diff --git a/test/data/manifests/fedora-ostree-container.json b/test/data/manifests/fedora-ostree-container.json
index db179437..41967822 100644
--- a/test/data/manifests/fedora-ostree-container.json
+++ b/test/data/manifests/fedora-ostree-container.json
@@ -29,6 +29,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
@@ -1107,6 +1108,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
diff --git a/test/data/manifests/fedora-ostree-image.json b/test/data/manifests/fedora-ostree-image.json
index 0cc5d74b..16ad9917 100644
--- a/test/data/manifests/fedora-ostree-image.json
+++ b/test/data/manifests/fedora-ostree-image.json
@@ -29,6 +29,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
@@ -904,7 +905,8 @@
               "console=tty0",
               "console=ttyS0",
               "systemd.log_target=console",
-              "systemd.journald.forward_to_console=1"
+              "systemd.journald.forward_to_console=1",
+              "luks.uuid=aedd1eef-f24e-425e-a9f3-bb5a1c996a95"
             ]
           }
         },
@@ -1035,7 +1037,7 @@
                 "start": 413696,
                 "size": 20557791,
                 "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
-                "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
+                "uuid": "CA7D7CCB-63ED-4C53-861C-1742536059CC"
               }
             ]
           }
@@ -1048,7 +1050,8 @@
               "options": {
                 "filename": "disk.img",
                 "start": 4096,
-                "size": 204800
+                "size": 204800,
+                "lock": true
               }
             }
           },
@@ -1065,7 +1068,8 @@
               "options": {
                 "filename": "disk.img",
                 "start": 208896,
-                "size": 204800
+                "size": 204800,
+                "lock": true
               }
             }
           },
@@ -1075,15 +1079,47 @@
           }
         },
         {
-          "type": "org.osbuild.lvm2.create",
+          "type": "org.osbuild.luks2.format",
           "devices": {
             "device": {
+              "type": "org.osbuild.loopback",
+              "options": {
+                "filename": "disk.img",
+                "start": 413696,
+                "size": 20557791,
+                "lock": true
+              }
+            }
+          },
+          "options": {
+            "passphrase": "osbuild",
+            "uuid": "aedd1eef-f24e-425e-a9f3-bb5a1c996a95",
+            "label": "luks",
+            "pbkdf": {
+              "method": "argon2i",
+              "memory": 32,
+              "parallelism": 1,
+              "iterations": 4
+            }
+          }
+        },
+        {
+          "type": "org.osbuild.lvm2.create",
+          "devices": {
+            "luks": {
               "type": "org.osbuild.loopback",
               "options": {
                 "filename": "disk.img",
                 "start": 413696,
                 "size": 20557791
               }
+            },
+            "device": {
+              "type": "org.osbuild.luks2",
+              "parent": "luks",
+              "options": {
+                "passphrase": "osbuild"
+              }
             }
           },
           "options": {
@@ -1098,7 +1134,7 @@
         {
           "type": "org.osbuild.mkfs.xfs",
           "devices": {
-            "lvm": {
+            "luks": {
               "type": "org.osbuild.loopback",
               "options": {
                 "filename": "disk.img",
@@ -1106,6 +1142,13 @@
                 "size": 20557791
               }
             },
+            "lvm": {
+              "type": "org.osbuild.luks2",
+              "parent": "luks",
+              "options": {
+                "passphrase": "osbuild"
+              }
+            },
             "device": {
               "type": "org.osbuild.lvm2.lv",
               "parent": "lvm",
@@ -1155,7 +1198,7 @@
                 "size": 204800
               }
             },
-            "lvm": {
+            "luks": {
               "type": "org.osbuild.loopback",
               "options": {
                 "filename": "disk.img",
@@ -1163,6 +1206,13 @@
                 "size": 20557791
               }
             },
+            "lvm": {
+              "type": "org.osbuild.luks2",
+              "parent": "luks",
+              "options": {
+                "passphrase": "osbuild"
+              }
+            },
             "root": {
               "type": "org.osbuild.lvm2.lv",
               "parent": "lvm",
@@ -1214,13 +1264,19 @@
         {
           "type": "org.osbuild.lvm2.metadata",
           "devices": {
-            "device": {
+            "luks": {
               "type": "org.osbuild.loopback",
               "options": {
                 "filename": "disk.img",
                 "start": 413696,
-                "size": 20557791,
-                "lock": true
+                "size": 20557791
+              }
+            },
+            "device": {
+              "type": "org.osbuild.luks2",
+              "parent": "luks",
+              "options": {
+                "passphrase": "osbuild"
               }
             }
           },
diff --git a/test/data/manifests/fedora-ostree-image.mpp.json b/test/data/manifests/fedora-ostree-image.mpp.json
index 02e934df..218bfdab 100644
--- a/test/data/manifests/fedora-ostree-image.mpp.json
+++ b/test/data/manifests/fedora-ostree-image.mpp.json
@@ -27,9 +27,9 @@
           "uuid": "61B2905B-DF3E-4FB3-80FA-49D1E773AA32"
         },
         {
-          "id": "lvm",
+          "id": "luks",
           "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
-          "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
+          "uuid": "CA7D7CCB-63ED-4C53-861C-1742536059CC"
         }
       ]
     }
@@ -316,7 +316,8 @@
               "console=tty0",
               "console=ttyS0",
               "systemd.log_target=console",
-              "systemd.journald.forward_to_console=1"
+              "systemd.journald.forward_to_console=1",
+              "luks.uuid=aedd1eef-f24e-425e-a9f3-bb5a1c996a95"
             ]
           }
         },
@@ -438,7 +439,8 @@
                 },
                 "size": {
                   "mpp-format-int": "{image.layout['efi'].size}"
-                }
+                },
+                "lock": true
               }
             }
           },
@@ -459,7 +461,8 @@
                 },
                 "size": {
                   "mpp-format-int": "{image.layout['boot'].size}"
-                }
+                },
+                "lock": true
               }
             }
           },
@@ -469,19 +472,55 @@
           }
         },
         {
-          "type": "org.osbuild.lvm2.create",
+          "type": "org.osbuild.luks2.format",
           "devices": {
             "device": {
               "type": "org.osbuild.loopback",
               "options": {
                 "filename": "disk.img",
                 "start": {
-                  "mpp-format-int": "{image.layout['lvm'].start}"
+                  "mpp-format-int": "{image.layout['luks'].start}"
                 },
                 "size": {
-                  "mpp-format-int": "{image.layout['lvm'].size}"
+                  "mpp-format-int": "{image.layout['luks'].size}"
+                },
+                "lock": true
+              }
+            }
+          },
+          "options": {
+            "passphrase": "osbuild",
+            "uuid": "aedd1eef-f24e-425e-a9f3-bb5a1c996a95",
+            "label": "luks",
+            "pbkdf": {
+              "method": "argon2i",
+              "memory": 32,
+              "parallelism": 1,
+              "iterations": 4
+            }
+          }
+        },
+        {
+          "type": "org.osbuild.lvm2.create",
+          "devices": {
+            "luks": {
+              "type": "org.osbuild.loopback",
+              "options": {
+                "filename": "disk.img",
+                "start": {
+                  "mpp-format-int": "{image.layout['luks'].start}"
+                },
+                "size": {
+                  "mpp-format-int": "{image.layout['luks'].size}"
                 }
               }
+            },
+            "device": {
+              "type": "org.osbuild.luks2",
+              "parent": "luks",
+              "options": {
+                "passphrase": "osbuild"
+              }
             }
           },
           "options": {
@@ -496,18 +535,25 @@
         {
           "type": "org.osbuild.mkfs.xfs",
           "devices": {
-            "lvm": {
+            "luks": {
               "type": "org.osbuild.loopback",
               "options": {
                 "filename": "disk.img",
                 "start": {
-                  "mpp-format-int": "{image.layout['lvm'].start}"
+                  "mpp-format-int": "{image.layout['luks'].start}"
                 },
                 "size": {
-                  "mpp-format-int": "{image.layout['lvm'].size}"
+                  "mpp-format-int": "{image.layout['luks'].size}"
                 }
               }
             },
+            "lvm": {
+              "type": "org.osbuild.luks2",
+              "parent": "luks",
+              "options": {
+                "passphrase": "osbuild"
+              }
+            },
             "device": {
               "type": "org.osbuild.lvm2.lv",
               "parent": "lvm",
@@ -565,18 +611,25 @@
                 }
               }
             },
-            "lvm": {
+            "luks": {
               "type": "org.osbuild.loopback",
               "options": {
                 "filename": "disk.img",
                 "start": {
-                  "mpp-format-int": "{image.layout['lvm'].start}"
+                  "mpp-format-int": "{image.layout['luks'].start}"
                 },
                 "size": {
-                  "mpp-format-int": "{image.layout['lvm'].size}"
+                  "mpp-format-int": "{image.layout['luks'].size}"
                 }
               }
             },
+            "lvm": {
+              "type": "org.osbuild.luks2",
+              "parent": "luks",
+              "options": {
+                "passphrase": "osbuild"
+              }
+            },
             "root": {
               "type": "org.osbuild.lvm2.lv",
               "parent": "lvm",
@@ -634,17 +687,23 @@
         {
           "type": "org.osbuild.lvm2.metadata",
           "devices": {
-            "device": {
+            "luks": {
               "type": "org.osbuild.loopback",
               "options": {
                 "filename": "disk.img",
                 "start": {
-                  "mpp-format-int": "{image.layout['lvm'].start}"
+                  "mpp-format-int": "{image.layout['luks'].start}"
                 },
                 "size": {
-                  "mpp-format-int": "{image.layout['lvm'].size}"
-                },
-                "lock": true
+                  "mpp-format-int": "{image.layout['luks'].size}"
+                }
+              }
+            },
+            "device": {
+              "type": "org.osbuild.luks2",
+              "parent": "luks",
+              "options": {
+                "passphrase": "osbuild"
               }
             }
           },
diff --git a/test/data/manifests/fedora-ostree-tarball.json b/test/data/manifests/fedora-ostree-tarball.json
index d0f70e46..ef68e7e2 100644
--- a/test/data/manifests/fedora-ostree-tarball.json
+++ b/test/data/manifests/fedora-ostree-tarball.json
@@ -29,6 +29,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
@@ -874,6 +875,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
diff --git a/test/data/stages/chmod/a.json b/test/data/stages/chmod/a.json
index b29a4a7d..936aa3fd 100644
--- a/test/data/stages/chmod/a.json
+++ b/test/data/stages/chmod/a.json
@@ -28,6 +28,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
@@ -349,6 +350,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
diff --git a/test/data/stages/chmod/b.json b/test/data/stages/chmod/b.json
index b74e724b..89b6cf72 100644
--- a/test/data/stages/chmod/b.json
+++ b/test/data/stages/chmod/b.json
@@ -28,6 +28,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
@@ -349,6 +350,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
diff --git a/test/data/stages/cron.script/a.json b/test/data/stages/cron.script/a.json
index 2a715991..6d7cd4b0 100644
--- a/test/data/stages/cron.script/a.json
+++ b/test/data/stages/cron.script/a.json
@@ -29,6 +29,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
@@ -572,6 +573,7 @@
         "sha256:d83ec824deff0ad1c0c82986a591e0994331d3c0d7308ac253ce68c755ccc57d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crontabs-1.11-24.20190603git.fc34.noarch.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
diff --git a/test/data/stages/cron.script/b.json b/test/data/stages/cron.script/b.json
index 56b987c2..7c3c83fc 100644
--- a/test/data/stages/cron.script/b.json
+++ b/test/data/stages/cron.script/b.json
@@ -29,6 +29,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
@@ -573,6 +574,7 @@
         "sha256:d83ec824deff0ad1c0c82986a591e0994331d3c0d7308ac253ce68c755ccc57d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crontabs-1.11-24.20190603git.fc34.noarch.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
diff --git a/test/data/stages/grub2/a.json b/test/data/stages/grub2/a.json
index 1697fa7a..37de6a29 100644
--- a/test/data/stages/grub2/a.json
+++ b/test/data/stages/grub2/a.json
@@ -29,6 +29,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
@@ -372,6 +373,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
diff --git a/test/data/stages/grub2/b.json b/test/data/stages/grub2/b.json
index 85dc1b17..bc3f6899 100644
--- a/test/data/stages/grub2/b.json
+++ b/test/data/stages/grub2/b.json
@@ -29,6 +29,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
@@ -394,6 +395,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
diff --git a/test/data/stages/gunzip/a.json b/test/data/stages/gunzip/a.json
index 0bc2bc3e..edcd93d0 100644
--- a/test/data/stages/gunzip/a.json
+++ b/test/data/stages/gunzip/a.json
@@ -28,6 +28,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
@@ -349,6 +350,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
diff --git a/test/data/stages/gunzip/b.json b/test/data/stages/gunzip/b.json
index 39af47e7..3b1d789d 100644
--- a/test/data/stages/gunzip/b.json
+++ b/test/data/stages/gunzip/b.json
@@ -28,6 +28,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
@@ -349,6 +350,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
diff --git a/test/data/stages/gzip/a.json b/test/data/stages/gzip/a.json
index 1697fa7a..37de6a29 100644
--- a/test/data/stages/gzip/a.json
+++ b/test/data/stages/gzip/a.json
@@ -29,6 +29,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
@@ -372,6 +373,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
diff --git a/test/data/stages/gzip/b.json b/test/data/stages/gzip/b.json
index 0bc2bc3e..edcd93d0 100644
--- a/test/data/stages/gzip/b.json
+++ b/test/data/stages/gzip/b.json
@@ -28,6 +28,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
@@ -349,6 +350,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
diff --git a/test/data/stages/mkdir/a.json b/test/data/stages/mkdir/a.json
index dbab961f..da8cbc91 100644
--- a/test/data/stages/mkdir/a.json
+++ b/test/data/stages/mkdir/a.json
@@ -29,6 +29,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
@@ -379,6 +380,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
diff --git a/test/data/stages/mkdir/b.json b/test/data/stages/mkdir/b.json
index 0830a072..336b4dbf 100644
--- a/test/data/stages/mkdir/b.json
+++ b/test/data/stages/mkdir/b.json
@@ -29,6 +29,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
@@ -387,6 +388,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
diff --git a/test/data/stages/nginx.conf/a.json b/test/data/stages/nginx.conf/a.json
index 326b124e..fd16c3e5 100644
--- a/test/data/stages/nginx.conf/a.json
+++ b/test/data/stages/nginx.conf/a.json
@@ -29,6 +29,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
@@ -564,6 +565,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
diff --git a/test/data/stages/nginx.conf/b.json b/test/data/stages/nginx.conf/b.json
index ed2efb30..636d2e9e 100644
--- a/test/data/stages/nginx.conf/b.json
+++ b/test/data/stages/nginx.conf/b.json
@@ -29,6 +29,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
@@ -576,6 +577,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
diff --git a/test/data/stages/parted/parted.json b/test/data/stages/parted/parted.json
index 50b8f3b2..5cd6649d 100644
--- a/test/data/stages/parted/parted.json
+++ b/test/data/stages/parted/parted.json
@@ -29,6 +29,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
@@ -415,6 +416,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
diff --git a/test/data/stages/tar/tar.json b/test/data/stages/tar/tar.json
index 4ea89b17..5bb954c9 100644
--- a/test/data/stages/tar/tar.json
+++ b/test/data/stages/tar/tar.json
@@ -28,6 +28,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
@@ -349,6 +350,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
diff --git a/test/data/stages/untar/a.json b/test/data/stages/untar/a.json
index 1697fa7a..37de6a29 100644
--- a/test/data/stages/untar/a.json
+++ b/test/data/stages/untar/a.json
@@ -29,6 +29,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
@@ -372,6 +373,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
diff --git a/test/data/stages/untar/b.json b/test/data/stages/untar/b.json
index 08c857c4..0f93247f 100644
--- a/test/data/stages/untar/b.json
+++ b/test/data/stages/untar/b.json
@@ -28,6 +28,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
@@ -349,6 +350,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
diff --git a/test/data/stages/xz/a.json b/test/data/stages/xz/a.json
index 1697fa7a..37de6a29 100644
--- a/test/data/stages/xz/a.json
+++ b/test/data/stages/xz/a.json
@@ -29,6 +29,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},
@@ -372,6 +373,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
diff --git a/test/data/stages/xz/b.json b/test/data/stages/xz/b.json
index f2157b4a..c2a06815 100644
--- a/test/data/stages/xz/b.json
+++ b/test/data/stages/xz/b.json
@@ -28,6 +28,7 @@
         "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cracklib-dicts-2.9.6-25.fc34.x86_64.rpm",
         "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-20210213-1.git5c710c0.fc34.noarch.rpm",
         "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/crypto-policies-scripts-20210213-1.git5c710c0.fc34.noarch.rpm",
+        "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-2.3.5-2.fc34.x86_64.rpm",
         "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cryptsetup-libs-2.3.5-2.fc34.x86_64.rpm",
         "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/curl-7.76.0-1.fc34.x86_64.rpm",
         "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/c/cyrus-sasl-lib-2.1.27-8.fc34.x86_64.rpm",
@@ -349,6 +350,7 @@
                 "sha256:8e84885c1a04e6387ce9788ba4dd585bc6d529970404bcf1f59c174f6606a51d": {},
                 "sha256:34441a7147eed87587bf5a6edbb6b495b3504db4b2438580dd353c97466b9534": {},
                 "sha256:809a330873f918264d495039d98b21d329d4c7c6ca9d597642e76049121c427e": {},
+                "sha256:cde2236a40f04af8c9a7352ac6e03f08ee077291627e1e4259a59bbf09368159": {},
                 "sha256:66e2b56a90b134fff1c2d8fa5b32b996a110345f8dcea434cfe4c4d823532472": {},
                 "sha256:05653cf4ebc4a25d6d13258bb49bc66ad735335a8db73eff8f1bfbf628aef19b": {},
                 "sha256:6ddbf894c0a7542ecc5a641bde06659c5a80cd954fcfd2f9e558885e81724d60": {},