diff --git a/versions.mk b/versions.mk
index b54951e..6826a1e 100644
--- a/versions.mk
+++ b/versions.mk
@@ -21,6 +21,7 @@ REGISTRY ?= nvcr.io/nvidia/cloud-native
 
 VERSION  ?= $(GIT_TAG)
 
-GOLANG_VERSION ?= 1.20.4
+GOLANG_VERSION ?= 1.24.4
 
-BUILDIMAGE ?= ghcr.io/nvidia/k8s-test-infra:devel-go$(GOLANG_VERSION)
+BUILDIMAGE_TAG ?= $(GOLANG_VERSION)-bookworm
+BUILDIMAGE ?=  golang:$(BUILDIMAGE_TAG)