diff --git a/packages/eco-data-server/src/apis/endpoints.js b/packages/eco-data-server/src/apis/endpoints.js
index 567e40f85..7206c9c8c 100644
--- a/packages/eco-data-server/src/apis/endpoints.js
+++ b/packages/eco-data-server/src/apis/endpoints.js
@@ -1,7 +1,13 @@
 const endpoints = Object.freeze({
-  polkadot: ["wss://rpc.polkadot.io", "wss://polkadot.ibp.network"],
-  kusama: ["wss://kusama-rpc.polkadot.io", "wss://kusama.ibp.network"],
-  hydradx: ["wss://rpc.hydradx.cloud", "wss://hydration.ibp.network"],
+  polkadot: [
+    "wss://rpc.polkadot.io",
+    "wss://polkadot.api.onfinality.io/public-ws",
+  ],
+  kusama: [
+    "wss://kusama-rpc.polkadot.io",
+    "wss://kusama.api.onfinality.io/public-ws",
+  ],
+  hydradx: ["wss://rpc.hydradx.cloud", "wss://hydration-rpc.n.dwellir.com"],
   basilisk: ["wss://rpc.basilisk.cloud"],
   interlay: [
     "wss://api.interlay.io/parachain",
@@ -25,13 +31,18 @@ const endpoints = Object.freeze({
   ],
   polkadotAssetHub: [
     "wss://polkadot-asset-hub-rpc.polkadot.io",
-    "wss://asset-hub-polkadot.ibp.network",
+    "wss://asset-hub-polkadot-rpc.n.dwellir.com",
+    "wss://dot-rpc.stakeworld.io/assethub",
   ],
   kusamaAssetHub: [
     "wss://kusama-asset-hub-rpc.polkadot.io",
-    "wss://asset-hub-kusama.ibp.network",
+    "wss://asset-hub-kusama-rpc.n.dwellir.com",
+    "wss://rpc-asset-hub-kusama.luckyfriday.io",
+  ],
+  astar: [
+    "wss://rpc.astar.network/",
+    "wss://astar.api.onfinality.io/public-ws",
   ],
-  astar: ["wss://rpc.astar.network/"],
 });
 
 module.exports = {
diff --git a/packages/eco-data-server/src/scripts/polkadotTreasuryHistory/index.js b/packages/eco-data-server/src/scripts/polkadotTreasuryHistory/index.js
index 1b9dbc932..e57f71685 100644
--- a/packages/eco-data-server/src/scripts/polkadotTreasuryHistory/index.js
+++ b/packages/eco-data-server/src/scripts/polkadotTreasuryHistory/index.js
@@ -78,9 +78,15 @@ async function generateTreasuryHistory() {
 }
 
 createChainApis({
-  polkadot: ["wss://rpc.polkadot.io", "wss://rpc.ibp.network/polkadot"],
-  hydradx: ["wss://rpc.hydradx.cloud/", "wss://hydration.ibp.network/"],
-  polkadotAssetHub: ["wss://polkadot-asset-hub-rpc.polkadot.io"],
+  polkadot: [
+    "wss://rpc.polkadot.io",
+    "wss://polkadot.api.onfinality.io/public-ws",
+  ],
+  hydradx: ["wss://rpc.hydradx.cloud/", "wss://hydration-rpc.n.dwellir.com"],
+  polkadotAssetHub: [
+    "wss://polkadot-asset-hub-rpc.polkadot.io",
+    "wss://asset-hub-polkadot-rpc.n.dwellir.com",
+  ],
   bifrostPolkadot: ["wss://eu.bifrost-polkadot-rpc.liebi.com/ws"],
 })
   .then(generateTreasuryHistory)
diff --git a/site/src/constants/index.js b/site/src/constants/index.js
index 96b0c6fc9..29cad203d 100644
--- a/site/src/constants/index.js
+++ b/site/src/constants/index.js
@@ -112,10 +112,6 @@ export const REACTION_THUMBUP = 1;
 export const REACTION_THUMBDOWN = 2;
 
 export const DEFAULT_KUSAMA_NODES = [
-  {
-    name: "IBP1",
-    url: "wss://rpc.ibp.network/kusama",
-  },
   {
     name: "OnFinality",
     url: "wss://kusama.api.onfinality.io/public-ws",
@@ -144,10 +140,6 @@ export const DEFAULT_KUSAMA_NODES = [
     name: "Dwellir Tunisia",
     url: "wss://kusama-rpc-tn.dwellir.com",
   },
-  {
-    name: "IBP2",
-    url: "wss://kusama.dotters.network",
-  },
   {
     name: "RadiumBlock",
     url: "wss://kusama.public.curie.radiumblock.co/ws",
@@ -167,10 +159,6 @@ export const DEFAULT_KUSAMA_NODES = [
 ];
 
 export const DEFAULT_POLKADOT_NODES = [
-  {
-    name: "IBP1",
-    url: "wss://rpc.ibp.network/polkadot",
-  },
   {
     name: "OnFinality",
     url: "wss://polkadot.api.onfinality.io/public-ws",
diff --git a/site/src/utils/chains/hydradx.js b/site/src/utils/chains/hydradx.js
index ce6383b4d..5f0059178 100644
--- a/site/src/utils/chains/hydradx.js
+++ b/site/src/utils/chains/hydradx.js
@@ -5,18 +5,10 @@ const endpoints = [
     name: "Galactic Council",
     url: "wss://rpc.hydradx.cloud",
   },
-  {
-    name: "IBP1",
-    url: "wss://hydration.ibp.network/",
-  },
   {
     name: "Helikon",
     url: "wss://rpc.helikon.io/hydradx",
   },
-  {
-    name: "IBP2",
-    url: "wss://hydration.dotters.network/",
-  },
   {
     name: "Dwellir",
     url: "wss://hydration-rpc.n.dwellir.com/",
diff --git a/site/src/utils/chains/kusama.js b/site/src/utils/chains/kusama.js
index d4fcf8874..eef4525b7 100644
--- a/site/src/utils/chains/kusama.js
+++ b/site/src/utils/chains/kusama.js
@@ -4,14 +4,12 @@ const value = "kusama";
 
 const assetHubEndpoints = [
   { name: "Parity", url: "wss://kusama-asset-hub-rpc.polkadot.io" },
-  { name: "IBP1", url: "wss://sys.ibp.network/asset-hub-kusama" },
   {
     name: "RadiumBlock",
     url: "wss://statemine.public.curie.radiumblock.co/ws",
   },
   { name: "Dwellir", url: "wss://asset-hub-kusama-rpc.dwellir.com" },
   { name: "Dwellir Tunisia", url: "wss://statemine-rpc-tn.dwellir.com" },
-  { name: "IBP2", url: "wss://asset-hub-kusama.dotters.network/" },
   { name: "LuckyFriday", url: "wss://rpc-asset-hub-kusama.luckyfriday.io" },
   { name: "Stakeworld", url: "wss://ksm-rpc.stakeworld.io/assethub" },
 ];
diff --git a/site/src/utils/chains/polkadot.js b/site/src/utils/chains/polkadot.js
index b27870152..45ef367e8 100644
--- a/site/src/utils/chains/polkadot.js
+++ b/site/src/utils/chains/polkadot.js
@@ -11,14 +11,6 @@ const assetHubEndpoints = [
     name: "Parity",
     url: "wss://polkadot-asset-hub-rpc.polkadot.io",
   },
-  {
-    name: "IBP1",
-    url: "wss://sys.ibp.network/asset-hub-polkadot",
-  },
-  {
-    name: "IBP2",
-    url: "wss://asset-hub-polkadot.dotters.network",
-  },
   {
     name: "LuckyFriday",
     url: "wss://rpc-asset-hub-polkadot.luckyfriday.io",