diff --git a/packages/docs/pages/networks/_meta.json b/packages/docs/pages/networks/_meta.json
index 9f12969a..7918e4f1 100644
--- a/packages/docs/pages/networks/_meta.json
+++ b/packages/docs/pages/networks/_meta.json
@@ -1,5 +1,6 @@
 {
   "mainnets": "Mainnets",
   "testnets": "Testnets",
+  "services": "Public infra and services",
   "starting-network": "Starting a network"
 }
\ No newline at end of file
diff --git a/packages/docs/pages/networks/mainnets.mdx b/packages/docs/pages/networks/mainnets.mdx
index 96b73efc..2633e599 100644
--- a/packages/docs/pages/networks/mainnets.mdx
+++ b/packages/docs/pages/networks/mainnets.mdx
@@ -37,9 +37,4 @@ The following table describes the hard-forks and the corresponding software vers
 
 ### Services and infrastructure
 
-There are several places to discover available infra and services with APIs for accessing Namada data.
-
-The primary knowledge base is on [namada.community](https://namada.community/infrastructure-services), which pulls its data from the [namada-ecosystem github repo](https://github.com/Luminara-Hub/namada-ecosystem/tree/main/user-and-dev-tools/mainnet).
-This is an actively maintained resource for finding RPC nodes to connect to, active IBC relayers, Namadillo front-end instances, active indexers, state snapshot providers and more.
-
-Block explorers and Namadillo instances can also be found on https://namada.net/apps.
+Please see [here](./services.mdx).
diff --git a/packages/docs/pages/networks/services.mdx b/packages/docs/pages/networks/services.mdx
new file mode 100644
index 00000000..53c6c3fb
--- /dev/null
+++ b/packages/docs/pages/networks/services.mdx
@@ -0,0 +1,36 @@
+# Services and Infrastructure
+The Namada mainnet and testnet are supplemented by a variety of services and infrastructure that improve the UX of interacting with the blockchain.
+These include:
+- RPC: a node used to query the blockchain directly.
+- Namada Indexer: a filtered database off-chain that stores information in useful forms for common queries.
+- MASP Indexer: a database off-chain for shielded pool transactions that allows for optimized syncing that is needed to query or transact in the shieled pool.
+- Namadillo: a front-end user interface for transacting on-chain
+- Block Explorer: a web interface for discovering information about the current state of the blockchain
+
+### Accessing services
+Many teams contribute to the support and maintenance of these services, including Heliax, which operates production-grade instances of each of these services.
+The Heliax public endpoints for infra are:
+- Namadillo
+    - Mainnet: https://namadillo.app
+    - Testnet: https://testnet.namadillo.app
+    - Docs [here](../users/namadillo/overview.mdx)
+- Block Explorer
+    - Mainnet: https://namada.world
+    - Testnet: https://testnet.namada.world
+- RPC
+    - Mainnet: https://rpc.mainnet.siuuu.click
+    - Testnet: https://rpc.testnet.siuuu.click
+- Namada Indexer
+    - Mainnet: https://indexer.mainnet.siuuu.click
+    - Testnet: https://indexer.testnet.siuuu.click
+    - API: https://namada-net.github.io/namada-indexer/#/
+- MASP Indexer
+    - Mainnet: https://masp.mainnet.siuuu.click
+    - Testnet: https://masp.testnet.siuuu.click
+    - API: https://namada-net.github.io/namada-masp-indexer/#/
+
+Furthermore, there are several places to discover other community-run infra and services.
+The current primary base is on [namada.community](https://namada.community/infrastructure-services), which pulls its data from the [namada-ecosystem github repo](https://github.com/Luminara-Hub/namada-ecosystem/tree/main/user-and-dev-tools).
+This is an actively maintained resource for finding active IBC relayers, RPC providers, Namadillo front-end instances, active indexers, state snapshot providers and more.
+
+Other block explorers and Namadillo instances can also be found on https://namada.net/apps as well.
\ No newline at end of file
diff --git a/packages/docs/pages/networks/testnets.mdx b/packages/docs/pages/networks/testnets.mdx
index 3da66636..c8c182a7 100644
--- a/packages/docs/pages/networks/testnets.mdx
+++ b/packages/docs/pages/networks/testnets.mdx
@@ -16,4 +16,4 @@ This testnet has been shut down and is no longer running. Please use Housefire t
 
 ### Services and infrastructure
 
-The best way to discover infrastructure and services publicly available on the testnets is to consult the files in the [`namada-ecosystem`](https://github.com/Luminara-Hub/namada-ecosystem/tree/main/user-and-dev-tools/testnet) repo.
+Please see [here](./services.mdx).
\ No newline at end of file