diff --git a/watcher/src/consts.ts b/watcher/src/consts.ts
index 652ffb7a..18ad125f 100644
--- a/watcher/src/consts.ts
+++ b/watcher/src/consts.ts
@@ -34,19 +34,19 @@ export type WorkerData = {
 export const RPCS_BY_CHAIN: { [key in Network]: { [key in Chain]?: string } } = {
   ['Mainnet']: {
     Ethereum: process.env.ETH_RPC,
-    Bsc: process.env.BSC_RPC || 'https://bsc.publicnode.com',
-    Polygon: process.env.POLYGON_RPC || 'https://rpc.ankr.com/polygon',
-    Avalanche: process.env.AVALANCHE_RPC || 'https://rpc.ankr.com/avalanche',
+    Bsc: process.env.BSC_RPC || 'https://bsc-rpc.publicnode.com',
+    Polygon: process.env.POLYGON_RPC || 'https://polygon-bor-rpc.publicnode.com',
+    Avalanche: process.env.AVALANCHE_RPC || 'https://avalanche-c-chain-rpc.publicnode.com',
     Oasis: process.env.OASIS_RPC || 'https://emerald.oasis.dev',
     Algorand: process.env.ALGORAND_RPC || 'https://mainnet-api.algonode.cloud',
-    Fantom: process.env.FANTOM_RPC || 'https://rpc.ankr.com/fantom',
+    Fantom: process.env.FANTOM_RPC || 'https://fantom-rpc.publicnode.com',
     Karura: process.env.KARURA_RPC || 'https://eth-rpc-karura.aca-api.network',
     Acala: process.env.ACALA_RPC || 'https://eth-rpc-acala.aca-api.network',
     Klaytn: process.env.KLAYTN_RPC || 'https://klaytn-mainnet-rpc.allthatnode.com:8551',
     Celo: process.env.CELO_RPC || 'https://forno.celo.org',
-    Moonbeam: process.env.MOONBEAM_RPC || 'https://rpc.ankr.com/moonbeam',
-    Arbitrum: process.env.ARBITRUM_RPC || 'https://arb1.arbitrum.io/rpc',
-    Optimism: process.env.OPTIMISM_RPC || 'https://rpc.ankr.com/optimism',
+    Moonbeam: process.env.MOONBEAM_RPC || 'https://moonbeam-rpc.publicnode.com',
+    Arbitrum: process.env.ARBITRUM_RPC || 'https://arbitrum-one-rpc.publicnode.com',
+    Optimism: process.env.OPTIMISM_RPC || 'https://optimism-rpc.publicnode.com',
     Aptos: process.env.APTOS_RPC || 'https://fullnode.mainnet.aptoslabs.com/',
     Near: process.env.NEAR_RPC || 'https://rpc.mainnet.near.org',
     Xpla: process.env.XPLA_RPC || 'https://dimension-lcd.xpla.dev',
@@ -76,8 +76,8 @@ export const RPCS_BY_CHAIN: { [key in Network]: { [key in Chain]?: string } } =
     Klaytn: process.env.KLAYTN_RPC || 'https://rpc.ankr.com/klaytn_testnet',
     Celo: process.env.CELO_RPC || 'https://alfajores-forno.celo-testnet.org',
     Moonbeam: process.env.MOONBEAM_RPC,
-    Arbitrum: process.env.ARBITRUM_RPC || 'https://sepolia-rollup.arbitrum.io/rpc',
-    Optimism: process.env.OPTIMISM_RPC || 'https://optimism-goerli.publicnode.com',
+    Arbitrum: process.env.ARBITRUM_RPC,
+    Optimism: process.env.OPTIMISM_RPC,
     Aptos: process.env.APTOS_RPC,
     Near: process.env.NEAR_RPC,
     Xpla: process.env.XPLA_RPC || 'https://cube-lcd.xpla.dev',
@@ -93,7 +93,8 @@ export const RPCS_BY_CHAIN: { [key in Network]: { [key in Chain]?: string } } =
     Wormchain: process.env.WORMCHAIN_RPC,
     ArbitrumSepolia: process.env.ARBITRUM_SEPOLIA_RPC,
     BaseSepolia: process.env.BASE_SEPOLIA_RPC,
-    OptimismSepolia: process.env.OPTIMISM_SEPOLIA_RPC,
+    OptimismSepolia:
+      process.env.OPTIMISM_SEPOLIA_RPC || 'https://optimism-sepolia-rpc.publicnode.com',
     Holesky: process.env.HOLESKY_RPC,
     Sepolia: process.env.SEPOLIA_RPC,
     PolygonSepolia: process.env.POLYGON_SEPOLIA_RPC || 'https://rpc-amoy.polygon.technology',