diff --git a/build/common.sh b/build/common.sh
index c0916c26e47..030ffd41902 100755
--- a/build/common.sh
+++ b/build/common.sh
@@ -540,6 +540,7 @@ function kube::build::run_build_command_ex() {
     --env "KUBE_BUILD_PLATFORMS=${KUBE_BUILD_PLATFORMS:-}"
     --env "KUBE_CGO_OVERRIDES=' ${KUBE_CGO_OVERRIDES[*]:-} '"
     --env "KUBE_STATIC_OVERRIDES=' ${KUBE_STATIC_OVERRIDES[*]:-} '"
+    --env "KUBE_RACE=${KUBE_RACE:-}"
     --env "FORCE_HOST_GO=${FORCE_HOST_GO:-}"
     --env "GO_VERSION=${GO_VERSION:-}"
     --env "GOTOOLCHAIN=${GOTOOLCHAIN:-}"
diff --git a/build/lib/release.sh b/build/lib/release.sh
index 1bf19257d53..4a086bdb39d 100644
--- a/build/lib/release.sh
+++ b/build/lib/release.sh
@@ -332,7 +332,7 @@ function kube::release::create_docker_images_for_server() {
           docker_file_path="${KUBE_ROOT}/build/server-image/${binary_name}/Dockerfile"
       fi
 
-      kube::log::status "Starting docker build for image: ${binary_name}-${arch}"
+      kube::log::status "Starting docker build for image: ${binary_name}-${arch} with base ${base_image}"
       (
         rm -rf "${docker_build_path}"
         mkdir -p "${docker_build_path}"
diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
index e4d97707cc5..ae48527885c 100755
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -836,7 +836,7 @@ kube::golang::build_binaries_for_platform() {
       kube::log::info "    ${binary} (static)"
     else
       nonstatics+=("${binary}")
-      kube::log::info "    ${binary} (non-static)"
+      kube::log::info "    ${binary} (non-static${KUBE_RACE:+, race detection})"
     fi
    done
 
@@ -862,6 +862,9 @@ kube::golang::build_binaries_for_platform() {
       -ldflags="${goldflags}"
       -tags="${gotags:-}"
     )
+    if [[ -n "${KUBE_RACE:-}" ]]; then
+        build_args+=("${KUBE_RACE}")
+    fi
     kube::golang::build_some_binaries "${nonstatics[@]}"
   fi