diff --git a/.gitlab/ci/gitaly.images.yml b/.gitlab/ci/gitaly.images.yml
index 97f8667..51fc282 100644
--- a/.gitlab/ci/gitaly.images.yml
+++ b/.gitlab/ci/gitaly.images.yml
@@ -16,10 +16,10 @@ gitaly:
   parallel:
     matrix:
       - OS: ['debian:bullseye']
-        GOLANG: ['1.19', '1.20']
+        GOLANG: ['1.19', '1.20', '1.21']
         RUST: ['1.65']
         GIT: ['2.36']
       - OS: ['ubi:8.6']
-        GOLANG: ['1.19', '1.20']
+        GOLANG: ['1.19', '1.20', '1.21']
         RUST: ['1.65']
         GIT: ['2.36']
diff --git a/.gitlab/ci/gitlab.images.yml b/.gitlab/ci/gitlab.images.yml
index ff72fdc..0a0273a 100644
--- a/.gitlab/ci/gitlab.images.yml
+++ b/.gitlab/ci/gitlab.images.yml
@@ -26,7 +26,7 @@ gitlab:
         RUBY: ['3.0.patched', '3.1.patched', '3.2.patched']
         GIT: ['2.36']
         POSTGRESQL: ['12', '13', '14', '15']
-        GOLANG: ['1.19', '1.20']
+        GOLANG: ['1.19', '1.20', '1.21']
         RUST: ['1.65']
         NODE: ['18.17']
         CHROME: ['109', '113']
@@ -73,11 +73,11 @@ gitlab-workhorse:
     matrix:
       - OS: ['debian:bullseye']
         RUBY: ['3.0', '3.1', '3.2']
-        GOLANG: ['1.19', '1.20']
+        GOLANG: ['1.19', '1.20', '1.21']
         RUST: ['1.65']
         GIT: ['2.36']
       - OS: ['ubi:8.6']
         RUBY: ['3.0', '3.1', '3.2']
-        GOLANG: ['1.19', '1.20']
+        GOLANG: ['1.19', '1.20', '1.21']
         RUST: ['1.65']
         GIT: ['2.36']
diff --git a/scripts/install-golang b/scripts/install-golang
index 85d98cd..975fd03 100755
--- a/scripts/install-golang
+++ b/scripts/install-golang
@@ -32,6 +32,9 @@ function build_ubi() {
         # This is a workaround until https://github.com/golang-fips/go/issues/82 is resolved.
         if [[ $GO_MAJOR_VERSION == "1.20" ]]; then
             GO_BRANCH="go1.20.5-2-openssl-fips"
+        # This is a workaround until https://github.com/golang-fips/go/pull/107 is released.
+        elif [[ $GO_MAJOR_VERSION == "1.21" ]]; then
+            GO_BRANCH="go1.20.6-1-openssl-fips"
         else
             GO_BRANCH="go${GO_MAJOR_VERSION}-fips-release"
         fi
diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build
index 9f3212c..5351c38 100755
--- a/scripts/lib/custom-docker-build
+++ b/scripts/lib/custom-docker-build
@@ -54,6 +54,11 @@ function print_golang_args() {
             GOLANG_DOWNLOAD_SHA256[amd64]="d7ec48cde0d3d2be2c69203bc3e0a44de8660b9c09a6e85c4732a3f7dc442612"
             GOLANG_DOWNLOAD_SHA256[arm64]="aa2fab0a7da20213ff975fa7876a66d47b48351558d98851b87d1cfef4360d09"
             ;;
+        1.21)
+            INSTALL_GOLANG_VERSION=1.21.0 # Update scripts/install-golang for FIPS if this version is bumped
+            GOLANG_DOWNLOAD_SHA256[amd64]="d0398903a16ba2232b389fb31032ddf57cac34efda306a0eebac34f0965a0742"
+            GOLANG_DOWNLOAD_SHA256[arm64]="f3d4548edf9b22f26bbd49720350bbfe59d75b7090a1a2bff1afad8214febaf3"
+            ;;
         *) fail "Unknown golang version $1" ;;
     esac