diff --git a/Dockerfile b/Dockerfile
index 6faa604b9..8bf8f28fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,20 +4,28 @@ ARG VERSION=""
 ARG BUILDNUM=""
 
 # Build Geth in a stock Go builder container
-FROM golang:1.20-alpine as builder
+FROM golang:1.20-alpine3.18 as builder
 
 RUN apk add --no-cache gcc musl-dev binutils-gold linux-headers git
 
-# Get dependencies - will also be cached if we won't change go.mod/go.sum
-COPY go.mod /go-ethereum/
-COPY go.sum /go-ethereum/
-RUN cd /go-ethereum && go mod download
+# Configure creds for gitea
+ARG GIT_VDBTO_TOKEN
 
-ADD . /go-ethereum
-RUN cd /go-ethereum/wrapmain && go build --trimpath -o /go-ethereum/build/bin/geth .
+# Get dependencies - will also be cached if we won't change go.mod/go.sum
+WORKDIR /go-ethereum/
+COPY go.mod .
+COPY go.sum .
+COPY wrapmain wrapmain
+RUN if [ -n "$GIT_VDBTO_TOKEN" ]; then git config --global url."https://$GIT_VDBTO_TOKEN:@git.vdb.to/".insteadOf "https://git.vdb.to/"; fi && \
+    cd wrapmain && \
+    go mod download && \
+    rm -f ~/.gitconfig
+
+COPY . .
+RUN cd wrapmain && go build --trimpath -o /go-ethereum/build/bin/geth .
 
 # Pull Geth into a second stage deploy alpine container
-FROM alpine:latest
+FROM alpine:3.18
 
 RUN apk add --no-cache ca-certificates
 COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/