diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e866aa..f922b0c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,17 +52,25 @@ before_script:
 
 # Tests
 
+# Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
 ruby-2.3-golang-1.9-git-2.16 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-golang-1.10-git-2.16 test: *test_custom
+ruby-2.4-golang-1.9-git-2.17 test: *test_custom
+ruby-2.4-golang-1.10-git-2.16 test: *test_custom
+ruby-2.4-golang-1.10-git-2.17 test: *test_custom
+
+# Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
 ruby-2.3.7-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
 ruby-2.3.7-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
 ruby-2.3.7-golang-1.9-git-2.17-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
 ruby-2.3.7-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
 ruby-2.4.1-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
+
+# Not used anymore (?)
 golang-1.9-git-2.9.0 test: *test_custom
 golang-1.9-git-2.14 test: *test_custom
 golang-1.9-git-2.16 test: *test_custom
@@ -71,7 +79,11 @@ golang-1.10-git-2.9.0 test: *test_custom
 golang-1.10-git-2.14 test: *test_custom
 golang-1.10-git-2.16 test: *test_custom
 golang-1.10-git-2.17 test: *test_custom
+
+# Used by https://gitlab.com/gitlab-org/trello-power-up/blob/master/.gitlab-ci.yml (?)
 node-8.9-chrome-63.0-yarn-1.2 test: *test_custom
+
+# Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
 ruby-2.3-ansible-2.5.1-terraform-0.11 test: *test_custom
 
 www-gitlab-com test: *test_build
@@ -90,12 +102,15 @@ sitespeed-gitlab test: *test_build
 # Builds
 
 # Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
-ruby-2.3-golang-1.9-git-2.16: *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.16: *build_and_deploy_custom
+ruby-2.3-golang-1.9-git-2.17: *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.16: *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.16: *build_and_deploy_custom
 ruby-2.3-golang-1.10-git-2.9: *build_and_deploy_custom
+ruby-2.4-golang-1.9-git-2.17: *build_and_deploy_custom
+ruby-2.4-golang-1.10-git-2.17: *build_and_deploy_custom
 
 # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
 ruby-2.3.7-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
@@ -104,6 +119,10 @@ ruby-2.3.7-golang-1.9-git-2.17-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *bu
 ruby-2.3.7-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
 ruby-2.4.1-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
 
+# Used by https://gitlab.com/gitlab-org/trello-power-up/blob/master/.gitlab-ci.yml (?)
+node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom
+
+# Not used anymore (?)
 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
@@ -114,7 +133,8 @@ golang-1.10-git-2.9.0: *build_and_deploy_custom
 golang-1.10-git-2.14: *build_and_deploy_custom
 golang-1.10-git-2.16: *build_and_deploy_custom
 golang-1.10-git-2.17: *build_and_deploy_custom
-node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom
+
+# Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
 ruby-2.3-ansible-2.5.1-terraform-0.11: *build_and_deploy_custom
 
 www-gitlab-com: *build_and_deploy