diff --git a/polygon/bor/polygon-amoy-bor-archive-pebble-path.yml b/polygon/bor/polygon-amoy-bor-archive-pebble-path.yml
index 46a93c25..5a493370 100644
--- a/polygon/bor/polygon-amoy-bor-archive-pebble-path.yml
+++ b/polygon/bor/polygon-amoy-bor-archive-pebble-path.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   polygon-amoy-archive:
-    image: ${POLYGON_BOR_IMAGE:-0xpolygon/bor}:${POLYGON_AMOY_BOR_VERSION:-2.8.3}
+    image: ${POLYGON_BOR_IMAGE:-0xpolygon/bor}:${POLYGON_AMOY_BOR_VERSION:-2.9.0}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -53,7 +53,7 @@ services:
       - 6060
     entrypoint: [bor, server]
     command:
-      - --bor.heimdall=https://polygon-amoy-heimdall-rest.publicnode.com
+      - --bor.heimdall=https://heimdall-api-amoy.polygon.technology
       - --chain=amoy
       - --datadir=/root/.bor/
       - --db.engine=pebble
diff --git a/polygon/bor/polygon-amoy-bor-pruned-pebble-path.yml b/polygon/bor/polygon-amoy-bor-pruned-pebble-path.yml
index 6dca4cc5..63a0ef3b 100644
--- a/polygon/bor/polygon-amoy-bor-pruned-pebble-path.yml
+++ b/polygon/bor/polygon-amoy-bor-pruned-pebble-path.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   polygon-amoy:
-    image: ${POLYGON_BOR_IMAGE:-0xpolygon/bor}:${POLYGON_AMOY_BOR_VERSION:-2.8.3}
+    image: ${POLYGON_BOR_IMAGE:-0xpolygon/bor}:${POLYGON_AMOY_BOR_VERSION:-2.9.0}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -53,7 +53,7 @@ services:
       - 6060
     entrypoint: [bor, server]
     command:
-      - --bor.heimdall=https://polygon-amoy-heimdall-rest.publicnode.com
+      - --bor.heimdall=https://heimdall-api-amoy.polygon.technology
       - --chain=amoy
       - --datadir=/root/.bor/
       - --db.engine=pebble
diff --git a/polygon/bor/polygon-mainnet-bor-archive-pebble-path.yml b/polygon/bor/polygon-mainnet-bor-archive-pebble-path.yml
index 25205c47..5b5b2a48 100644
--- a/polygon/bor/polygon-mainnet-bor-archive-pebble-path.yml
+++ b/polygon/bor/polygon-mainnet-bor-archive-pebble-path.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   polygon-mainnet-archive:
-    image: ${POLYGON_BOR_IMAGE:-0xpolygon/bor}:${POLYGON_MAINNET_BOR_VERSION:-2.8.3}
+    image: ${POLYGON_BOR_IMAGE:-0xpolygon/bor}:${POLYGON_MAINNET_BOR_VERSION:-2.9.0}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/polygon/bor/polygon-mainnet-bor-pruned-pebble-path.yml b/polygon/bor/polygon-mainnet-bor-pruned-pebble-path.yml
index 52e31433..7185c5ad 100644
--- a/polygon/bor/polygon-mainnet-bor-pruned-pebble-path.yml
+++ b/polygon/bor/polygon-mainnet-bor-pruned-pebble-path.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   polygon-mainnet:
-    image: ${POLYGON_BOR_IMAGE:-0xpolygon/bor}:${POLYGON_MAINNET_BOR_VERSION:-2.8.3}
+    image: ${POLYGON_BOR_IMAGE:-0xpolygon/bor}:${POLYGON_MAINNET_BOR_VERSION:-2.9.0}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/polygon/erigon3/polygon-amoy-erigon3-archive-trace.yml b/polygon/erigon3/polygon-amoy-erigon3-archive-trace.yml
index 92fe3875..03ffca7d 100644
--- a/polygon/erigon3/polygon-amoy-erigon3-archive-trace.yml
+++ b/polygon/erigon3/polygon-amoy-erigon3-archive-trace.yml
@@ -57,7 +57,7 @@ services:
       - 8545
     entrypoint: [erigon]
     command:
-      - --bor.heimdall=https://polygon-amoy-heimdall-rest.publicnode.com
+      - --bor.heimdall=https://heimdall-api-amoy.polygon.technology
       - --chain=amoy
       - --datadir=/root/.local/share/erigon
       - --discovery.dns=enrtree://AKUEZKN7PSKVNR65FZDHECMKOJQSGPARGTPPBI7WS2VUL4EGR6XPC@amoy.polygon-peers.io
diff --git a/polygon/erigon3/polygon-amoy-erigon3-minimal-trace.yml b/polygon/erigon3/polygon-amoy-erigon3-minimal-trace.yml
index dda264f7..d88e7dc0 100644
--- a/polygon/erigon3/polygon-amoy-erigon3-minimal-trace.yml
+++ b/polygon/erigon3/polygon-amoy-erigon3-minimal-trace.yml
@@ -57,7 +57,7 @@ services:
       - 8545
     entrypoint: [erigon]
     command:
-      - --bor.heimdall=https://polygon-amoy-heimdall-rest.publicnode.com
+      - --bor.heimdall=https://heimdall-api-amoy.polygon.technology
       - --chain=amoy
       - --datadir=/root/.local/share/erigon
       - --discovery.dns=enrtree://AKUEZKN7PSKVNR65FZDHECMKOJQSGPARGTPPBI7WS2VUL4EGR6XPC@amoy.polygon-peers.io
diff --git a/polygon/erigon3/polygon-amoy-erigon3-pruned-trace.yml b/polygon/erigon3/polygon-amoy-erigon3-pruned-trace.yml
index 4b5d41fc..106b53ab 100644
--- a/polygon/erigon3/polygon-amoy-erigon3-pruned-trace.yml
+++ b/polygon/erigon3/polygon-amoy-erigon3-pruned-trace.yml
@@ -57,7 +57,7 @@ services:
       - 8545
     entrypoint: [erigon]
     command:
-      - --bor.heimdall=https://polygon-amoy-heimdall-rest.publicnode.com
+      - --bor.heimdall=https://heimdall-api-amoy.polygon.technology
       - --chain=amoy
       - --datadir=/root/.local/share/erigon
       - --discovery.dns=enrtree://AKUEZKN7PSKVNR65FZDHECMKOJQSGPARGTPPBI7WS2VUL4EGR6XPC@amoy.polygon-peers.io
diff --git a/starknet/pathfinder/starknet-mainnet-pathfinder-archive.yml b/starknet/pathfinder/starknet-mainnet-pathfinder-archive.yml
index d79b0b48..3bee7908 100644
--- a/starknet/pathfinder/starknet-mainnet-pathfinder-archive.yml
+++ b/starknet/pathfinder/starknet-mainnet-pathfinder-archive.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   starknet-mainnet-pathfinder-archive:
-    image: ${STARKNET_PATHFINDER_IMAGE:-eqlabs/pathfinder}:${STARKNET_MAINNET_PATHFINDER_VERSION:-v0.22.6}
+    image: ${STARKNET_PATHFINDER_IMAGE:-eqlabs/pathfinder}:${STARKNET_MAINNET_PATHFINDER_VERSION:-v0.22.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/starknet/pathfinder/starknet-mainnet-pathfinder-pruned-history.yml b/starknet/pathfinder/starknet-mainnet-pathfinder-pruned-history.yml
index a61c757b..1e1eada4 100644
--- a/starknet/pathfinder/starknet-mainnet-pathfinder-pruned-history.yml
+++ b/starknet/pathfinder/starknet-mainnet-pathfinder-pruned-history.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   starknet-mainnet-pathfinder-pruned:
-    image: ${STARKNET_PATHFINDER_IMAGE:-eqlabs/pathfinder}:${STARKNET_MAINNET_PATHFINDER_VERSION:-v0.22.6}
+    image: ${STARKNET_PATHFINDER_IMAGE:-eqlabs/pathfinder}:${STARKNET_MAINNET_PATHFINDER_VERSION:-v0.22.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/starknet/pathfinder/starknet-mainnet-pathfinder-pruned.yml b/starknet/pathfinder/starknet-mainnet-pathfinder-pruned.yml
index fdfcd178..e14818d7 100644
--- a/starknet/pathfinder/starknet-mainnet-pathfinder-pruned.yml
+++ b/starknet/pathfinder/starknet-mainnet-pathfinder-pruned.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   starknet-mainnet-pathfinder-pruned:
-    image: ${STARKNET_PATHFINDER_IMAGE:-eqlabs/pathfinder}:${STARKNET_MAINNET_PATHFINDER_VERSION:-v0.22.6}
+    image: ${STARKNET_PATHFINDER_IMAGE:-eqlabs/pathfinder}:${STARKNET_MAINNET_PATHFINDER_VERSION:-v0.22.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/starknet/pathfinder/starknet-sepolia-pathfinder-archive.yml b/starknet/pathfinder/starknet-sepolia-pathfinder-archive.yml
index 0b7df014..2905eb3d 100644
--- a/starknet/pathfinder/starknet-sepolia-pathfinder-archive.yml
+++ b/starknet/pathfinder/starknet-sepolia-pathfinder-archive.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   starknet-sepolia-pathfinder-archive:
-    image: ${STARKNET_PATHFINDER_IMAGE:-eqlabs/pathfinder}:${STARKNET_SEPOLIA_PATHFINDER_VERSION:-v0.22.6}
+    image: ${STARKNET_PATHFINDER_IMAGE:-eqlabs/pathfinder}:${STARKNET_SEPOLIA_PATHFINDER_VERSION:-v0.22.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/starknet/pathfinder/starknet-sepolia-pathfinder-pruned-history.yml b/starknet/pathfinder/starknet-sepolia-pathfinder-pruned-history.yml
index b7b730fc..6212f09f 100644
--- a/starknet/pathfinder/starknet-sepolia-pathfinder-pruned-history.yml
+++ b/starknet/pathfinder/starknet-sepolia-pathfinder-pruned-history.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   starknet-sepolia-pathfinder-pruned:
-    image: ${STARKNET_PATHFINDER_IMAGE:-eqlabs/pathfinder}:${STARKNET_SEPOLIA_PATHFINDER_VERSION:-v0.22.6}
+    image: ${STARKNET_PATHFINDER_IMAGE:-eqlabs/pathfinder}:${STARKNET_SEPOLIA_PATHFINDER_VERSION:-v0.22.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/starknet/pathfinder/starknet-sepolia-pathfinder-pruned.yml b/starknet/pathfinder/starknet-sepolia-pathfinder-pruned.yml
index 957f13b1..affa481a 100644
--- a/starknet/pathfinder/starknet-sepolia-pathfinder-pruned.yml
+++ b/starknet/pathfinder/starknet-sepolia-pathfinder-pruned.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   starknet-sepolia-pathfinder-pruned:
-    image: ${STARKNET_PATHFINDER_IMAGE:-eqlabs/pathfinder}:${STARKNET_SEPOLIA_PATHFINDER_VERSION:-v0.22.6}
+    image: ${STARKNET_PATHFINDER_IMAGE:-eqlabs/pathfinder}:${STARKNET_SEPOLIA_PATHFINDER_VERSION:-v0.22.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle