diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5880a9..d7e38ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,12 +51,16 @@ ruby-2.3-golang-1.8-git-2.14 test: *test_custom
 ruby-2.3-golang-1.8-git-2.9 test: *test_custom
 ruby-2.3-golang-1.9-git-2.14 test: *test_custom
 ruby-2.3-golang-1.9-git-2.9 test: *test_custom
+ruby-2.3-golang-1.10-git-2.14 test: *test_custom
+ruby-2.3-golang-1.10-git-2.9 test: *test_custom
 ruby-2.3.5-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
 ruby-2.3.6-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
 golang-1.8.6-git-2.9.0 test: *test_custom
 golang-1.8.6-git-2.14 test: *test_custom
 golang-1.9-git-2.9.0 test: *test_custom
 golang-1.9-git-2.14 test: *test_custom
+golang-1.10-git-2.9.0 test: *test_custom
+golang-1.10-git-2.14 test: *test_custom
 node-8.9-chrome-64.0-yarn-1.2 test: *test_custom
 
 www-gitlab-com test: *test_build
@@ -76,12 +80,16 @@ ruby-2.3-golang-1.8.6-git-2.14: *build_and_deploy_custom
 ruby-2.3-golang-1.8.6-git-2.9: *build_and_deploy_custom
 ruby-2.3-golang-1.9-git-2.14: *build_and_deploy_custom
 ruby-2.3-golang-1.9-git-2.9: *build_and_deploy_custom
+ruby-2.3-golang-1.10-git-2.14: *build_and_deploy_custom
+ruby-2.3-golang-1.10-git-2.9: *build_and_deploy_custom
 ruby-2.3.5-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
 ruby-2.3.6-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
 golang-1.8.6-git-2.9.0: *build_and_deploy_custom
 golang-1.8.6-git-2.14: *build_and_deploy_custom
 golang-1.9-git-2.9.0: *build_and_deploy_custom
 golang-1.9-git-2.14: *build_and_deploy_custom
+golang-1.10-git-2.9.0: *build_and_deploy_custom
+golang-1.10-git-2.14: *build_and_deploy_custom
 node-8.9-chrome-64.0-yarn-1.2: *build_and_deploy_custom
 
 www-gitlab-com: *build_and_deploy
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index 365822f..baacf72 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -14,6 +14,10 @@ function print_golang_args() {
             INSTALL_GOLANG_VERSION=1.9.2
             GOLANG_DOWNLOAD_SHA256=de874549d9a8d8d8062be05808509c09a88a248e77ec14eb77453530829ac02b
             ;;
+        1.10|1.10.0)
+            INSTALL_GOLANG_VERSION=1.10
+            GOLANG_DOWNLOAD_SHA256=b5a64335f1490277b585832d1f6c7f8c6c11206cba5cd3f771dcb87b98ad1a33
+            ;;
         *) echo "Unknown golang version $1"; exit 1;
     esac