diff --git a/Makefile b/Makefile
index c5d1dfcd..f145be68 100644
--- a/Makefile
+++ b/Makefile
@@ -149,6 +149,7 @@ $(DRIVER_BUILD_TARGETS):
 				$(DOCKER_BUILD_PLATFORM_OPTIONS) \
 				--tag $(IMAGE) \
 				--build-arg DRIVER_VERSION="$(DRIVER_VERSION)" \
+				--build-arg GOLANG_VERSION="$(GOLANG_VERSION)" \
 				--build-arg DRIVER_BRANCH="$(DRIVER_BRANCH)" \
 				--build-arg CUDA_VERSION="$(CUDA_VERSION)" \
 				--build-arg CVE_UPDATES="$(CVE_UPDATES)" \
@@ -186,6 +187,7 @@ $(BASE_BUILD_TARGETS):
 				--tag $(IMAGE)  \
 				--target $(TARGET) \
 				--build-arg CUDA_VERSION="$(CUDA_VERSION)" \
+				--build-arg GOLANG_VERSION="$(GOLANG_VERSION)" \
 				--build-arg DRIVER_BRANCH="$(DRIVER_BRANCH)" \
 				--build-arg KERNEL_FLAVOR="$(KERNEL_FLAVOR)" \
 				--file $(DOCKERFILE) \
diff --git a/rhel8/Dockerfile b/rhel8/Dockerfile
index d19c980f..28e16867 100644
--- a/rhel8/Dockerfile
+++ b/rhel8/Dockerfile
@@ -1,13 +1,12 @@
 FROM nvcr.io/nvidia/cuda:12.6.2-base-ubi8 as build
 
 ARG TARGETARCH
+ARG GOLANG_VERSION
 
 SHELL ["/bin/bash", "-c"]
 
 RUN dnf install -y git wget
 
-ENV GOLANG_VERSION=1.22.7
-
 # download appropriate binary based on the target architecture for multi-arch builds
 RUN OS_ARCH=${TARGETARCH/x86_64/amd64} && OS_ARCH=${OS_ARCH/aarch64/arm64} && \
     curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-${OS_ARCH}.tar.gz \
diff --git a/rhel9/Dockerfile b/rhel9/Dockerfile
index 39f33647..8ba861c7 100644
--- a/rhel9/Dockerfile
+++ b/rhel9/Dockerfile
@@ -1,13 +1,12 @@
 FROM nvcr.io/nvidia/cuda:12.6.2-base-ubi9 as build
 
 ARG TARGETARCH
+ARG GOLANG_VERSION
 
 SHELL ["/bin/bash", "-c"]
 
 RUN dnf install -y git wget
 
-ENV GOLANG_VERSION=1.22.7
-
 # download appropriate binary based on the target architecture for multi-arch builds
 RUN OS_ARCH=${TARGETARCH/x86_64/amd64} && OS_ARCH=${OS_ARCH/aarch64/arm64} && \
     curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-${OS_ARCH}.tar.gz \
diff --git a/ubuntu20.04/Dockerfile b/ubuntu20.04/Dockerfile
index feb4bdf3..21b47619 100644
--- a/ubuntu20.04/Dockerfile
+++ b/ubuntu20.04/Dockerfile
@@ -1,6 +1,7 @@
 FROM nvcr.io/nvidia/cuda:12.6.2-base-ubuntu20.04 as build
 
 ARG TARGETARCH
+ARG GOLANG_VERSION
 
 SHELL ["/bin/bash", "-c"]
 
@@ -17,8 +18,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         git && \
     rm -rf /var/lib/apt/lists/*
 
-ENV GOLANG_VERSION=1.22.7
-
 # download appropriate binary based on the target architecture for multi-arch builds
 RUN OS_ARCH=${TARGETARCH/x86_64/amd64} && OS_ARCH=${OS_ARCH/aarch64/arm64} && \
     curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-${OS_ARCH}.tar.gz \
diff --git a/ubuntu22.04/Dockerfile b/ubuntu22.04/Dockerfile
index 539bd9a7..5ef5041a 100644
--- a/ubuntu22.04/Dockerfile
+++ b/ubuntu22.04/Dockerfile
@@ -1,6 +1,7 @@
 FROM nvcr.io/nvidia/cuda:12.6.2-base-ubuntu22.04 as build
 
 ARG TARGETARCH
+ARG GOLANG_VERSION
 
 SHELL ["/bin/bash", "-c"]
 
@@ -17,8 +18,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         git && \
     rm -rf /var/lib/apt/lists/*
 
-ENV GOLANG_VERSION=1.22.7
-
 # download appropriate binary based on the target architecture for multi-arch builds
 RUN OS_ARCH=${TARGETARCH/x86_64/amd64} && OS_ARCH=${OS_ARCH/aarch64/arm64} && \
     curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-${OS_ARCH}.tar.gz \
diff --git a/versions.mk b/versions.mk
index 8fd5d738..0e032753 100644
--- a/versions.mk
+++ b/versions.mk
@@ -16,3 +16,5 @@
 DRIVER_VERSIONS ?= 535.183.06 550.90.12 560.35.03
 
 CUDA_VERSION := 12.6.0
+
+GOLANG_VERSION := 1.22.8