diff --git a/docs/rpc_nodes.md b/docs/rpc_nodes.md
index 343ac4fa70..f28a031df3 100644
--- a/docs/rpc_nodes.md
+++ b/docs/rpc_nodes.md
@@ -23,21 +23,23 @@ values={[
 
 | Provider         | Net          | URL                                      | Header                                                                          |
 |------------------|--------------|------------------------------------------|---------------------------------------------------------------------------------|
-| ECAD Labs        | Mainnet      | https://mainnet.tezos.ecadinfra.com      | [Check](https://mainnet.tezos.ecadinfra.com/chains/main/blocks/head/header)     |
-| ECAD Labs        | Ghostnet     | https://ghostnet.tezos.ecadinfra.com     | [Check](https://ghostnet.tezos.ecadinfra.com/chains/main/blocks/head/header)    |
+| ECAD Infra       | Mainnet      | https://mainnet.tezos.ecadinfra.com      | [Check](https://mainnet.tezos.ecadinfra.com/chains/main/blocks/head/header)     |
+| ECAD Infra       | Ghostnet     | https://ghostnet.tezos.ecadinfra.com     | [Check](https://ghostnet.tezos.ecadinfra.com/chains/main/blocks/head/header)    |
 | SmartPy          | Mainnet      | https://mainnet.smartpy.io               | [Check](https://mainnet.smartpy.io/chains/main/blocks/head/header)              |
 | SmartPy          | Ghostnet     | https://ghostnet.smartpy.io              | [Check](https://ghostnet.smartpy.io/chains/main/blocks/head/header)             |
 | Tezos Foundation | Mainnet      | https://rpc.tzbeta.net/                  | [Check](https://rpc.tzbeta.net/chains/main/blocks/head/header)                  |
 | Tezos Foundation | Ghostnet     | https://rpc.ghostnet.teztnets.com/       | [Check](https://rpc.ghostnet.teztnets.com/chains/main/blocks/head/header)       |
 | Tezos Foundation | Parisnet     | https://rpc.pariscnet.teztnets.com/      | [Check](https://rpc.pariscnet.teztnets.com/chains/main/blocks/head/header)      |
 | Tezos Foundation | Quebecnet    | https://rpc.quebecnet.teztnets.com/      | [Check](https://rpc.quebecnet.teztnets.com/chains/main/blocks/head/header)      |
-| Tzkt             | Mainnet      | https://rpc.tzkt.io/mainnet/             | [Check](https://rpc.tzkt.io/mainnet/chains/main/blocks/head/header)             |
-| Tzkt             | Ghostnet     | https://rpc.tzkt.io/ghostnet             | [Check](https://rpc.tzkt.io/ghostnet/chains/main/blocks/head/header)            |
-| Tzkt             | Parisnet     | https://rpc.tzkt.io/parisnet             | [Check](https://rpc.tzkt.io/parisnet/chains/main/blocks/head/header)            |
-| Tzkt             | Quebecnet    | https://rpc.tzkt.io/quebecnet            | [Check](https://rpc.tzkt.io/quebecnet/chains/main/blocks/head/header)           |
+| TzKT             | Mainnet      | https://rpc.tzkt.io/mainnet/             | [Check](https://rpc.tzkt.io/mainnet/chains/main/blocks/head/header)             |
+| TzKT             | Ghostnet     | https://rpc.tzkt.io/ghostnet             | [Check](https://rpc.tzkt.io/ghostnet/chains/main/blocks/head/header)            |
+| TzKT             | Parisnet     | https://rpc.tzkt.io/parisnet             | [Check](https://rpc.tzkt.io/parisnet/chains/main/blocks/head/header)            |
+| TzKT             | Quebecnet    | https://rpc.tzkt.io/quebecnet            | [Check](https://rpc.tzkt.io/quebecnet/chains/main/blocks/head/header)           |
+
+*- You can also find a machine readable list in [rpc_nodes.json](https://taquito.io/docs/rpc_nodes.json).*
+
+*- If you are aware of a public node missing from our list or our information is inaccurate, please help us by submitting an issue or pull request on our GitHub page.*
 
-https://api.mainnet.tzkt.io/
-*If you are aware of a public node missing from our list or our information is inaccurate, please help us by submitting an issue or pull request on our GitHub page.*
 </TabItem>
   <TabItem value="commercialNodes">
 
diff --git a/website/static/docs/rpc_nodes.json b/website/static/docs/rpc_nodes.json
new file mode 100644
index 0000000000..56e7175e13
--- /dev/null
+++ b/website/static/docs/rpc_nodes.json
@@ -0,0 +1,91 @@
+{
+  "providers": [
+    {
+      "name": "ECAD Infra",
+      "website": "https://www.ecadinfra.com/",
+      "status_page": ""
+    },
+    {
+      "name": "SmartPy",
+      "website": "https://smartpy.io",
+      "status_page": ""
+    },
+    {
+      "name": "Tezos Foundation",
+      "website": "https://tezos.foundation",
+      "status_page": ""
+    },
+    {
+      "name": "TzKT",
+      "website": "https://tzkt.io",
+      "status_page": ""
+    }
+  ],
+  "rpc_endpoints": [
+    {
+      "net": "mainnet",
+      "url": "https://mainnet.tezos.ecadinfra.com",
+      "provider": "ECAD Infra"
+    },
+    {
+      "net": "ghostnet",
+      "url": "https://ghostnet.tezos.ecadinfra.com",
+      "provider": "ECAD Infra"
+    },
+    {
+      "net": "mainnet",
+      "url": "https://mainnet.smartpy.io",
+      "provider": "SmartPy"
+    },
+    {
+      "net": "ghostnet",
+      "url": "https://ghostnet.smartpy.io",
+      "provider": "SmartPy"
+    },
+    {
+      "net": "mainnet",
+      "url": "https://rpc.tzbeta.net/",
+      "provider": "Tezos Foundation"
+    },
+    {
+      "net": "ghostnet",
+      "url": "https://rpc.ghostnet.teztnets.com/",
+      "provider": "Tezos Foundation"
+    },
+    {
+      "net": "parisnet",
+      "url": "https://rpc.pariscnet.teztnets.com/",
+      "provider": "Tezos Foundation"
+    },
+    {
+      "net": "quebecnet",
+      "url": "https://rpc.quebecnet.teztnets.com/",
+      "provider": "Tezos Foundation"
+    },
+    {
+      "net": "mainnet",
+      "url": "https://rpc.tzkt.io/mainnet/",
+      "provider": "TzKT"
+    },
+    {
+      "net": "ghostnet",
+      "url": "https://rpc.tzkt.io/ghostnet",
+      "provider": "TzKT"
+    },
+    {
+      "net": "parisnet",
+      "url": "https://rpc.tzkt.io/parisnet",
+      "provider": "TzKT"
+    },
+    {
+      "net": "quebecnet",
+      "url": "https://rpc.tzkt.io/quebecnet",
+      "provider": "TzKT"
+    },
+    {
+      "net": "mainnet",
+      "url": "https://api.mainnet.tzkt.io/",
+      "provider": "TzKT"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/website/versioned_docs/version-21.0.0/rpc_nodes.md b/website/versioned_docs/version-21.0.0/rpc_nodes.md
index 343ac4fa70..f28a031df3 100644
--- a/website/versioned_docs/version-21.0.0/rpc_nodes.md
+++ b/website/versioned_docs/version-21.0.0/rpc_nodes.md
@@ -23,21 +23,23 @@ values={[
 
 | Provider         | Net          | URL                                      | Header                                                                          |
 |------------------|--------------|------------------------------------------|---------------------------------------------------------------------------------|
-| ECAD Labs        | Mainnet      | https://mainnet.tezos.ecadinfra.com      | [Check](https://mainnet.tezos.ecadinfra.com/chains/main/blocks/head/header)     |
-| ECAD Labs        | Ghostnet     | https://ghostnet.tezos.ecadinfra.com     | [Check](https://ghostnet.tezos.ecadinfra.com/chains/main/blocks/head/header)    |
+| ECAD Infra       | Mainnet      | https://mainnet.tezos.ecadinfra.com      | [Check](https://mainnet.tezos.ecadinfra.com/chains/main/blocks/head/header)     |
+| ECAD Infra       | Ghostnet     | https://ghostnet.tezos.ecadinfra.com     | [Check](https://ghostnet.tezos.ecadinfra.com/chains/main/blocks/head/header)    |
 | SmartPy          | Mainnet      | https://mainnet.smartpy.io               | [Check](https://mainnet.smartpy.io/chains/main/blocks/head/header)              |
 | SmartPy          | Ghostnet     | https://ghostnet.smartpy.io              | [Check](https://ghostnet.smartpy.io/chains/main/blocks/head/header)             |
 | Tezos Foundation | Mainnet      | https://rpc.tzbeta.net/                  | [Check](https://rpc.tzbeta.net/chains/main/blocks/head/header)                  |
 | Tezos Foundation | Ghostnet     | https://rpc.ghostnet.teztnets.com/       | [Check](https://rpc.ghostnet.teztnets.com/chains/main/blocks/head/header)       |
 | Tezos Foundation | Parisnet     | https://rpc.pariscnet.teztnets.com/      | [Check](https://rpc.pariscnet.teztnets.com/chains/main/blocks/head/header)      |
 | Tezos Foundation | Quebecnet    | https://rpc.quebecnet.teztnets.com/      | [Check](https://rpc.quebecnet.teztnets.com/chains/main/blocks/head/header)      |
-| Tzkt             | Mainnet      | https://rpc.tzkt.io/mainnet/             | [Check](https://rpc.tzkt.io/mainnet/chains/main/blocks/head/header)             |
-| Tzkt             | Ghostnet     | https://rpc.tzkt.io/ghostnet             | [Check](https://rpc.tzkt.io/ghostnet/chains/main/blocks/head/header)            |
-| Tzkt             | Parisnet     | https://rpc.tzkt.io/parisnet             | [Check](https://rpc.tzkt.io/parisnet/chains/main/blocks/head/header)            |
-| Tzkt             | Quebecnet    | https://rpc.tzkt.io/quebecnet            | [Check](https://rpc.tzkt.io/quebecnet/chains/main/blocks/head/header)           |
+| TzKT             | Mainnet      | https://rpc.tzkt.io/mainnet/             | [Check](https://rpc.tzkt.io/mainnet/chains/main/blocks/head/header)             |
+| TzKT             | Ghostnet     | https://rpc.tzkt.io/ghostnet             | [Check](https://rpc.tzkt.io/ghostnet/chains/main/blocks/head/header)            |
+| TzKT             | Parisnet     | https://rpc.tzkt.io/parisnet             | [Check](https://rpc.tzkt.io/parisnet/chains/main/blocks/head/header)            |
+| TzKT             | Quebecnet    | https://rpc.tzkt.io/quebecnet            | [Check](https://rpc.tzkt.io/quebecnet/chains/main/blocks/head/header)           |
+
+*- You can also find a machine readable list in [rpc_nodes.json](https://taquito.io/docs/rpc_nodes.json).*
+
+*- If you are aware of a public node missing from our list or our information is inaccurate, please help us by submitting an issue or pull request on our GitHub page.*
 
-https://api.mainnet.tzkt.io/
-*If you are aware of a public node missing from our list or our information is inaccurate, please help us by submitting an issue or pull request on our GitHub page.*
 </TabItem>
   <TabItem value="commercialNodes">