diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68e899e..e1f0d83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,21 +79,33 @@ variables:
 ruby-2.7-golang-1.14-git-2.29 test: *test_custom
 ruby-2.7-golang-1.15-git-2.29 test: *test_custom
 ruby-2.7-golang-1.15-git-2.29-pgbouncer-1.14 test: *test_custom
+ruby-2.7-golang-1.14-git-2.31 test: *test_custom
+ruby-2.7-golang-1.15-git-2.31 test: *test_custom
+ruby-2.7-golang-1.15-git-2.31-pgbouncer-1.14 test: *test_custom
 
 # Used by GitLab: https://gitlab.com/gitlab-org/gitlab/blob/master/.gitlab-ci.yml
 ruby-2.7.2.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 test: *test_custom
 ruby-2.7.2.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 test: *test_custom
 ruby-3.0.0.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 test: *test_custom
 ruby-3.0.0.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 test: *test_custom
+ruby-2.7.2.patched-golang-1.14-git-2.31-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 test: *test_custom
+ruby-2.7.2.patched-golang-1.14-git-2.31-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 test: *test_custom
+ruby-3.0.0.patched-golang-1.14-git-2.31-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 test: *test_custom
+ruby-3.0.0.patched-golang-1.14-git-2.31-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 test: *test_custom
 
 # Used by GitLab's compile-production-assets and compile-test-assets jobs
 ruby-2.7.2-git-2.29-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 test: *test_custom
 ruby-3.0.0-git-2.29-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 test: *test_custom
+ruby-2.7.2-git-2.31-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 test: *test_custom
+ruby-3.0.0-git-2.31-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 test: *test_custom
 
 # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
 ruby-2.6.5-git-2.29-chrome-74.0-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom
 ruby-2.6.5-git-2.29-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom
 ruby-2.7.2-git-2.29-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom
+ruby-2.6.5-git-2.31-chrome-74.0-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom
+ruby-2.6.5-git-2.31-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom
+ruby-2.7.2-git-2.31-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom
 
 # Used by customers-gitlab-com rspec job: https://gitlab.com/gitlab-org/customers-gitlab-com/-/blob/staging/.gitlab-ci.yml
 ruby-2.6.6-golang-1.14-git-2.31-lfs-2.9-chrome-81.0-node-12.18-yarn-1.21-postgresql-9.5-graphicsmagick-1.3.36: *test_custom
@@ -140,21 +152,33 @@ gitlab-operator-build-base test: *test_build
 ruby-2.7-golang-1.14-git-2.29 push: *build_and_deploy_custom
 ruby-2.7-golang-1.15-git-2.29 push: *build_and_deploy_custom
 ruby-2.7-golang-1.15-git-2.29-pgbouncer-1.14 push: *build_and_deploy_custom
+ruby-2.7-golang-1.14-git-2.31 push: *build_and_deploy_custom
+ruby-2.7-golang-1.15-git-2.31 push: *build_and_deploy_custom
+ruby-2.7-golang-1.15-git-2.31-pgbouncer-1.14 push: *build_and_deploy_custom
 
 # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
 ruby-2.7.2.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 push: *build_and_deploy_custom
 ruby-2.7.2.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 push: *build_and_deploy_custom
 ruby-3.0.0.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 push: *build_and_deploy_custom
 ruby-3.0.0.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 push: *build_and_deploy_custom
+ruby-2.7.2.patched-golang-1.14-git-2.31-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 push: *build_and_deploy_custom
+ruby-2.7.2.patched-golang-1.14-git-2.31-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 push: *build_and_deploy_custom
+ruby-3.0.0.patched-golang-1.14-git-2.31-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 push: *build_and_deploy_custom
+ruby-3.0.0.patched-golang-1.14-git-2.31-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 push: *build_and_deploy_custom
 
 # Used by GitLab's compile-production-assets and compile-test-assets jobs
 ruby-2.7.2-git-2.29-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 push: *build_and_deploy_custom
 ruby-3.0.0-git-2.29-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 push: *build_and_deploy_custom
+ruby-2.7.2-git-2.31-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 push: *build_and_deploy_custom
+ruby-3.0.0-git-2.31-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 push: *build_and_deploy_custom
 
 # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
 ruby-2.6.5-git-2.29-chrome-74.0-node-12.18-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom
 ruby-2.6.5-git-2.29-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom
 ruby-2.7.2-git-2.29-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom
+ruby-2.6.5-git-2.31-chrome-74.0-node-12.18-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom
+ruby-2.6.5-git-2.31-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom
+ruby-2.7.2-git-2.31-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom
 
 # Used by customers-gitlab-com rspec job: https://gitlab.com/gitlab-org/customers-gitlab-com/-/blob/staging/.gitlab-ci.yml
 ruby-2.6.6-golang-1.14-git-2.31-lfs-2.9-chrome-81.0-node-12.18-yarn-1.21-postgresql-9.5-graphicsmagick-1.3.36 push: *build_and_deploy_custom
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index 4e146cf..6c2990a 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -77,6 +77,10 @@ function print_git_args() {
             GIT_VERSION=2.29.0
             GIT_DOWNLOAD_SHA256=fa08dc8424ef80c0f9bf307877f9e2e49f1a6049e873530d6747c2be770742ff
             ;;
+        2.31)
+            GIT_VERSION=2.31.0
+            GIT_DOWNLOAD_SHA256=bc6168777883562569144d536e8a855b12d25d46870d95188a3064260d7784ee
+            ;;
         *) echo "Unknown git version $1"; exit 1;
     esac