diff --git a/api/src/services/aem.service.ts b/api/src/services/aem.service.ts
index 2996e608..d217a408 100644
--- a/api/src/services/aem.service.ts
+++ b/api/src/services/aem.service.ts
@@ -1363,8 +1363,11 @@ const createEntry = async ({
   const entryMapping: Record<string, string[]> = {};
   const usedEntryUids = new Set<string>();
 
-  // Process each entry file
-  for await (const fileName of read(entriesDir)) {
+  // Process each entry file. Sorted (not raw fs-readdir-recursive order) so that when two
+  // files legitimately collide on the same modelId+locale (see CMG-1112), which one "wins"
+  // and gets migrated is deterministic and reproducible across machines/runs, rather than
+  // depending on filesystem directory order.
+  for await (const fileName of [...read(entriesDir)].sort()) {
     const filePath = path.join(entriesDir, fileName);
     if (filePath?.startsWith?.(damPath)) {
       continue;
@@ -1373,23 +1376,6 @@ const createEntry = async ({
     if (typeof content === 'string') {
       const parseData = JSON.parse(content);
 
-      // AEM can export a page TEMPLATE's own structure/schema definition (e.g.
-      // /conf/.../settings/wcm/templates/<template>/structure[.html]) as a separate file
-      // alongside real pages that use that template — it isn't content, just the
-      // template's own component-allow-list. Exclude it outright rather than letting it
-      // compete with a real page for the same derived id (see CMG-1112): this removes the
-      // ambiguity entirely instead of leaving the outcome dependent on directory-walk order.
-      const repoPath: string | undefined = parseData?.dataLayer?.[parseData?.id]?.['repo:path'];
-      if (repoPath && /\/settings\/wcm\/templates\/[^/]+\/structure(\.html)?$/.test(repoPath)) {
-        await customLogger(
-          projectId,
-          destinationStackId,
-          'warn',
-          getLogMessage(srcFunc, `Skipped entry from "${fileName}": AEM template structure/schema definition, not real content (repo:path "${repoPath}").`, {})
-        );
-        continue;
-      }
-
       // Use the page model's stable "id" as the entry uid so uid-mapper keys
       // stay consistent across delta iterations; random uuid only as fallback.
       let modelId = typeof parseData?.id === 'string' && parseData.id.trim() !== ''
@@ -1430,9 +1416,6 @@ const createEntry = async ({
         continue;
       }
       const uid = modelId || uuidv4?.()?.replace?.(/-/g, '');
-      if (collisionKey) {
-        usedEntryUids.add(collisionKey);
-      }
       const title = getTitle(parseData);
       const isEFragment = isExperienceFragment(parseData);
       const templateUid = isEFragment?.isXF ? parseData?.title : parseData?.templateName ?? parseData?.templateType;
@@ -1446,6 +1429,14 @@ const createEntry = async ({
       data.publish_details = [];
 
       if (contentType?.contentstackUid && data && mappedLocale) {
+        // Reserve the collision key only now that an entry is actually being emitted — a
+        // file that reaches the "no content type matched" / "no mapped locale" branch below
+        // must NOT consume the key, or it would permanently block a sibling file (sharing
+        // the same modelId::locale) that could otherwise have produced the real entry,
+        // leaving zero entries instead of one.
+        if (collisionKey) {
+          usedEntryUids.add(collisionKey);
+        }
         const mappedValue = (keyMapper as Record<string, string> | undefined)?.[contentType.contentstackUid];
         const resolvedCtUid: string = 
           mappedValue && mappedValue !== '' 
diff --git a/package.json b/package.json
index c58180d2..4d8d9afc 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
   "overrides": {
     "axios": ">=1.16.0",
     "nth-check": ">=2.0.1",
-    "postcss": ">=8.5.10",
+    "postcss": ">=8.5.23",
     "serialize-javascript": ">=6.0.2",
     "@babel/runtime": ">=7.26.10",
     "lodash": "^4.18.1",
diff --git a/ui/package-lock.json b/ui/package-lock.json
index 0a9948f7..4dca08ed 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -24,8 +24,8 @@
         "react-dom": "^18.2.0",
         "react-final-form": "^6.5.9",
         "react-redux": "^9.1.2",
-        "react-router": "^7.15.0",
-        "react-router-dom": "^7.15.0",
+        "react-router": "^7.18.2",
+        "react-router-dom": "^7.18.2",
         "react-toastify": "npm:@contentstack/react-toastify@6.1.5",
         "redux-persist": "^6.0.0",
         "sass": "^1.68.0",
@@ -7533,15 +7533,16 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/nanoid": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
-      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "version": "3.3.18",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.18.tgz",
+      "integrity": "sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==",
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -7993,9 +7994,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.12",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.12.tgz",
-      "integrity": "sha512-W62t/Se6rA0Az3DfCL0AqJwXuKwBeYg6nOaIgzP+xZ7N5BFCI7DYi1qs6ygUYT6rvfi6t9k65UMLJC+PHZpDAA==",
+      "version": "8.5.26",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.26.tgz",
+      "integrity": "sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -8012,7 +8013,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.11",
+        "nanoid": "^3.3.17",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -8507,9 +8508,9 @@
       }
     },
     "node_modules/react-router": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.16.0.tgz",
-      "integrity": "sha512-wArC8lVyJb3+jM9OpDyW6hLCizACWkvQR/sSGqSs+o5uEXEtGlqdZ4v8hENR3Jad6i+LRkK93q/+bQAcvl6V1A==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.18.2.tgz",
+      "integrity": "sha512-aUVMjFm3GAPTTZL7oYr5E7ETiqfQCHRLH+B+5afnICvf0r7kkK4eR6SMuwbSTJw/7t+12khT/Kahij49fqOCIg==",
       "license": "MIT",
       "dependencies": {
         "cookie": "^1.0.1",
@@ -8529,12 +8530,12 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.16.0.tgz",
-      "integrity": "sha512-kMUAbimWB5FVbF4Bce4bJsiKJWLIUHq/mEG8+CFDnCSgltptBiG5nguducmsJeGKytlCvQud9Qhzpn49iduTlA==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.18.2.tgz",
+      "integrity": "sha512-AIKJ/jgGlFb3EbfCXk5Gzshiwt+l3mqbCrNjmEWMMjqQxNJ3svBa6bgzFyCC2Sw3RA0VWF1kg3uQf2OFhxb8hw==",
       "license": "MIT",
       "dependencies": {
-        "react-router": "7.16.0"
+        "react-router": "7.18.2"
       },
       "engines": {
         "node": ">=20.0.0"
diff --git a/ui/package.json b/ui/package.json
index 270486df..7675801f 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -19,8 +19,8 @@
     "react-dom": "^18.2.0",
     "react-final-form": "^6.5.9",
     "react-redux": "^9.1.2",
-    "react-router": "^7.15.0",
-    "react-router-dom": "^7.15.0",
+    "react-router": "^7.18.2",
+    "react-router-dom": "^7.18.2",
     "react-toastify": "npm:@contentstack/react-toastify@6.1.5",
     "redux-persist": "^6.0.0",
     "sass": "^1.68.0",
@@ -71,7 +71,8 @@
     "ws": ">=8.21.0",
     "esbuild": "^0.28.1",
     "fast-uri": ">=4.1.1",
-    "brace-expansion": ">=5.0.9"
+    "brace-expansion": ">=5.0.9",
+    "postcss": ">=8.5.23"
   },
   "eslintConfig": {
     "extends": [