diff --git a/README.md b/README.md
index bbabcef..3f0ec98 100644
--- a/README.md
+++ b/README.md
@@ -119,6 +119,15 @@ GitLab package registry. The install for Chrome will use registry to fetch corre
 Make sure a certain version is cached before updating it in build jobs.
 See `scripts/cache-google-chrome` for more details.
 
+## Note regarding Golang and FIPS
+
+When adding support for a new major/minor Golang version, we also need to 
+ensure there's a matching [`golang-fips`](https://github.com/golang-fips/) 
+branch available, e.g. for Golang 1.21 there's https://github.com/golang-fips/go/tree/go1.21-fips-release.
+The `golang-fips` branch creation process can take time and so it 
+[may be necessary to use the previous version](https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/771) 
+until it's available.
+
 ## Contributing
 
 See [Contributing](CONTRIBUTING.md)
diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build
index 9c1a034..e37011a 100755
--- a/scripts/lib/custom-docker-build
+++ b/scripts/lib/custom-docker-build
@@ -38,6 +38,8 @@ function print_image_args() {
 function print_golang_args() {
     declare -A GOLANG_DOWNLOAD_SHA256
 
+    # NOTE: See https://gitlab.com/gitlab-org/gitlab-build-images#note-regarding-golang-and-fips
+    #       when adding a new major/minor Golang version.
     case "$1" in
         1.20)
             INSTALL_GOLANG_VERSION=1.20.13 # Update scripts/install-golang for FIPS if this version is bumped