diff --git a/scripts/build-all-components.sh b/scripts/build-all-components.sh
index 5af1e7200..5d190c270 100755
--- a/scripts/build-all-components.sh
+++ b/scripts/build-all-components.sh
@@ -47,17 +47,20 @@ echo "Building ${TARGET} for all packages to ${DIST_DIR}"
 : "${NVIDIA_CONTAINER_TOOLKIT_ROOT:=${PROJECT_ROOT}}"
 
 
-"${SCRIPTS_DIR}/get-component-versions.sh"
-
 if [[ -z "${NVIDIA_CONTAINER_TOOLKIT_VERSION}" || -z "${LIBNVIDIA_CONTAINER_VERSION}" ]]; then
 eval $(${SCRIPTS_DIR}/get-component-versions.sh)
 fi
 
+if [[ -z "${GOLANG_VERSION}" ]]; then
+    GOLANG_VERSION=$(${PROJECT_ROOT}/hack/golang-version.sh)
+fi
+
 # Build libnvidia-container
 if [[ -z ${SKIP_LIBNVIDIA_CONTAINER} ]]; then
     make -C "${LIBNVIDIA_CONTAINER_ROOT}" -f mk/docker.mk \
         LIB_VERSION=${NVIDIA_CONTAINER_TOOLKIT_VERSION} \
         LIB_TAG=${NVIDIA_CONTAINER_TOOLKIT_TAG} \
+        GOLANG_VERSION=${GOLANG_VERSION} \
         "${TARGET}"
 fi
 
diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container
index 584976aba..a83ddc087 160000
--- a/third_party/libnvidia-container
+++ b/third_party/libnvidia-container
@@ -1 +1 @@
-Subproject commit 584976abaef996d9466232a9bc7426fcdb0ed1e0
+Subproject commit a83ddc087e255fa88612f7d6afa43acdd71ddd96