diff --git a/.ci/jobs.yml b/.ci/jobs.yml
index d2e3a21c4b96d..a2d8100f78efd 100644
--- a/.ci/jobs.yml
+++ b/.ci/jobs.yml
@@ -1,48 +1,36 @@
 JOB:
-  - x-pack-ciGroup8-1
-  - x-pack-ciGroup8-2
-  - x-pack-ciGroup8-3
-  - x-pack-ciGroup8-4
-  - x-pack-ciGroup8-5
-  - x-pack-ciGroup8-6
-  - x-pack-ciGroup8-7
-  - x-pack-ciGroup8-8
-  - x-pack-ciGroup8-9
-  - x-pack-ciGroup8-10
-  - x-pack-ciGroup8-11
-  - x-pack-ciGroup8-12
-  - x-pack-ciGroup8-13
-  - x-pack-ciGroup8-14
-  - x-pack-ciGroup8-15
-  - x-pack-ciGroup8-16
-  - x-pack-ciGroup8-17
-  - x-pack-ciGroup8-18
-  - x-pack-ciGroup8-19
-  - x-pack-ciGroup8-20
-  - x-pack-ciGroup8-21
-  - x-pack-ciGroup8-22
-  - x-pack-ciGroup8-23
-  - x-pack-ciGroup8-24
-  - x-pack-ciGroup8-25
-  - x-pack-ciGroup8-26
-  - x-pack-ciGroup8-27
-  - x-pack-ciGroup8-28
-  - x-pack-ciGroup8-29
-  - x-pack-ciGroup8-30
-  - x-pack-ciGroup8-31
-  - x-pack-ciGroup8-32
-  - x-pack-ciGroup8-33
-  - x-pack-ciGroup8-34
-  - x-pack-ciGroup8-35
-  - x-pack-ciGroup8-36
-  - x-pack-ciGroup8-37
-  - x-pack-ciGroup8-38
-  - x-pack-ciGroup8-39
-  - x-pack-ciGroup8-40
-  - x-pack-ciGroup8-41
-  - x-pack-ciGroup8-42
-  - x-pack-ciGroup8-43
-  - x-pack-ciGroup8-44
+  - kibana-intake
+  - x-pack-intake
+  - kibana-firefoxSmoke
+  - kibana-ciGroup1
+  - kibana-ciGroup2
+  - kibana-ciGroup3
+  - kibana-ciGroup4
+  - kibana-ciGroup5
+  - kibana-ciGroup6
+  - kibana-ciGroup7
+  - kibana-ciGroup8
+  - kibana-ciGroup9
+  - kibana-ciGroup10
+  - kibana-ciGroup11
+  - kibana-ciGroup12
+  - kibana-accessibility
+  - kibana-visualRegression
+
+  # make sure all x-pack-ciGroups are listed in test/scripts/jenkins_xpack_ci_group.sh
+  - x-pack-firefoxSmoke
+  - x-pack-ciGroup1
+  - x-pack-ciGroup2
+  - x-pack-ciGroup3
+  - x-pack-ciGroup4
+  - x-pack-ciGroup5
+  - x-pack-ciGroup6
+  - x-pack-ciGroup7
+  - x-pack-ciGroup8
+  - x-pack-ciGroup9
+  - x-pack-ciGroup10
+  - x-pack-accessibility
+  - x-pack-visualRegression
 
 # `~` is yaml for `null`
 exclude: ~