diff --git a/docker/README.md b/docker/README.md
index 61072843..a36e787d 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -84,7 +84,7 @@ This image contains all the npm dependencies and zkevm contracts compiled for a
 Build the `zkevm-contracts` image.
 
 ```bash
-version="v9.0.0-rc.2-pp"
+version="v9.0.0-rc.2-pp-fork.12"
 docker build . \
   --tag local/zkevm-contracts:$version \
   --build-arg ZKEVM_CONTRACTS_BRANCH=$version \
@@ -96,8 +96,8 @@ Check the size of the image.
 
 ```bash
 $ docker images --filter "reference=local/zkevm-contracts"
-REPOSITORY              TAG              IMAGE ID       CREATED          SIZE
-local/zkevm-contracts   v9.0.0-rc.2-pp   bdf8225cfa77   7 minutes ago    2.54GB
+REPOSITORY              TAG                      IMAGE ID       CREATED          SIZE
+local/zkevm-contracts   v9.0.0-rc.2-pp-fork.12   bdf8225cfa77   7 minutes ago    2.54GB
 ```
 
 (Optional) Push image to the Docker Hub.
diff --git a/docker/toolbox.Dockerfile b/docker/toolbox.Dockerfile
index 0d7ea22c..26fea5e8 100644
--- a/docker/toolbox.Dockerfile
+++ b/docker/toolbox.Dockerfile
@@ -2,14 +2,14 @@ FROM golang:1.21 AS polycli-builder
 ARG POLYCLI_VERSION
 WORKDIR /opt/polygon-cli
 RUN git clone --branch ${POLYCLI_VERSION} https://github.com/maticnetwork/polygon-cli.git . \
-  && go build -o polycli main.go
+  && make build
 
 
 FROM ubuntu:24.04
 LABEL author="devtools@polygon.technology"
 LABEL description="Blockchain toolbox"
 
-COPY --from=polycli-builder /opt/polygon-cli/polycli /usr/bin/polycli
+COPY --from=polycli-builder /opt/polygon-cli/out/polycli /usr/bin/polycli
 COPY --from=polycli-builder /opt/polygon-cli/bindings /opt/bindings
 # WARNING (DL3008): Pin versions in apt get install.
 # WARNING (DL3013): Pin versions in pip.
@@ -17,10 +17,11 @@ COPY --from=polycli-builder /opt/polygon-cli/bindings /opt/bindings
 # WARNING (SC1091): (Sourced) file not included in mock.
 # hadolint ignore=DL3008,DL3013,DL4006,SC1091
 RUN apt-get update \
-  && apt-get install --no-install-recommends --yes curl git jq python3-pip \
+  && apt-get install --yes --no-install-recommends curl git jq pipx \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/* \
-  && pip3 install --no-cache-dir yq \
+  && pipx ensurepath \
+  && pipx install yq \
   && curl --silent --location --proto "=https" https://foundry.paradigm.xyz | bash \
   && /root/.foundry/bin/foundryup \
   && cp /root/.foundry/bin/* /usr/local/bin
diff --git a/docker/zkevm-contracts.Dockerfile b/docker/zkevm-contracts.Dockerfile
index 28b95fbe..92ea5622 100644
--- a/docker/zkevm-contracts.Dockerfile
+++ b/docker/zkevm-contracts.Dockerfile
@@ -2,7 +2,7 @@ FROM golang:1.21 AS polycli-builder
 ARG POLYCLI_VERSION
 WORKDIR /opt/polygon-cli
 RUN git clone --branch ${POLYCLI_VERSION} https://github.com/maticnetwork/polygon-cli.git . \
-  && go build -o polycli main.go
+  && make build
 
 
 FROM node:22-bookworm
@@ -19,17 +19,18 @@ RUN git clone  https://github.com/0xPolygonHermez/zkevm-contracts . \
   && npx hardhat compile
 
 # STEP 2: Install tools.
-COPY --from=polycli-builder /opt/polygon-cli/polycli /usr/bin/polycli
+COPY --from=polycli-builder /opt/polygon-cli/out/polycli /usr/bin/polycli
 WORKDIR /opt
 # WARNING (DL3008): Pin versions in apt get install.
 # WARNING (DL3013): Pin versions in pip.
 # WARNING (DL4006): Set the SHELL option -o pipefail before RUN with a pipe in it
 # hadolint ignore=DL3008,DL3013,DL4006
 RUN apt-get update \
-  && apt-get install --no-install-recommends --yes jq python3-pip \
+  && apt-get install --yes --no-install-recommends curl git jq pipx \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/* \
-  && pip3 install --break-system-packages --no-cache-dir yq \
+  && pipx ensurepath \
+  && pipx install yq \
   && curl --silent --location --proto "=https" https://foundry.paradigm.xyz | bash \
   && /root/.foundry/bin/foundryup \
   && cp /root/.foundry/bin/* /usr/local/bin
diff --git a/docs/trigger-a-reorg/network-helper.Dockerfile b/docs/trigger-a-reorg/network-helper.Dockerfile
index b47943e4..0a5c3324 100644
--- a/docs/trigger-a-reorg/network-helper.Dockerfile
+++ b/docs/trigger-a-reorg/network-helper.Dockerfile
@@ -1,9 +1,9 @@
 FROM golang:1.21 AS polycli-builder
 WORKDIR /opt/polygon-cli
 RUN git clone https://github.com/maticnetwork/polygon-cli.git . \
-  && CGO_ENABLED=0 go build -o polycli main.go
+  && make build
 
 FROM nicolaka/netshoot:v0.12
 LABEL author="devtools@polygon.technology"
 LABEL description="Helper image to debug network issues"
-COPY --from=polycli-builder /opt/polygon-cli/polycli /usr/local/bin/polycli
+COPY --from=polycli-builder /opt/polygon-cli/out/polycli /usr/local/bin/polycli
diff --git a/src/package_io/constants.star b/src/package_io/constants.star
index 4ddb4539..936d23f2 100644
--- a/src/package_io/constants.star
+++ b/src/package_io/constants.star
@@ -16,4 +16,4 @@ SEQUENCER_NAME = struct(
     ZKEVM="zkevm-node-sequencer",
 )
 
-TX_SPAMMER_IMG = "leovct/toolbox:0.0.4"
+TX_SPAMMER_IMG = "leovct/toolbox:0.0.5"