diff --git a/generate-json.js b/generate-json.js
index 841682feb7..8189621f30 100644
--- a/generate-json.js
+++ b/generate-json.js
@@ -1,20 +1,22 @@
-import {generateChainData} from "./utils/fetch.js"
-import {writeFileSync} from "fs"
+const { writeFileSync } = require("fs");
 
+async function writeRpcsJson() {
+  // Use dynamic import to load ES6 module
+  const fetchModule = await import("./utils/fetch.js");
+  const { generateChainData } = fetchModule;
 
-async function writeRpcsJson(){
-    const rpcs = await generateChainData()
-    
-    const cleanedRpcs = rpcs.map(chain => {
-        if (chain.rpc) {
-            chain.rpc = chain.rpc.map(rpcEntry => {
-                const { trackingDetails, ...rest } = rpcEntry
-                return rest
-            })
-        }
-        return chain
-    })
-    
-    writeFileSync("out/rpcs.json", JSON.stringify(cleanedRpcs, null, 2))
+  const rpcs = await generateChainData();
+
+  const cleanedRpcs = rpcs.map((chain) => {
+    if (chain.rpc) {
+      chain.rpc = chain.rpc.map((rpcEntry) => {
+        const { trackingDetails, ...rest } = rpcEntry;
+        return rest;
+      });
+    }
+    return chain;
+  });
+
+  writeFileSync("out/rpcs.json", JSON.stringify(cleanedRpcs, null, 2));
 }
 writeRpcsJson();
\ No newline at end of file
diff --git a/generate-sitemap.js b/generate-sitemap.js
index bf573f3deb..5849502ec2 100644
--- a/generate-sitemap.js
+++ b/generate-sitemap.js
@@ -1,8 +1,6 @@
-import chainIds from "./constants/chainIds.js";
-import fs from "fs";
-import { generateChainData } from "./utils/fetch.js";
+const fs = require("fs");
 
-function generateSiteMap(chains) {
+async function generateSiteMap(chains, chainIds) {
   return `<?xml version="1.0" encoding="UTF-8"?>
    <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
      <!--We manually set the two URLs we know already-->
@@ -68,10 +66,16 @@ function generateSiteMap(chains) {
 }
 
 async function writeSiteMap() {
+  // Use dynamic import to load ES6 modules
+  const chainIdsModule = await import("./constants/chainIds.js");
+  const chainIds = chainIdsModule.default;
+  const fetchModule = await import("./utils/fetch.js");
+  const { generateChainData } = fetchModule;
+
   const chains = await generateChainData();
 
   // We generate the XML sitemap with the chains data
-  const sitemap = generateSiteMap(chains);
+  const sitemap = await generateSiteMap(chains, chainIds);
 
   // We write the sitemap to the next export out folder
   fs.writeFileSync("out/sitemap.xml", sitemap);
diff --git a/hooks/useFilteredChains.jsx b/hooks/useFilteredChains.jsx
index 0a9853bf85..f3bcdab887 100644
--- a/hooks/useFilteredChains.jsx
+++ b/hooks/useFilteredChains.jsx
@@ -1,25 +1,12 @@
 import React, { useMemo } from 'react';
 import { useRouter } from 'next/router';
-
-const TESTNET_KEYWORDS = ['test', 'devnet'];
+import { isTestnet } from '../utils';
 
 const createSearchMatcher = (searchTerm) => {
   const normalized = searchTerm.toLowerCase();
   return (value) => value?.toLowerCase().includes(normalized);
 };
 
-const isTestnet = (chain) => {
-  const lowercaseValues = [
-    chain.name,
-    chain.title,
-    chain.network
-  ].map((val) => val?.toLowerCase());
-
-  return TESTNET_KEYWORDS.some((keyword) => 
-    lowercaseValues.some((val) => val?.includes(keyword))
-  );
-};
-
 const matchesSearchTerm = (chain, matcher) => {
   return (
     matcher(chain.chain) ||
diff --git a/package.json b/package.json
index 10db3c8a16..81fbd1bc5f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,6 @@
 {
   "name": "chainlist",
   "version": "1.0.0",
-  "private": true,
   "scripts": {
     "dev": "next dev",
     "build": "./scripts/build.sh",
diff --git a/pages/index.js b/pages/index.js
index 00677487a3..0b886e92f2 100755
--- a/pages/index.js
+++ b/pages/index.js
@@ -46,7 +46,7 @@ function Home({ chains }) {
             })}
           </div>
         </React.Suspense>
-        {end - 1 < finalChains.length ? (
+        {end < finalChains.length ? (
           <button
             onClick={() => setEnd(finalChains.length)}
             className="w-full border dark:border-[#171717] border-[#EAEAEA] px-4 py-2 rounded-[50px] mb-auto text-white bg-[#2F80ED] mx-auto"
diff --git a/scripts/build.sh b/scripts/build.sh
index 85ddf34550..fb4d310bc5 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -78,6 +78,22 @@ fi
 # find the parent directory name of the file _buildManifest.js within the .next/static directory
 BUILD_ID=$(find .next -name _buildManifest.js | sed 's/\/_buildManifest.js//g' | sed 's/\.next\/static\///g')
 
+# Only run post-export if the build succeeded
+if [ $BUILD_STATUS -eq 0 ]; then
+  ./scripts/post-export.sh
+  POST_EXPORT_STATUS=$?
+
+  # If post-export failed, always exit with 1
+  if [ $POST_EXPORT_STATUS -ne 0 ]; then
+    echo ""
+    echo "⚠️  Post-export script failed with status $POST_EXPORT_STATUS"
+    BUILD_STATUS=1
+  fi
+else
+  echo ""
+  echo "⚠️  Build failed, skipping post-export script"
+fi
+
 echo ""
 echo "======================="
 if [ $BUILD_STATUS -eq 0 ]; then
@@ -98,7 +114,5 @@ echo ""
 
 node ./scripts/build-msg.js $BUILD_STATUS "$BUILD_TIME_STR" "$START_TIME" "$BUILD_ID" "$COMMIT_COMMENT" "$COMMIT_AUTHOR" "$COMMIT_HASH"
 
-./scripts/post-export.sh
-
 # exit with the build status
 exit $BUILD_STATUS
\ No newline at end of file
diff --git a/scripts/post-export.sh b/scripts/post-export.sh
index d6c010c72a..aef750457d 100755
--- a/scripts/post-export.sh
+++ b/scripts/post-export.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
+set -e
 
-sed -i '4 i "type": "module",' package.json
 node generate-sitemap.js
 node generate-json.js
-sed -i "4 d" package.json
+
 rm out/404.html
 mv out/error.html out/404.html
 cp serve.json out/serve.json
diff --git a/utils/fetch.js b/utils/fetch.js
index 684adc6a42..bf172d7f33 100644
--- a/utils/fetch.js
+++ b/utils/fetch.js
@@ -2,18 +2,19 @@ import allExtraRpcs from "../constants/extraRpcs.js";
 import chainIds from "../constants/chainIds.js";
 import fetch from "node-fetch";
 import { overwrittenChains } from "../constants/additionalChainRegistry/list.js";
+import { isTestnet } from "./index.js";
 
 export const fetcher = (...args) => fetch(...args).then((res) => res.json());
 
-const cache = {}
+const cache = {};
 export const fetchWithCache = async (url) => {
-  if(cache[url]){
-    return cache[url]
+  if (cache[url]) {
+    return cache[url];
   }
   const data = await fetch(url).then((res) => res.json());
-  cache[url] = data
-  return data
-}
+  cache[url] = data;
+  return data;
+};
 
 function removeEndingSlashObject(rpc) {
   if (typeof rpc === "string") {
@@ -100,10 +101,55 @@ export function arrayMove(array, fromIndex, toIndex) {
   return newArray;
 }
 
+function getBaseName(name) {
+  if (!name) return "";
+
+  return name
+    .replace(/\s+(Sepolia|Goerli|Testnet|Mumbai|Fuji|Amoy|Hoodi)(\s+.*)?$/i, "")
+    .replace(/\s+Test\s+Network$/i, "")
+    .replace(/\s+Mainnet$/i, "")
+    .replace(/\s+(One|C-Chain)$/i, "")
+    .trim();
+}
+
+function handleTestnets(activeChains) {
+  const parentChainTvls = {};
+  
+  // map testnets to their parent's TVL
+  activeChains.forEach((chain) => {
+    if (chain.tvl && !isTestnet(chain)) {
+      const baseName = getBaseName(chain.name);
+      if (!parentChainTvls[baseName] || parentChainTvls[baseName] < chain.tvl) {
+        parentChainTvls[baseName] = chain.tvl;
+      }
+    }
+  });
+
+  return activeChains.map((chain) => {
+    const isTestnetChain = isTestnet(chain);
+
+    if (isTestnetChain && !chain.tvl) {
+      const baseName = getBaseName(chain.name);
+      const parentTvl = parentChainTvls[baseName] || 0;
+
+      return {
+        ...chain,
+        isTestnet: true,
+        tvl: parentTvl,
+      };
+    }
+
+    return {
+      ...chain,
+      isTestnet: isTestnetChain,
+    };
+  });
+}
+
 export async function generateChainData() {
   const [chains, chainTvls] = await Promise.all([
     fetchWithCache("https://chainid.network/chains.json"),
-    fetchWithCache("https://api.llama.fi/chains")
+    fetchWithCache("https://api.llama.fi/chains"),
   ]);
 
   const overwrittenIds = overwrittenChains.reduce((acc, curr) => {
@@ -111,13 +157,23 @@ export async function generateChainData() {
     return acc;
   }, {});
 
-  const sortedChains = chains
+  const activeChains = chains
     .filter((c) => c.status !== "deprecated" && !overwrittenIds[c.chainId])
     .concat(overwrittenChains)
-    .map((chain) => populateChain(chain, chainTvls))
-    .sort((a, b) => {
-      return (b.tvl ?? 0) - (a.tvl ?? 0);
-    });
+    .map((chain) => populateChain(chain, chainTvls));
+
+  const chainsWithTestnetTvls = handleTestnets(activeChains);
+
+  const sortedChains = chainsWithTestnetTvls.sort((a, b) => {
+    // First: separate mainnets and testnets (mainnets first)
+    if (!a.isTestnet && b.isTestnet) return -1;
+    if (a.isTestnet && !b.isTestnet) return 1;
+
+    // Second: within same type (mainnet or testnet), sort by TVL (descending)
+    const aTvl = a.tvl ?? 0;
+    const bTvl = b.tvl ?? 0;
+    return bTvl - aTvl;
+  });
 
   return sortedChains;
 }
diff --git a/utils/index.js b/utils/index.js
index e32ba5d238..e6e76d6bb3 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -1,6 +1,6 @@
 import { useState, useEffect } from "react";
-import en from "../translations/en.json";
-import zh from "../translations/zh.json";
+import en from "../translations/en.json" with { type: "json" };
+import zh from "../translations/zh.json" with { type: "json" };
 
 export function formatCurrency(amount, decimals = 2) {
   if (!isNaN(amount)) {
@@ -94,3 +94,17 @@ export const notTranslation =
         return en[ns][key];
     }
   };
+
+const TESTNET_KEYWORDS = ['test', 'devnet', 'sepolia', 'goerli', 'mumbai', 'fuji', 'amoy', 'hoodi'];
+
+export const isTestnet = (chain) => {
+  const lowercaseValues = [
+    chain.name,
+    chain.title,
+    chain.network
+  ].map((val) => val?.toLowerCase());
+
+  return TESTNET_KEYWORDS.some((keyword) =>
+    lowercaseValues.some((val) => val?.includes(keyword))
+  );
+};