diff --git a/bsc/erigon3/bsc-chapel-erigon3-archive-trace.yml b/bsc/erigon3/bsc-chapel-erigon3-archive-trace.yml
index 4798f18e..ede186f3 100644
--- a/bsc/erigon3/bsc-chapel-erigon3-archive-trace.yml
+++ b/bsc/erigon3/bsc-chapel-erigon3-archive-trace.yml
@@ -30,7 +30,13 @@ x-logging-defaults: &logging-defaults
 
 services:
   bsc-chapel-erigon3-archive:
-    image: ${BSC_ERIGON3_IMAGE:-ghcr.io/node-real/bsc-erigon}:${BSC_CHAPEL_ERIGON3_VERSION:-v1.3.9}
+    build:
+      context: .
+      dockerfile: erigon3.Dockerfile
+      args:
+        VERSION: 1.3.9
+        REPO: https://github.com/node-real/bsc-erigon
+        COMMIT: main
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -75,6 +81,7 @@ services:
       - --prune.mode=archive
       - --rpc.gascap=6000000000
       - --rpc.returndata.limit=1100000
+      - --sync.loop.block.limit=10000
       - --ws
       - --ws.port=8545
     restart: unless-stopped
diff --git a/bsc/erigon3/bsc-chapel-erigon3-minimal-trace.yml b/bsc/erigon3/bsc-chapel-erigon3-minimal-trace.yml
index 95e4a434..22792202 100644
--- a/bsc/erigon3/bsc-chapel-erigon3-minimal-trace.yml
+++ b/bsc/erigon3/bsc-chapel-erigon3-minimal-trace.yml
@@ -30,7 +30,13 @@ x-logging-defaults: &logging-defaults
 
 services:
   bsc-chapel-erigon3-minimal:
-    image: ${BSC_ERIGON3_IMAGE:-ghcr.io/node-real/bsc-erigon}:${BSC_CHAPEL_ERIGON3_VERSION:-v1.3.9}
+    build:
+      context: .
+      dockerfile: erigon3.Dockerfile
+      args:
+        VERSION: 1.3.9
+        REPO: https://github.com/node-real/bsc-erigon
+        COMMIT: main
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -75,6 +81,7 @@ services:
       - --prune.mode=minimal
       - --rpc.gascap=6000000000
       - --rpc.returndata.limit=1100000
+      - --sync.loop.block.limit=10000
       - --ws
       - --ws.port=8545
     restart: unless-stopped
diff --git a/bsc/erigon3/bsc-chapel-erigon3-pruned-trace.yml b/bsc/erigon3/bsc-chapel-erigon3-pruned-trace.yml
index 794f0c33..9ca03b06 100644
--- a/bsc/erigon3/bsc-chapel-erigon3-pruned-trace.yml
+++ b/bsc/erigon3/bsc-chapel-erigon3-pruned-trace.yml
@@ -30,7 +30,13 @@ x-logging-defaults: &logging-defaults
 
 services:
   bsc-chapel-erigon3:
-    image: ${BSC_ERIGON3_IMAGE:-ghcr.io/node-real/bsc-erigon}:${BSC_CHAPEL_ERIGON3_VERSION:-v1.3.9}
+    build:
+      context: .
+      dockerfile: erigon3.Dockerfile
+      args:
+        VERSION: 1.3.9
+        REPO: https://github.com/node-real/bsc-erigon
+        COMMIT: main
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -75,6 +81,7 @@ services:
       - --prune.mode=full
       - --rpc.gascap=6000000000
       - --rpc.returndata.limit=1100000
+      - --sync.loop.block.limit=10000
       - --ws
       - --ws.port=8545
     restart: unless-stopped
diff --git a/bsc/erigon3/bsc-mainnet-erigon3-archive-trace.yml b/bsc/erigon3/bsc-mainnet-erigon3-archive-trace.yml
index 203ada40..c8f8ca5f 100644
--- a/bsc/erigon3/bsc-mainnet-erigon3-archive-trace.yml
+++ b/bsc/erigon3/bsc-mainnet-erigon3-archive-trace.yml
@@ -30,7 +30,13 @@ x-logging-defaults: &logging-defaults
 
 services:
   bsc-mainnet-erigon3-archive:
-    image: ${BSC_ERIGON3_IMAGE:-ghcr.io/node-real/bsc-erigon}:${BSC_MAINNET_ERIGON3_VERSION:-v1.3.9}
+    build:
+      context: .
+      dockerfile: erigon3.Dockerfile
+      args:
+        VERSION: 1.3.9
+        REPO: https://github.com/node-real/bsc-erigon
+        COMMIT: main
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -75,6 +81,7 @@ services:
       - --prune.mode=archive
       - --rpc.gascap=6000000000
       - --rpc.returndata.limit=1100000
+      - --sync.loop.block.limit=10000
       - --ws
       - --ws.port=8545
     restart: unless-stopped
diff --git a/bsc/erigon3/bsc-mainnet-erigon3-minimal-trace.yml b/bsc/erigon3/bsc-mainnet-erigon3-minimal-trace.yml
index 335b9965..06584a69 100644
--- a/bsc/erigon3/bsc-mainnet-erigon3-minimal-trace.yml
+++ b/bsc/erigon3/bsc-mainnet-erigon3-minimal-trace.yml
@@ -30,7 +30,13 @@ x-logging-defaults: &logging-defaults
 
 services:
   bsc-mainnet-erigon3-minimal:
-    image: ${BSC_ERIGON3_IMAGE:-ghcr.io/node-real/bsc-erigon}:${BSC_MAINNET_ERIGON3_VERSION:-v1.3.9}
+    build:
+      context: .
+      dockerfile: erigon3.Dockerfile
+      args:
+        VERSION: 1.3.9
+        REPO: https://github.com/node-real/bsc-erigon
+        COMMIT: main
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -75,6 +81,7 @@ services:
       - --prune.mode=minimal
       - --rpc.gascap=6000000000
       - --rpc.returndata.limit=1100000
+      - --sync.loop.block.limit=10000
       - --ws
       - --ws.port=8545
     restart: unless-stopped
diff --git a/bsc/erigon3/bsc-mainnet-erigon3-pruned-trace.yml b/bsc/erigon3/bsc-mainnet-erigon3-pruned-trace.yml
index b9ad9f31..0b022701 100644
--- a/bsc/erigon3/bsc-mainnet-erigon3-pruned-trace.yml
+++ b/bsc/erigon3/bsc-mainnet-erigon3-pruned-trace.yml
@@ -30,7 +30,13 @@ x-logging-defaults: &logging-defaults
 
 services:
   bsc-mainnet-erigon3:
-    image: ${BSC_ERIGON3_IMAGE:-ghcr.io/node-real/bsc-erigon}:${BSC_MAINNET_ERIGON3_VERSION:-v1.3.9}
+    build:
+      context: .
+      dockerfile: erigon3.Dockerfile
+      args:
+        VERSION: 1.3.9
+        REPO: https://github.com/node-real/bsc-erigon
+        COMMIT: main
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -75,6 +81,7 @@ services:
       - --prune.mode=full
       - --rpc.gascap=6000000000
       - --rpc.returndata.limit=1100000
+      - --sync.loop.block.limit=10000
       - --ws
       - --ws.port=8545
     restart: unless-stopped
diff --git a/erigon3.Dockerfile b/erigon3.Dockerfile
new file mode 100644
index 00000000..4970564e
--- /dev/null
+++ b/erigon3.Dockerfile
@@ -0,0 +1,102 @@
+# syntax = docker/dockerfile:1.2
+ARG REPO=https://github.com/erigontech/erigon.git
+ARG VERSION=v3.0.7
+ARG COMMIT=${COMMIT:-${VERSION}}
+
+FROM docker.io/library/golang:1.24.1-alpine3.20 AS builder
+
+ARG REPO
+ARG COMMIT
+
+RUN apk --no-cache add build-base linux-headers git bash ca-certificates libstdc++
+
+WORKDIR /app
+
+RUN git clone --recursive ${REPO} . && \
+    git checkout ${COMMIT}
+
+RUN go mod download
+
+RUN --mount=type=cache,target=/root/.cache \
+    --mount=type=cache,target=/tmp/go-build \
+    --mount=type=cache,target=/go/pkg/mod \
+    make BUILD_TAGS=nosqlite,noboltdb,nosilkworm all
+
+
+FROM docker.io/library/golang:1.24.1-alpine3.20 AS tools-builder
+
+ARG REPO
+ARG COMMIT
+
+RUN apk --no-cache add build-base linux-headers git bash ca-certificates libstdc++
+
+WORKDIR /app
+
+RUN git clone --recursive ${REPO} . && \
+    git checkout ${COMMIT}
+
+RUN mkdir -p /app/build/bin
+
+RUN --mount=type=cache,target=/root/.cache \
+    --mount=type=cache,target=/tmp/go-build \
+    --mount=type=cache,target=/go/pkg/mod \
+    make db-tools
+
+
+FROM docker.io/library/alpine:3.19
+
+RUN apk add --no-cache ca-certificates libstdc++ tzdata
+RUN apk add --no-cache curl jq bind-tools
+
+ARG UID=1000
+ARG GID=1000
+RUN adduser -D -u $UID -g $GID erigon
+USER erigon
+RUN mkdir -p ~/.local/share/erigon
+
+# Copy MDBX tools
+COPY --from=tools-builder /app/build/bin/mdbx_* /usr/local/bin/
+
+# Copy Erigon binaries
+COPY --from=builder /app/build/bin/devnet /usr/local/bin/devnet
+COPY --from=builder /app/build/bin/downloader /usr/local/bin/downloader
+COPY --from=builder /app/build/bin/erigon /usr/local/bin/erigon
+COPY --from=builder /app/build/bin/evm /usr/local/bin/evm
+COPY --from=builder /app/build/bin/hack /usr/local/bin/hack
+COPY --from=builder /app/build/bin/integration /usr/local/bin/integration
+COPY --from=builder /app/build/bin/observer /usr/local/bin/observer
+COPY --from=builder /app/build/bin/pics /usr/local/bin/pics
+COPY --from=builder /app/build/bin/rpcdaemon /usr/local/bin/rpcdaemon
+COPY --from=builder /app/build/bin/rpctest /usr/local/bin/rpctest
+COPY --from=builder /app/build/bin/sentinel /usr/local/bin/sentinel
+COPY --from=builder /app/build/bin/sentry /usr/local/bin/sentry
+COPY --from=builder /app/build/bin/state /usr/local/bin/state
+COPY --from=builder /app/build/bin/txpool /usr/local/bin/txpool
+COPY --from=builder /app/build/bin/verkle /usr/local/bin/verkle
+COPY --from=builder /app/build/bin/caplin /usr/local/bin/caplin
+
+EXPOSE 8545 \
+    8551 \
+    8546 \
+    30303 \
+    30303/udp \
+    42069 \
+    42069/udp \
+    8080 \
+    9090 \
+    6060
+
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION
+LABEL org.label-schema.build-date=$BUILD_DATE \
+    org.label-schema.description="Erigon Ethereum Client" \
+    org.label-schema.name="Erigon" \
+    org.label-schema.schema-version="1.0" \
+    org.label-schema.url="https://torquem.ch" \
+    org.label-schema.vcs-ref=$VCS_REF \
+    org.label-schema.vcs-url=$REPO \
+    org.label-schema.vendor="Torquem" \
+    org.label-schema.version=$VERSION
+
+ENTRYPOINT ["erigon"]
diff --git a/ethereum/erigon3/ethereum-holesky-erigon3-archive-trace.yml b/ethereum/erigon3/ethereum-holesky-erigon3-archive-trace.yml
index a4b81288..6798a4e5 100644
--- a/ethereum/erigon3/ethereum-holesky-erigon3-archive-trace.yml
+++ b/ethereum/erigon3/ethereum-holesky-erigon3-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   ethereum-holesky-erigon3-archive:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOLESKY_ERIGON3_VERSION:-v3.0.6}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOLESKY_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/ethereum/erigon3/ethereum-holesky-erigon3-minimal-trace.yml b/ethereum/erigon3/ethereum-holesky-erigon3-minimal-trace.yml
index bf0157f6..e8737cb3 100644
--- a/ethereum/erigon3/ethereum-holesky-erigon3-minimal-trace.yml
+++ b/ethereum/erigon3/ethereum-holesky-erigon3-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   ethereum-holesky-erigon3-minimal:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOLESKY_ERIGON3_VERSION:-v3.0.6}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOLESKY_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/ethereum/erigon3/ethereum-holesky-erigon3-pruned-trace.yml b/ethereum/erigon3/ethereum-holesky-erigon3-pruned-trace.yml
index a569bb05..51050f04 100644
--- a/ethereum/erigon3/ethereum-holesky-erigon3-pruned-trace.yml
+++ b/ethereum/erigon3/ethereum-holesky-erigon3-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   ethereum-holesky-erigon3:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOLESKY_ERIGON3_VERSION:-v3.0.6}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOLESKY_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/ethereum/erigon3/ethereum-hoodi-erigon3-archive-trace.yml b/ethereum/erigon3/ethereum-hoodi-erigon3-archive-trace.yml
index aa1bee00..cb0c58ed 100644
--- a/ethereum/erigon3/ethereum-hoodi-erigon3-archive-trace.yml
+++ b/ethereum/erigon3/ethereum-hoodi-erigon3-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   ethereum-hoodi-erigon3-archive:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOODI_ERIGON3_VERSION:-v3.0.6}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOODI_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/ethereum/erigon3/ethereum-hoodi-erigon3-minimal-trace.yml b/ethereum/erigon3/ethereum-hoodi-erigon3-minimal-trace.yml
index 899577ba..0ee038a9 100644
--- a/ethereum/erigon3/ethereum-hoodi-erigon3-minimal-trace.yml
+++ b/ethereum/erigon3/ethereum-hoodi-erigon3-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   ethereum-hoodi-erigon3-minimal:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOODI_ERIGON3_VERSION:-v3.0.6}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOODI_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/ethereum/erigon3/ethereum-hoodi-erigon3-pruned-trace.yml b/ethereum/erigon3/ethereum-hoodi-erigon3-pruned-trace.yml
index 077c1f72..e5861044 100644
--- a/ethereum/erigon3/ethereum-hoodi-erigon3-pruned-trace.yml
+++ b/ethereum/erigon3/ethereum-hoodi-erigon3-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   ethereum-hoodi-erigon3:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOODI_ERIGON3_VERSION:-v3.0.6}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOODI_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/ethereum/erigon3/ethereum-mainnet-erigon3-archive-trace.yml b/ethereum/erigon3/ethereum-mainnet-erigon3-archive-trace.yml
index ba8f051b..d3643268 100644
--- a/ethereum/erigon3/ethereum-mainnet-erigon3-archive-trace.yml
+++ b/ethereum/erigon3/ethereum-mainnet-erigon3-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   ethereum-mainnet-erigon3-archive:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_MAINNET_ERIGON3_VERSION:-v3.0.6}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_MAINNET_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/ethereum/erigon3/ethereum-mainnet-erigon3-minimal-trace.yml b/ethereum/erigon3/ethereum-mainnet-erigon3-minimal-trace.yml
index f89abde0..2ea16b38 100644
--- a/ethereum/erigon3/ethereum-mainnet-erigon3-minimal-trace.yml
+++ b/ethereum/erigon3/ethereum-mainnet-erigon3-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   ethereum-mainnet-erigon3-minimal:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_MAINNET_ERIGON3_VERSION:-v3.0.6}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_MAINNET_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/ethereum/erigon3/ethereum-mainnet-erigon3-pruned-trace.yml b/ethereum/erigon3/ethereum-mainnet-erigon3-pruned-trace.yml
index 1836cbf6..b90947c3 100644
--- a/ethereum/erigon3/ethereum-mainnet-erigon3-pruned-trace.yml
+++ b/ethereum/erigon3/ethereum-mainnet-erigon3-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   ethereum-mainnet-erigon3:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_MAINNET_ERIGON3_VERSION:-v3.0.6}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_MAINNET_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/ethereum/erigon3/ethereum-sepolia-erigon3-archive-trace.yml b/ethereum/erigon3/ethereum-sepolia-erigon3-archive-trace.yml
index dc505fb9..0c64a077 100644
--- a/ethereum/erigon3/ethereum-sepolia-erigon3-archive-trace.yml
+++ b/ethereum/erigon3/ethereum-sepolia-erigon3-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   ethereum-sepolia-erigon3-archive:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_SEPOLIA_ERIGON3_VERSION:-v3.0.6}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_SEPOLIA_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/ethereum/erigon3/ethereum-sepolia-erigon3-minimal-trace.yml b/ethereum/erigon3/ethereum-sepolia-erigon3-minimal-trace.yml
index b5d9627b..257cb92f 100644
--- a/ethereum/erigon3/ethereum-sepolia-erigon3-minimal-trace.yml
+++ b/ethereum/erigon3/ethereum-sepolia-erigon3-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   ethereum-sepolia-erigon3-minimal:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_SEPOLIA_ERIGON3_VERSION:-v3.0.6}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_SEPOLIA_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/ethereum/erigon3/ethereum-sepolia-erigon3-pruned-trace.yml b/ethereum/erigon3/ethereum-sepolia-erigon3-pruned-trace.yml
index 1f098788..44374205 100644
--- a/ethereum/erigon3/ethereum-sepolia-erigon3-pruned-trace.yml
+++ b/ethereum/erigon3/ethereum-sepolia-erigon3-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   ethereum-sepolia-erigon3:
-    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_SEPOLIA_ERIGON3_VERSION:-v3.0.6}
+    image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_SEPOLIA_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/gnosis/erigon3/gnosis-chiado-erigon3-archive-trace.yml b/gnosis/erigon3/gnosis-chiado-erigon3-archive-trace.yml
index 1847be2a..9ee57b39 100644
--- a/gnosis/erigon3/gnosis-chiado-erigon3-archive-trace.yml
+++ b/gnosis/erigon3/gnosis-chiado-erigon3-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   gnosis-chiado-erigon3-archive:
-    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_CHIADO_ERIGON3_VERSION:-v3.0.6}
+    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_CHIADO_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/gnosis/erigon3/gnosis-chiado-erigon3-minimal-trace.yml b/gnosis/erigon3/gnosis-chiado-erigon3-minimal-trace.yml
index e6fc8648..e1464a57 100644
--- a/gnosis/erigon3/gnosis-chiado-erigon3-minimal-trace.yml
+++ b/gnosis/erigon3/gnosis-chiado-erigon3-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   gnosis-chiado-erigon3-minimal:
-    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_CHIADO_ERIGON3_VERSION:-v3.0.6}
+    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_CHIADO_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/gnosis/erigon3/gnosis-chiado-erigon3-pruned-trace.yml b/gnosis/erigon3/gnosis-chiado-erigon3-pruned-trace.yml
index 2e10c7bd..c22775ab 100644
--- a/gnosis/erigon3/gnosis-chiado-erigon3-pruned-trace.yml
+++ b/gnosis/erigon3/gnosis-chiado-erigon3-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   gnosis-chiado-erigon3:
-    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_CHIADO_ERIGON3_VERSION:-v3.0.6}
+    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_CHIADO_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/gnosis/erigon3/gnosis-mainnet-erigon3-archive-trace.yml b/gnosis/erigon3/gnosis-mainnet-erigon3-archive-trace.yml
index 437a2744..52ba225f 100644
--- a/gnosis/erigon3/gnosis-mainnet-erigon3-archive-trace.yml
+++ b/gnosis/erigon3/gnosis-mainnet-erigon3-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   gnosis-mainnet-erigon3-archive:
-    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_MAINNET_ERIGON3_VERSION:-v3.0.6}
+    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_MAINNET_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/gnosis/erigon3/gnosis-mainnet-erigon3-minimal-trace.yml b/gnosis/erigon3/gnosis-mainnet-erigon3-minimal-trace.yml
index f0eea864..7d688439 100644
--- a/gnosis/erigon3/gnosis-mainnet-erigon3-minimal-trace.yml
+++ b/gnosis/erigon3/gnosis-mainnet-erigon3-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   gnosis-mainnet-erigon3-minimal:
-    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_MAINNET_ERIGON3_VERSION:-v3.0.6}
+    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_MAINNET_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/gnosis/erigon3/gnosis-mainnet-erigon3-pruned-trace.yml b/gnosis/erigon3/gnosis-mainnet-erigon3-pruned-trace.yml
index 090f48bd..8fa690cd 100644
--- a/gnosis/erigon3/gnosis-mainnet-erigon3-pruned-trace.yml
+++ b/gnosis/erigon3/gnosis-mainnet-erigon3-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   gnosis-mainnet-erigon3:
-    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_MAINNET_ERIGON3_VERSION:-v3.0.6}
+    image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_MAINNET_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/linea/erigon3/linea-mainnet-erigon3-archive-trace.yml b/linea/erigon3/linea-mainnet-erigon3-archive-trace.yml
index 7a73e0ae..d872e9f0 100644
--- a/linea/erigon3/linea-mainnet-erigon3-archive-trace.yml
+++ b/linea/erigon3/linea-mainnet-erigon3-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   linea-mainnet-erigon3-archive:
-    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_MAINNET_ERIGON3_VERSION:-v3.0.6}
+    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_MAINNET_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/linea/erigon3/linea-mainnet-erigon3-minimal-trace.yml b/linea/erigon3/linea-mainnet-erigon3-minimal-trace.yml
index 2acf8f8f..5b0dbbe3 100644
--- a/linea/erigon3/linea-mainnet-erigon3-minimal-trace.yml
+++ b/linea/erigon3/linea-mainnet-erigon3-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   linea-mainnet-erigon3-minimal:
-    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_MAINNET_ERIGON3_VERSION:-v3.0.6}
+    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_MAINNET_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/linea/erigon3/linea-mainnet-erigon3-pruned-trace.yml b/linea/erigon3/linea-mainnet-erigon3-pruned-trace.yml
index 6106ab07..1a059a17 100644
--- a/linea/erigon3/linea-mainnet-erigon3-pruned-trace.yml
+++ b/linea/erigon3/linea-mainnet-erigon3-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   linea-mainnet-erigon3:
-    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_MAINNET_ERIGON3_VERSION:-v3.0.6}
+    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_MAINNET_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/linea/erigon3/linea-sepolia-erigon3-archive-trace.yml b/linea/erigon3/linea-sepolia-erigon3-archive-trace.yml
index 5e03c26c..8f3f2265 100644
--- a/linea/erigon3/linea-sepolia-erigon3-archive-trace.yml
+++ b/linea/erigon3/linea-sepolia-erigon3-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   linea-sepolia-erigon3-archive:
-    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_SEPOLIA_ERIGON3_VERSION:-v3.0.6}
+    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_SEPOLIA_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/linea/erigon3/linea-sepolia-erigon3-minimal-trace.yml b/linea/erigon3/linea-sepolia-erigon3-minimal-trace.yml
index 01ae8e9f..24aa256d 100644
--- a/linea/erigon3/linea-sepolia-erigon3-minimal-trace.yml
+++ b/linea/erigon3/linea-sepolia-erigon3-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   linea-sepolia-erigon3-minimal:
-    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_SEPOLIA_ERIGON3_VERSION:-v3.0.6}
+    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_SEPOLIA_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/linea/erigon3/linea-sepolia-erigon3-pruned-trace.yml b/linea/erigon3/linea-sepolia-erigon3-pruned-trace.yml
index a9c7cbe2..9c6f16cd 100644
--- a/linea/erigon3/linea-sepolia-erigon3-pruned-trace.yml
+++ b/linea/erigon3/linea-sepolia-erigon3-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   linea-sepolia-erigon3:
-    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_SEPOLIA_ERIGON3_VERSION:-v3.0.6}
+    image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_SEPOLIA_ERIGON3_VERSION:-v3.0.7}
     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 0edbeeea..32eae501 100644
--- a/polygon/erigon3/polygon-amoy-erigon3-archive-trace.yml
+++ b/polygon/erigon3/polygon-amoy-erigon3-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   polygon-amoy-erigon3-archive:
-    image: ${POLYGON_ERIGON3_IMAGE:-erigontech/erigon}:${POLYGON_AMOY_ERIGON3_VERSION:-v3.0.6}
+    image: ${POLYGON_ERIGON3_IMAGE:-erigontech/erigon}:${POLYGON_AMOY_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/polygon/erigon3/polygon-amoy-erigon3-minimal-trace.yml b/polygon/erigon3/polygon-amoy-erigon3-minimal-trace.yml
index f83bab75..d683d16c 100644
--- a/polygon/erigon3/polygon-amoy-erigon3-minimal-trace.yml
+++ b/polygon/erigon3/polygon-amoy-erigon3-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   polygon-amoy-erigon3-minimal:
-    image: ${POLYGON_ERIGON3_IMAGE:-erigontech/erigon}:${POLYGON_AMOY_ERIGON3_VERSION:-v3.0.6}
+    image: ${POLYGON_ERIGON3_IMAGE:-erigontech/erigon}:${POLYGON_AMOY_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/polygon/erigon3/polygon-amoy-erigon3-pruned-trace.yml b/polygon/erigon3/polygon-amoy-erigon3-pruned-trace.yml
index fd913a25..080329dd 100644
--- a/polygon/erigon3/polygon-amoy-erigon3-pruned-trace.yml
+++ b/polygon/erigon3/polygon-amoy-erigon3-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   polygon-amoy-erigon3:
-    image: ${POLYGON_ERIGON3_IMAGE:-erigontech/erigon}:${POLYGON_AMOY_ERIGON3_VERSION:-v3.0.6}
+    image: ${POLYGON_ERIGON3_IMAGE:-erigontech/erigon}:${POLYGON_AMOY_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/polygon/erigon3/polygon-mainnet-erigon3-archive-trace.yml b/polygon/erigon3/polygon-mainnet-erigon3-archive-trace.yml
index b49d5531..75815d15 100644
--- a/polygon/erigon3/polygon-mainnet-erigon3-archive-trace.yml
+++ b/polygon/erigon3/polygon-mainnet-erigon3-archive-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   polygon-mainnet-erigon3-archive:
-    image: ${POLYGON_ERIGON3_IMAGE:-erigontech/erigon}:${POLYGON_MAINNET_ERIGON3_VERSION:-v3.0.6}
+    image: ${POLYGON_ERIGON3_IMAGE:-erigontech/erigon}:${POLYGON_MAINNET_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/polygon/erigon3/polygon-mainnet-erigon3-minimal-trace.yml b/polygon/erigon3/polygon-mainnet-erigon3-minimal-trace.yml
index 2f8b74e1..8d1392ad 100644
--- a/polygon/erigon3/polygon-mainnet-erigon3-minimal-trace.yml
+++ b/polygon/erigon3/polygon-mainnet-erigon3-minimal-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   polygon-mainnet-erigon3-minimal:
-    image: ${POLYGON_ERIGON3_IMAGE:-erigontech/erigon}:${POLYGON_MAINNET_ERIGON3_VERSION:-v3.0.6}
+    image: ${POLYGON_ERIGON3_IMAGE:-erigontech/erigon}:${POLYGON_MAINNET_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
diff --git a/polygon/erigon3/polygon-mainnet-erigon3-pruned-trace.yml b/polygon/erigon3/polygon-mainnet-erigon3-pruned-trace.yml
index 1e02db76..a8fa136e 100644
--- a/polygon/erigon3/polygon-mainnet-erigon3-pruned-trace.yml
+++ b/polygon/erigon3/polygon-mainnet-erigon3-pruned-trace.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   polygon-mainnet-erigon3:
-    image: ${POLYGON_ERIGON3_IMAGE:-erigontech/erigon}:${POLYGON_MAINNET_ERIGON3_VERSION:-v3.0.6}
+    image: ${POLYGON_ERIGON3_IMAGE:-erigontech/erigon}:${POLYGON_MAINNET_ERIGON3_VERSION:-v3.0.7}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle