diff --git a/Dockerfile b/Dockerfile
index 6e303d8945..43a40dc987 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ARG BUILDNUM=""
 # Build Geth in a stock Go builder container
 FROM golang:1.17-alpine as builder
 
-ENV GOPROXY https://goproxy.io,direct
+ENV GOPROXY https://proxy.golang.org,direct
 
 ADD . /go-ethereum
 RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates \
diff --git a/Jenkinsfile b/build/jenkins/Jenkinsfile
similarity index 100%
rename from Jenkinsfile
rename to build/jenkins/Jenkinsfile
diff --git a/push-docker-tag.Jenkinsfile b/build/jenkins/push-docker-tag.Jenkinsfile
similarity index 100%
rename from push-docker-tag.Jenkinsfile
rename to build/jenkins/push-docker-tag.Jenkinsfile