diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index facdb7f..074dfe1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,11 +81,15 @@ 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
 ruby-2.7-golang-1.16-git-2.31 test: *test_custom
 ruby-2.7-golang-1.16-git-2.31-pgbouncer-1.14 test: *test_custom
+ruby-2.7-golang-1.17-git-2.31 test: *test_custom
+ruby-2.7-golang-1.17-git-2.31-pgbouncer-1.14 test: *test_custom
 ruby-3.0-golang-1.14-git-2.31 test: *test_custom
 ruby-3.0-golang-1.15-git-2.31 test: *test_custom
 ruby-3.0-golang-1.15-git-2.31-pgbouncer-1.14 test: *test_custom
 ruby-3.0-golang-1.16-git-2.31 test: *test_custom
 ruby-3.0-golang-1.16-git-2.31-pgbouncer-1.14 test: *test_custom
+ruby-3.0-golang-1.17-git-2.31 test: *test_custom
+ruby-3.0-golang-1.17-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.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 test: *test_custom
@@ -172,11 +176,15 @@ 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
 ruby-2.7-golang-1.16-git-2.31 push: *build_and_deploy_custom
 ruby-2.7-golang-1.16-git-2.31-pgbouncer-1.14 push: *build_and_deploy_custom
+ruby-2.7-golang-1.17-git-2.31 push: *build_and_deploy_custom
+ruby-2.7-golang-1.17-git-2.31-pgbouncer-1.14 push: *build_and_deploy_custom
 ruby-3.0-golang-1.14-git-2.31 push: *build_and_deploy_custom
 ruby-3.0-golang-1.15-git-2.31 push: *build_and_deploy_custom
 ruby-3.0-golang-1.15-git-2.31-pgbouncer-1.14 push: *build_and_deploy_custom
 ruby-3.0-golang-1.16-git-2.31 push: *build_and_deploy_custom
 ruby-3.0-golang-1.16-git-2.31-pgbouncer-1.14 push: *build_and_deploy_custom
+ruby-3.0-golang-1.17-git-2.31 push: *build_and_deploy_custom
+ruby-3.0-golang-1.17-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.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 push: *build_and_deploy_custom
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index e1144ba..d74d62a 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -19,6 +19,10 @@ function print_golang_args() {
             INSTALL_GOLANG_VERSION=1.16.7
             GOLANG_DOWNLOAD_SHA256=7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04
             ;;
+        1.17)
+            INSTALL_GOLANG_VERSION=1.17
+            GOLANG_DOWNLOAD_SHA256=6bf89fc4f5ad763871cf7eac80a2d594492de7a818303283f1366a7f6a30372d
+            ;;
         *) echo "Unknown golang version $1"; exit 1;
     esac