diff --git a/src/lib/config/arbitrum/index.ts b/src/lib/config/arbitrum/index.ts
index ce30ac38fb..5a635c1969 100644
--- a/src/lib/config/arbitrum/index.ts
+++ b/src/lib/config/arbitrum/index.ts
@@ -25,19 +25,16 @@ const config: Config = {
   publicRpc: 'https://arb1.arbitrum.io/rpc',
   explorer: 'https://arbiscan.io',
   explorerName: 'Arbiscan',
-  subgraph:
-    'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-arbitrum-v2',
+  subgraph: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/98cQDy6tufTJtshDCuhh9z2kWXsQWBHVh2bqnLHsGAeS`,
   balancerApi: 'https://api.balancer.fi',
   poolsUrlV2: '',
   subgraphs: {
     main: [
-      'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-arbitrum-v2',
+      `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/98cQDy6tufTJtshDCuhh9z2kWXsQWBHVh2bqnLHsGAeS`,
     ],
     aave: '',
-    gauge:
-      'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-gauges-arbitrum',
-    blocks:
-      'https://api.thegraph.com/subgraphs/name/ianlapham/arbitrum-one-blocks',
+    gauge: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/Bb1hVjJZ52kL23chZyyGWJKrGEg3S6euuNa1YA6XRU4J`,
+    blocks: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/5jebsN6RBioFWQX7LP2N8r55nL4QPAyeKc6GzDA1Pt5H`,
   },
   bridgeUrl: 'https://bridge.arbitrum.io/',
   supportsEIP1559: false,
diff --git a/src/lib/config/arbitrum/keys.ts b/src/lib/config/arbitrum/keys.ts
index 385364e579..080c9e5c15 100644
--- a/src/lib/config/arbitrum/keys.ts
+++ b/src/lib/config/arbitrum/keys.ts
@@ -3,6 +3,7 @@ import { Keys } from '../types';
 const keys: Keys = {
   infura: 'daaa68ec242643719749dd1caba2fc66',
   alchemy: '',
+  graph: 'a84caa9e5c322a2faec24ad89ccb9d28',
 };
 
 export default keys;
diff --git a/src/lib/config/avalanche/index.ts b/src/lib/config/avalanche/index.ts
index 93c40582c0..698c8cb05b 100644
--- a/src/lib/config/avalanche/index.ts
+++ b/src/lib/config/avalanche/index.ts
@@ -25,19 +25,16 @@ const config: Config = {
   publicRpc: 'https://avalanche.public-rpc.com',
   explorer: 'https://snowtrace.io',
   explorerName: 'Snowtrace',
-  subgraph:
-    'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-avalanche-v2',
+  subgraph: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/7asfmtQA1KYu6CP7YVm5kv4bGxVyfAHEiptt2HMFgkHu`,
   balancerApi: 'https://api.balancer.fi',
   poolsUrlV2: '',
   subgraphs: {
     main: [
-      'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-avalanche-v2',
+      `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/7asfmtQA1KYu6CP7YVm5kv4bGxVyfAHEiptt2HMFgkHu`,
     ],
-    aave: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v2-avalanche',
-    gauge:
-      'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-gauges-avalanche',
-    blocks:
-      'https://api.thegraph.com/subgraphs/name/iliaazhel/avalanche-blocks',
+    aave: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/EZvK18pMhwiCjxwesRLTg81fP33WnR6BnZe5Cvma3H1C`,
+    gauge: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/GzGBUh1X4Cq9RBdyKoCrPLhYW1saBYHwFBgcTsARPYUG`,
+    blocks: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/97YH6dMhGcXoTvVwDAML6GxYm9hBh7PCz6WPscUkrFhv`,
   },
   bridgeUrl: 'https://core.app/bridge/',
   supportsEIP1559: false,
diff --git a/src/lib/config/avalanche/keys.ts b/src/lib/config/avalanche/keys.ts
index 52a3881736..d934e83ebb 100644
--- a/src/lib/config/avalanche/keys.ts
+++ b/src/lib/config/avalanche/keys.ts
@@ -4,6 +4,7 @@ const keys: Keys = {
   infura: 'daaa68ec242643719749dd1caba2fc66',
   alchemy: 'UrVAqAyukeLVl8hhc29tLtegSoWL9Iuy',
   balancerApi: 'da2-7a3ukmnw7bexndpx5x522uafui',
+  graph: 'a84caa9e5c322a2faec24ad89ccb9d28',
 };
 
 export default keys;
diff --git a/src/lib/config/gnosis-chain/index.ts b/src/lib/config/gnosis-chain/index.ts
index 79176fbf83..7b4da12c79 100644
--- a/src/lib/config/gnosis-chain/index.ts
+++ b/src/lib/config/gnosis-chain/index.ts
@@ -1,4 +1,5 @@
 import { Config } from '../types';
+import keys from './keys';
 import contracts from './contracts';
 import pools from './pools';
 import tokenlists from './tokenlists';
@@ -26,16 +27,14 @@ const config: Config = {
   explorer: 'https://gnosisscan.io',
   explorerName: 'Gnosisscan',
   balancerApi: 'https://api.balancer.fi',
-  subgraph:
-    'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-gnosis-chain-v2',
+  subgraph: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/EJezH1Cp31QkKPaBDerhVPRWsKVZLrDfzjrLqpmv6cGg`,
   poolsUrlV2: '',
   subgraphs: {
     main: [
-      'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-gnosis-chain-v2',
+      `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/EJezH1Cp31QkKPaBDerhVPRWsKVZLrDfzjrLqpmv6cGg`,
     ],
     aave: '',
-    gauge:
-      'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-gauges-gnosis-chain',
+    gauge: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/HW5XpZBi2iYDLBqqEEMiRJFx8ZJAQak9uu5TzyH9BBxy`,
     blocks: '',
   },
   bridgeUrl: 'https://bridge.gnosischain.com/',
diff --git a/src/lib/config/gnosis-chain/keys.ts b/src/lib/config/gnosis-chain/keys.ts
new file mode 100644
index 0000000000..cda2bebddb
--- /dev/null
+++ b/src/lib/config/gnosis-chain/keys.ts
@@ -0,0 +1,7 @@
+import { Keys } from '../types';
+
+const keys: Keys = {
+  graph: 'a84caa9e5c322a2faec24ad89ccb9d28',
+};
+
+export default keys;
diff --git a/src/lib/config/mainnet/index.ts b/src/lib/config/mainnet/index.ts
index dadb416f6b..0b16245b88 100644
--- a/src/lib/config/mainnet/index.ts
+++ b/src/lib/config/mainnet/index.ts
@@ -23,20 +23,17 @@ const config: Config = {
   ws: ``,
   explorer: 'https://etherscan.io',
   explorerName: 'Etherscan',
-  subgraph: 'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-v2',
+  subgraph: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/C4ayEZP2yTXRAB8vSaTrgN4m9anTe9Mdm2ViyiAuV9TV`,
   balancerApi: 'https://api.balancer.fi',
   poolsUrlV2:
     'https://storageapi.fleek.co/johngrantuk-team-bucket/poolsV2.json',
   subgraphs: {
     main: [
-      'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-v2',
-      `https://gateway.thegraph.com/api/${keys.graph}/subgraphs/id/GAWNgiGrA9eRce5gha9tWc7q5DPvN3fs5rSJ6tEULFNM`,
+      `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/C4ayEZP2yTXRAB8vSaTrgN4m9anTe9Mdm2ViyiAuV9TV`,
     ],
-    aave: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v2',
-    gauge:
-      'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-gauges',
-    blocks:
-      'https://api.thegraph.com/subgraphs/name/blocklytics/ethereum-blocks',
+    aave: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/8wR23o1zkS4gpLqLNU4kG3JHYVucqGyopL5utGxP2q1N`,
+    gauge: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/4sESujoqmztX6pbichs4wZ1XXyYrkooMuHA8sKkYxpTn`,
+    blocks: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/236pc6mnPH2EdGJxR5wunibyGsagq1JsSx5e2hx5tdoE`,
   },
   bridgeUrl: '',
   supportsEIP1559: true,
diff --git a/src/lib/config/mainnet/keys.ts b/src/lib/config/mainnet/keys.ts
index 04a846bbbb..1385da2c5d 100644
--- a/src/lib/config/mainnet/keys.ts
+++ b/src/lib/config/mainnet/keys.ts
@@ -3,7 +3,7 @@ import { Keys } from '../types';
 const keys: Keys = {
   infura: 'daaa68ec242643719749dd1caba2fc66',
   alchemy: '',
-  graph: '7c7b4c36244b0b86171a3931eaf9bb23',
+  graph: 'a84caa9e5c322a2faec24ad89ccb9d28',
   balancerApi: 'da2-7a3ukmnw7bexndpx5x522uafui',
 };
 
diff --git a/src/lib/config/optimism/index.ts b/src/lib/config/optimism/index.ts
index 322689f124..84c7c7acf7 100644
--- a/src/lib/config/optimism/index.ts
+++ b/src/lib/config/optimism/index.ts
@@ -1,4 +1,5 @@
 import { Config } from '../types';
+import keys from './keys';
 import contracts from './contracts';
 import pools from './pools';
 import tokenlists from './tokenlists';
@@ -24,19 +25,16 @@ const config: Config = {
   blockTime: 13,
   explorer: 'https://optimistic.etherscan.io/',
   explorerName: 'The Optimism Explorer',
-  subgraph:
-    'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-optimism-v2',
+  subgraph: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/FsmdxmvBJLGjUQPxKMRtcWKzuCNpomKuMTbSbtRtggZ7`,
   balancerApi: 'https://api.balancer.fi',
   poolsUrlV2: '',
   subgraphs: {
     main: [
-      'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-optimism-v2',
+      `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/FsmdxmvBJLGjUQPxKMRtcWKzuCNpomKuMTbSbtRtggZ7`,
     ],
     aave: '',
-    gauge:
-      'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-gauges-optimism',
-    blocks:
-      'https://api.thegraph.com/subgraphs/name/iliaazhel/optimism-blocklytics',
+    gauge: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/CbLt7GqU7sypjRaCfwissEBkFeCw3dUz2emrvBNJ7dZu`,
+    blocks: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/HsWM1oAXHGWdkH8bK98UrW38PvyPx6Q4waRow2LT8mcp`,
   },
   bridgeUrl: '',
   supportsEIP1559: false,
diff --git a/src/lib/config/optimism/keys.ts b/src/lib/config/optimism/keys.ts
new file mode 100644
index 0000000000..cda2bebddb
--- /dev/null
+++ b/src/lib/config/optimism/keys.ts
@@ -0,0 +1,7 @@
+import { Keys } from '../types';
+
+const keys: Keys = {
+  graph: 'a84caa9e5c322a2faec24ad89ccb9d28',
+};
+
+export default keys;
diff --git a/src/lib/config/polygon/index.ts b/src/lib/config/polygon/index.ts
index 230b7a94e0..1541b13fea 100644
--- a/src/lib/config/polygon/index.ts
+++ b/src/lib/config/polygon/index.ts
@@ -25,18 +25,16 @@ const config: Config = {
   publicRpc: 'https://polygon-rpc.com',
   explorer: 'https://polygonscan.com',
   explorerName: 'Polygonscan',
-  subgraph:
-    'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-polygon-prune-v2',
+  subgraph: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/H9oPAbXnobBRq1cB3HDmbZ1E8MWQyJYQjT1QDJMrdbNp`,
   balancerApi: 'https://api.balancer.fi',
   poolsUrlV2: '',
   subgraphs: {
     main: [
-      'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-polygon-prune-v2',
+      `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/H9oPAbXnobBRq1cB3HDmbZ1E8MWQyJYQjT1QDJMrdbNp`,
     ],
-    aave: 'https://api.thegraph.com/subgraphs/name/aave/aave-v2-matic',
-    gauge:
-      'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-gauges-polygon',
-    blocks: 'https://api.thegraph.com/subgraphs/name/ianlapham/polygon-blocks',
+    aave: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/H1Et77RZh3XEf27vkAmJyzgCME2RSFLtDS2f4PPW6CGp`,
+    gauge: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/FxSLKXiieSqBCjDGPbqayhqbxyNtwaEC5M3rxr6hUa8h`,
+    blocks: `https://gateway-arbitrum.network.thegraph.com/api/${keys.graph}/subgraphs/id/HHpzhtyGrTNSbhtjgZyYG4aG538fKpV21dsCBshLnKDg`,
   },
   bridgeUrl: 'https://wallet.polygon.technology/polygon/bridge',
   supportsEIP1559: true,
diff --git a/src/lib/config/polygon/keys.ts b/src/lib/config/polygon/keys.ts
index 385364e579..080c9e5c15 100644
--- a/src/lib/config/polygon/keys.ts
+++ b/src/lib/config/polygon/keys.ts
@@ -3,6 +3,7 @@ import { Keys } from '../types';
 const keys: Keys = {
   infura: 'daaa68ec242643719749dd1caba2fc66',
   alchemy: '',
+  graph: 'a84caa9e5c322a2faec24ad89ccb9d28',
 };
 
 export default keys;
diff --git a/src/providers/cross-chain-sync.provider.spec.ts b/src/providers/cross-chain-sync.provider.spec.ts
index d1edadad56..f0eec501ea 100644
--- a/src/providers/cross-chain-sync.provider.spec.ts
+++ b/src/providers/cross-chain-sync.provider.spec.ts
@@ -93,10 +93,10 @@ describe('Returns correct Sync state by network', () => {
 
     expect(networksBySyncState.value).toMatchInlineSnapshot(`
       {
-        "synced": [],
-        "syncing": [
+        "synced": [
           42161,
         ],
+        "syncing": [],
         "unsynced": [
           10,
           100,