diff --git a/assets/chains.json b/assets/chains.json
index 357701d..8e65f26 100644
--- a/assets/chains.json
+++ b/assets/chains.json
@@ -1001,11 +1001,11 @@
       "name": "ronin",
       "averageBlocktimeHint": 3000,
       "isLegacy": false,
-      "supportsShanghai": false,
+      "supportsShanghai": true,
       "isTestnet": false,
       "nativeCurrencySymbol": "RON",
-      "etherscanApiUrl": "https://skynet-api.roninchain.com/ronin",
-      "etherscanBaseUrl": "https://app.roninchain.com",
+      "etherscanApiUrl": "https://explorer.roninchain.com/api/v2",
+      "etherscanBaseUrl": "https://explorer.roninchain.com",
       "etherscanApiKeyName": null
     },
     "2201": {
@@ -1973,10 +1973,10 @@
       "name": "ronin-testnet",
       "averageBlocktimeHint": 3000,
       "isLegacy": false,
-      "supportsShanghai": false,
+      "supportsShanghai": true,
       "isTestnet": true,
       "nativeCurrencySymbol": "RON",
-      "etherscanApiUrl": "https://api-gateway.skymavis.com/rpc/testnet",
+      "etherscanApiUrl": "https://explorer-saigon-testnet-cc58e966ql.t.conduit.xyz/api/v2",
       "etherscanBaseUrl": "https://saigon-explorer.roninchain.com",
       "etherscanApiKeyName": null
     },
diff --git a/registry/manual.json b/registry/manual.json
index b55ae44..23ff5b3 100644
--- a/registry/manual.json
+++ b/registry/manual.json
@@ -1341,10 +1341,14 @@
       "chainId": 2020,
       "internalId": "Ronin",
       "name": "ronin",
+      "supportsShanghai": true,
       "averageBlocktimeHint": 3000,
-      "etherscanApiUrl": "https://skynet-api.roninchain.com/ronin",
+      "etherscanApiUrl": "https://explorer.roninchain.com/api/v2",
       "nativeCurrencySymbol": "RON",
-      "etherscanBaseUrl": "https://app.roninchain.com"
+      "etherscanBaseUrl": "https://explorer.roninchain.com",
+      "tags": [
+        "optimism"
+      ]
     },
     {
       "chainId": 202601,
@@ -1352,9 +1356,13 @@
       "name": "ronin-testnet",
       "averageBlocktimeHint": 3000,
       "isTestnet": true,
-      "etherscanApiUrl": "https://api-gateway.skymavis.com/rpc/testnet",
+      "supportsShanghai": true,
+      "etherscanApiUrl": "https://explorer-saigon-testnet-cc58e966ql.t.conduit.xyz/api/v2",
       "nativeCurrencySymbol": "RON",
-      "etherscanBaseUrl": "https://saigon-explorer.roninchain.com"
+      "etherscanBaseUrl": "https://saigon-explorer.roninchain.com",
+      "tags": [
+        "optimism"
+      ]
     },
     {
       "chainId": 723487,
diff --git a/src/generated/named.rs b/src/generated/named.rs
index 0fc9e5f..865fef5 100644
--- a/src/generated/named.rs
+++ b/src/generated/named.rs
@@ -1459,7 +1459,7 @@ static ETHERSCAN_API_URLS: [&str; 161] = [
     "https://blockscout-api.injective.network/api",
     "https://soneium.blockscout.com/api",
     "https://soneium-minato.blockscout.com/api",
-    "https://skynet-api.roninchain.com/ronin",
+    "https://explorer.roninchain.com/api/v2",
     "https://api.etherscan.io/v2/api?chainid=2201",
     "https://api.etherscan.io/v2/api?chainid=2522",
     "https://api.etherscan.io/v2/api?chainid=2741",
@@ -1525,7 +1525,7 @@ static ETHERSCAN_API_URLS: [&str; 161] = [
     "https://api.etherscan.io/v2/api?chainid=167000",
     "https://api.etherscan.io/v2/api?chainid=167009",
     "https://api.btrscan.com/scan/api",
-    "https://api-gateway.skymavis.com/rpc/testnet",
+    "https://explorer-saigon-testnet-cc58e966ql.t.conduit.xyz/api/v2",
     "https://api.calibration.node.glif.io/rpc/v1",
     "https://api.etherscan.io/v2/api?chainid=421614",
     "https://sepolia-explorer.syndr.com/api",
@@ -1623,7 +1623,7 @@ static ETHERSCAN_BASE_URLS: [&str; 164] = [
     "https://blockscout.injective.network",
     "https://soneium.blockscout.com",
     "https://soneium-minato.blockscout.com",
-    "https://app.roninchain.com",
+    "https://explorer.roninchain.com",
     "https://testnet.stablescan.xyz",
     "https://holesky.fraxscan.com",
     "https://abscan.org",
@@ -1897,7 +1897,7 @@ static CHAIN_DATA: [ChainData; 201] = {
         d(80, 29, 60, 60, 1, 700, S, W),
         d(81, N, 61, 61, 1, 2000, S | O, W),
         d(82, N, 62, 62, 1, 2000, S | T | O, W),
-        d(83, 34, 63, 63, N, 3000, 0, W),
+        d(83, 34, 63, 63, N, 3000, S | O, W),
         d(84, 22, 64, 64, 0, 700, S | T, W),
         d(85, N, 65, 65, 0, 2000, S | T | O, W),
         d(86, 0, 66, 66, 0, 1000, X, 15),
@@ -1978,7 +1978,7 @@ static CHAIN_DATA: [ChainData; 201] = {
         d(161, 0, 126, 129, 0, 12000, S, 31),
         d(162, 0, 127, 130, 0, 12000, S | T, W),
         d(163, 35, 128, 131, 11, 3000, 0, 32),
-        d(164, 34, 129, 132, N, 3000, T, W),
+        d(164, 34, 129, 132, N, 3000, S | T | O, W),
         d(165, N, 130, 133, N, 30000, T, W),
         d(166, N, N, N, 0, 260, T | A, W),
         d(167, N, N, N, 0, 260, T | A, W),