diff --git a/test/data/manifests/fedora-boot.mpp.json b/test/data/manifests/fedora-boot.mpp.json
index 2d3154df..59beb83f 100644
--- a/test/data/manifests/fedora-boot.mpp.json
+++ b/test/data/manifests/fedora-boot.mpp.json
@@ -70,7 +70,7 @@
           "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
           "kernel_opts": "ro biosdevname=0 net.ifnames=0",
           "legacy": "i386-pc",
-          "saved_entry": {"mpp-format-string": "ffffffffffffffffffffffffffffffff-{rpms['stages']['kernel-core'][12:-4]}" }
+          "saved_entry": {"mpp-format-string": "ffffffffffffffffffffffffffffffff-{rpms['stages']['kernel-core'][12:]}" }
         }
       },
       {
diff --git a/tools/osbuild-mpp b/tools/osbuild-mpp
index b169f411..3fb283ca 100755
--- a/tools/osbuild-mpp
+++ b/tools/osbuild-mpp
@@ -282,6 +282,7 @@ class DepSolver:
             pkg = {
                 "checksum": f"{checksum_type}:{checksum_hex}",
                 "name": tsi.pkg.name,
+                "nevra": str(tsi.pkg),
                 "url": url,
             }
 
@@ -372,7 +373,7 @@ class ManifestFile:
         for dep in deps:
             name, checksum, url = dep["name"], dep["checksum"], dep["url"]
 
-            pkginfos[name] = urllib.parse.urlparse(url).path.rsplit("/", 1)[1]
+            pkginfos[name] = dep["nevra"]
 
             secretes = dep.get("secrets")
             if secretes: