diff --git a/compose-graphnode.yml b/compose-graphnode.yml
index a7661e3..b50da72 100644
--- a/compose-graphnode.yml
+++ b/compose-graphnode.yml
@@ -18,7 +18,7 @@ services:
 
 
   index-node-0:
-    image: ${GRAPH_NODE_VERSION:-graphprotocol/graph-node:v0.34.0-rc.0}
+    image: ${GRAPH_NODE_VERSION:-graphprotocol/graph-node:v0.35.1}
     container_name: index-node-0
     depends_on:
       - postgres
@@ -57,7 +57,7 @@ services:
 
 
   query-node-0:
-    image: ${GRAPH_NODE_VERSION:-graphprotocol/graph-node:v0.34.0-rc.0}
+    image: ${GRAPH_NODE_VERSION:-graphprotocol/graph-node:v0.35.1}
     container_name: query-node-0
     depends_on:
       - postgres
diff --git a/compose-indexer.yml b/compose-indexer.yml
index 4d760f2..fe2bb7a 100644
--- a/compose-indexer.yml
+++ b/compose-indexer.yml
@@ -35,7 +35,7 @@ services:
 ######################################################################################
 
   indexer-service:
-    image: ${INDEXER_SERVICE_VERSION:-ghcr.io/graphprotocol/indexer-service:v0.20.22}
+    image: ${INDEXER_SERVICE_VERSION:-ghcr.io/graphprotocol/indexer-service:v0.21.4}
     container_name: indexer-service
     depends_on:
       - postgres2
@@ -75,7 +75,7 @@ services:
 ######################################################################################
 
   indexer-agent:
-    image: ${INDEXER_AGENT_VERSION:-ghcr.io/graphprotocol/indexer-agent:v0.20.22}
+    image: ${INDEXER_AGENT_VERSION:-ghcr.io/graphprotocol/indexer-agent:v0.21.4}
     container_name: indexer-agent
     depends_on:
       - postgres2
@@ -114,7 +114,7 @@ services:
       INDEXER_AGENT_POSTGRES_PASSWORD: ${DB_PASS:-db-password}
       INDEXER_AGENT_POSTGRES_DATABASE: ${AGENT_DB_NAME:-indexer-agent}
       INDEXER_AGENT_DAI_CONTRACT: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
-      INDEXER_AGENT_COLLECT_RECEIPTS_ENDPOINT: https://gateway.thegraph.com/collect-receipts
+      INDEXER_AGENT_COLLECT_RECEIPTS_ENDPOINT: https://gateway-arbitrum.network.thegraph.com/collect-receipts
       INDEXER_AGENT_OFFCHAIN_SUBGRAPHS: ${INDEXER_AGENT_OFFCHAIN_SUBGRAPHS}
       INDEXER_AGENT_GAS_PRICE_MAX: ${INDEXER_AGENT_GAS_PRICE_MAX:-50}
       INDEXER_AGENT_ALLOCATION_MANAGEMENT: ${INDEXER_AGENT_ALLOCATION_MANAGEMENT:-auto}