diff --git a/deb/debian-bookworm/Dockerfile b/deb/debian-bookworm/Dockerfile
index 25326b3524..b9125f0a05 100644
--- a/deb/debian-bookworm/Dockerfile
+++ b/deb/debian-bookworm/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_IMAGE
+ARG GO_IMAGE=golang:latest
 ARG DISTRO=debian
 ARG SUITE=bookworm
 ARG VERSION_ID=12
diff --git a/deb/debian-bullseye/Dockerfile b/deb/debian-bullseye/Dockerfile
index 61daeedb04..83e723e9c5 100644
--- a/deb/debian-bullseye/Dockerfile
+++ b/deb/debian-bullseye/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_IMAGE
+ARG GO_IMAGE=golang:latest
 ARG DISTRO=debian
 ARG SUITE=bullseye
 ARG VERSION_ID=11
diff --git a/deb/raspbian-bookworm/Dockerfile b/deb/raspbian-bookworm/Dockerfile
index fd3b089f82..18595a36ea 100644
--- a/deb/raspbian-bookworm/Dockerfile
+++ b/deb/raspbian-bookworm/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_IMAGE
+ARG GO_IMAGE=golang:latest
 ARG DISTRO=raspbian
 ARG SUITE=bookworm
 ARG VERSION_ID=12
diff --git a/deb/raspbian-bullseye/Dockerfile b/deb/raspbian-bullseye/Dockerfile
index 09a227928c..b8a5722a2e 100644
--- a/deb/raspbian-bullseye/Dockerfile
+++ b/deb/raspbian-bullseye/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_IMAGE
+ARG GO_IMAGE=golang:latest
 ARG DISTRO=raspbian
 ARG SUITE=bullseye
 ARG VERSION_ID=11
diff --git a/deb/ubuntu-focal/Dockerfile b/deb/ubuntu-focal/Dockerfile
index 32628f007d..dbca943097 100644
--- a/deb/ubuntu-focal/Dockerfile
+++ b/deb/ubuntu-focal/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_IMAGE
+ARG GO_IMAGE=golang:latest
 ARG DISTRO=ubuntu
 ARG SUITE=focal
 ARG VERSION_ID=20.04
diff --git a/deb/ubuntu-jammy/Dockerfile b/deb/ubuntu-jammy/Dockerfile
index 348e131c49..f3a46868a2 100644
--- a/deb/ubuntu-jammy/Dockerfile
+++ b/deb/ubuntu-jammy/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_IMAGE
+ARG GO_IMAGE=golang:latest
 ARG DISTRO=ubuntu
 ARG SUITE=jammy
 ARG VERSION_ID=22.04
diff --git a/deb/ubuntu-noble/Dockerfile b/deb/ubuntu-noble/Dockerfile
index 93cee15bfe..c2aaecc029 100644
--- a/deb/ubuntu-noble/Dockerfile
+++ b/deb/ubuntu-noble/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_IMAGE
+ARG GO_IMAGE=golang:latest
 ARG DISTRO=ubuntu
 ARG SUITE=noble
 ARG VERSION_ID=24.04
diff --git a/rpm/centos-9/Dockerfile b/rpm/centos-9/Dockerfile
index 577002c394..cec8acfef0 100644
--- a/rpm/centos-9/Dockerfile
+++ b/rpm/centos-9/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_IMAGE
+ARG GO_IMAGE=golang:latest
 ARG DISTRO=centos
 ARG SUITE=9
 ARG BUILD_IMAGE=quay.io/centos/${DISTRO}:stream${SUITE}
@@ -12,9 +12,9 @@ ENV GOPROXY=https://proxy.golang.org|direct
 ENV GO111MODULE=off
 ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
-ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
-ENV AUTO_GOPATH 1
-ENV DOCKER_BUILDTAGS exclude_graphdriver_btrfs
+ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
+ENV AUTO_GOPATH=1
+ENV DOCKER_BUILDTAGS=exclude_graphdriver_btrfs
 ARG DISTRO
 ARG SUITE
 ENV DISTRO=${DISTRO}
diff --git a/rpm/fedora-39/Dockerfile b/rpm/fedora-39/Dockerfile
index 140f374922..7a476863fb 100644
--- a/rpm/fedora-39/Dockerfile
+++ b/rpm/fedora-39/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_IMAGE
+ARG GO_IMAGE=golang:latest
 ARG DISTRO=fedora
 ARG SUITE=39
 ARG BUILD_IMAGE=${DISTRO}:${SUITE}
@@ -10,10 +10,10 @@ FROM ${GO_IMAGE} AS golang
 FROM ${BUILD_IMAGE}
 ENV GOPROXY=https://proxy.golang.org|direct
 ENV GO111MODULE=off
-ENV GOPATH /go
+ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
-ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
-ENV AUTO_GOPATH 1
+ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
+ENV AUTO_GOPATH=1
 ARG DISTRO
 ARG SUITE
 ENV DISTRO=${DISTRO}
diff --git a/rpm/fedora-40/Dockerfile b/rpm/fedora-40/Dockerfile
index a79bbc3570..3d717c491d 100644
--- a/rpm/fedora-40/Dockerfile
+++ b/rpm/fedora-40/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_IMAGE
+ARG GO_IMAGE=golang:latest
 ARG DISTRO=fedora
 ARG SUITE=40
 ARG BUILD_IMAGE=${DISTRO}:${SUITE}
@@ -10,10 +10,10 @@ FROM ${GO_IMAGE} AS golang
 FROM ${BUILD_IMAGE}
 ENV GOPROXY=https://proxy.golang.org|direct
 ENV GO111MODULE=off
-ENV GOPATH /go
+ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
-ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
-ENV AUTO_GOPATH 1
+ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
+ENV AUTO_GOPATH=1
 ARG DISTRO
 ARG SUITE
 ENV DISTRO=${DISTRO}
diff --git a/rpm/rhel-8/Dockerfile b/rpm/rhel-8/Dockerfile
index d4b120cf97..89152a39f2 100644
--- a/rpm/rhel-8/Dockerfile
+++ b/rpm/rhel-8/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_IMAGE
+ARG GO_IMAGE=golang:latest
 ARG DISTRO=rhel
 ARG SUITE=8
 ARG BUILD_IMAGE=registry.access.redhat.com/ubi8/ubi
@@ -29,9 +29,9 @@ ENV GOPROXY=https://proxy.golang.org|direct
 ENV GO111MODULE=off
 ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
-ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
-ENV AUTO_GOPATH 1
-ENV DOCKER_BUILDTAGS exclude_graphdriver_btrfs
+ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
+ENV AUTO_GOPATH=1
+ENV DOCKER_BUILDTAGS=exclude_graphdriver_btrfs
 ARG DISTRO
 ARG SUITE
 ENV DISTRO=${DISTRO}
diff --git a/rpm/rhel-9/Dockerfile b/rpm/rhel-9/Dockerfile
index 526bf8bdbc..457690a74b 100644
--- a/rpm/rhel-9/Dockerfile
+++ b/rpm/rhel-9/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_IMAGE
+ARG GO_IMAGE=golang:latest
 ARG DISTRO=rhel
 ARG SUITE=9
 ARG BUILD_IMAGE=registry.access.redhat.com/ubi9/ubi
@@ -29,9 +29,9 @@ ENV GOPROXY=https://proxy.golang.org|direct
 ENV GO111MODULE=off
 ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
-ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
-ENV AUTO_GOPATH 1
-ENV DOCKER_BUILDTAGS exclude_graphdriver_btrfs
+ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
+ENV AUTO_GOPATH=1
+ENV DOCKER_BUILDTAGS=exclude_graphdriver_btrfs
 ARG DISTRO
 ARG SUITE
 ENV DISTRO=${DISTRO}