diff --git a/docker/retesteth/Dockerfile b/docker/retesteth/Dockerfile
index 21d0906d83..6346c37a79 100644
--- a/docker/retesteth/Dockerfile
+++ b/docker/retesteth/Dockerfile
@@ -4,12 +4,14 @@ ENV LDFLAGS="-static"
 WORKDIR /build
 
 FROM base as tests
-RUN git clone --depth 1 -b zkevm https://github.com/privacy-scaling-explorations/eth-tests.git /tests
+RUN git clone --depth 1 -b develop https://github.com/ethereum/tests.git /tests
 
 FROM base AS retesteth
 RUN git clone --depth 1 -b develop https://github.com/ethereum/retesteth.git /retesteth
 RUN cmake /retesteth -DCMAKE_BUILD_TYPE=Release && make && cp retesteth/retesteth /target
 
+# lllc compiles Lisp Like Language, an old Ethereum smart contract language that is still in use in tests.
+# Ref: https://github.com/ethereum/retesteth
 FROM alpine:3.13 AS lllc
 RUN apk add --no-cache alpine-sdk cmake linux-headers boost-dev boost-static
 ENV LDFLAGS="-static"
@@ -18,10 +20,11 @@ RUN git clone --depth 1 -b master https://github.com/winsvega/solidity.git /lllc
 RUN cmake /lllc -DCMAKE_BUILD_TYPE=Release -DLLL=1 && make lllc && cp lllc/lllc /target
 
 FROM base AS solc
-RUN git clone --depth 1 -b v0.8.5 https://github.com/ethereum/solidity.git /solidity
+RUN git clone --depth 1 -b v0.8.24 https://github.com/ethereum/solidity.git /solidity
 RUN touch /solidity/prerelease.txt && cmake /solidity -DCMAKE_BUILD_TYPE=Release && make solc && cp solc/solc /target
 
-FROM golang:1.18-alpine as geth
+# Ref: https://github.com/ethereum/go-ethereum/blob/master/Dockerfile
+FROM golang:1.21-alpine as geth
 RUN apk add --no-cache gcc musl-dev linux-headers git
 WORKDIR /go-ethereum
 COPY go.mod .
diff --git a/docker/retesteth/Dockerfile-light b/docker/retesteth/Dockerfile-light
index 9f0e6a1343..717c268033 100644
--- a/docker/retesteth/Dockerfile-light
+++ b/docker/retesteth/Dockerfile-light
@@ -4,13 +4,13 @@ ENV LDFLAGS="-static"
 WORKDIR /build
 
 FROM base as tests
-RUN git clone --depth 1 -b zkevm https://github.com/privacy-scaling-explorations/eth-tests.git /tests
+RUN git clone --depth 1 -b develop https://github.com/ethereum/tests.git /tests
 
 FROM base AS retesteth
 RUN git clone --depth 1 -b develop https://github.com/ethereum/retesteth.git /retesteth
 RUN cmake /retesteth -DCMAKE_BUILD_TYPE=Release && make && cp retesteth/retesteth /target
 
-FROM golang:1.18-alpine as geth
+FROM golang:1.21-alpine as geth
 RUN apk add --no-cache gcc musl-dev linux-headers git
 WORKDIR /go-ethereum
 COPY go.mod .