diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 47c59d9..9a03846 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,6 +57,9 @@ ruby-2.4-golang-1.11-git-2.18 test: *test_custom
 ruby-2.5-golang-1.10-git-2.18 test: *test_custom
 ruby-2.5-golang-1.11-git-2.18 test: *test_custom
 ruby-2.6-golang-1.11-git-2.18 test: *test_custom
+ruby-2.5-golang-1.12-git-2.18 test: *test_custom
+ruby-2.6-golang-1.12-git-2.18 test: *test_custom
+
 
 # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
 ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
@@ -113,6 +116,8 @@ ruby-2.4-golang-1.11-git-2.18: *build_and_deploy_custom
 ruby-2.5-golang-1.10-git-2.18: *build_and_deploy_custom
 ruby-2.5-golang-1.11-git-2.18: *build_and_deploy_custom
 ruby-2.6-golang-1.11-git-2.18: *build_and_deploy_custom
+ruby-2.5-golang-1.12-git-2.18: *build_and_deploy_custom
+ruby-2.6-golang-1.12-git-2.18: *build_and_deploy_custom
 
 # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
 ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index 5b23370..68d2e71 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -22,6 +22,10 @@ function print_golang_args() {
             INSTALL_GOLANG_VERSION=1.11
             GOLANG_DOWNLOAD_SHA256=b3fcf280ff86558e0559e185b601c9eade0fd24c900b4c63cd14d1d38613e499
             ;;
+        1.12)
+            INSTALL_GOLANG_VERSION=1.12
+            GOLANG_DOWNLOAD_SHA256=750a07fef8579ae4839458701f4df690e0b20b8bcce33b437e4df89c451b6f13
+            ;;
         *) echo "Unknown golang version $1"; exit 1;
     esac