diff --git a/scripts/deploy.mjs b/scripts/deploy.mjs
index b80f29c..7f8768a 100644
--- a/scripts/deploy.mjs
+++ b/scripts/deploy.mjs
@@ -248,7 +248,7 @@ function findManifestIdInTags(tagsValue) {
     if (!tagObject) continue;
     const name = asString(tagObject.name) ?? asString(tagObject.Name);
     const value = asString(tagObject.value) ?? asString(tagObject.Value);
-    if (name === "LatestManifestId" && value) return value;
+    if ((name === "LatestManifestId" || name === "ManifestId") && value) return value;
   }
   return "";
 }
@@ -263,7 +263,7 @@ function extractManifestId(payload) {
     for (const message of Object.values(outbox)) {
       const messageObject = asObject(message);
       if (!messageObject) continue;
-      const direct = asString(messageObject.LatestManifestId);
+      const direct = asString(messageObject.LatestManifestId) ?? asString(messageObject.ManifestId);
       if (direct) return direct;
       const tagged = findManifestIdInTags(messageObject.Tags);
       if (tagged) return tagged;
diff --git a/src/lib.ts b/src/lib.ts
index 836088f..c66e43e 100644
--- a/src/lib.ts
+++ b/src/lib.ts
@@ -41,7 +41,7 @@ const findManifestIdInTags = (tagsValue: unknown): string | null => {
     if (!tagObject) continue;
     const name = asString(tagObject.name) ?? asString(tagObject.Name);
     const value = asString(tagObject.value) ?? asString(tagObject.Value);
-    if (name === "LatestManifestId" && value) return value;
+    if ((name === "LatestManifestId" || name === "ManifestId") && value) return value;
   }
   return null;
 };
@@ -56,7 +56,7 @@ const extractManifestId = (payload: unknown): string | null => {
     for (const message of Object.values(outbox)) {
       const messageObject = asObject(message);
       if (!messageObject) continue;
-      const direct = asString(messageObject.LatestManifestId);
+      const direct = asString(messageObject.LatestManifestId) ?? asString(messageObject.ManifestId);
       if (direct) return direct;
       const tagged = findManifestIdInTags(messageObject.Tags);
       if (tagged) return tagged;