diff --git a/.ci/jobs.t/elastic+elasticsearch+intake+multijob+bwc-snapshots.yml b/.ci/jobs.t/elastic+elasticsearch+intake+multijob+bwc-snapshots.yml
index 70509792a9d8c..20e3ef3760915 100644
--- a/.ci/jobs.t/elastic+elasticsearch+intake+multijob+bwc-snapshots.yml
+++ b/.ci/jobs.t/elastic+elasticsearch+intake+multijob+bwc-snapshots.yml
@@ -3,7 +3,6 @@ jjbb-template: matrix-gradle-unix.yml
 vars:
   - job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+bwc-snapshots
   - job-display-name: "elastic / elasticsearch # %BRANCH% - intake bwc"
-  - job-description: Elasticsearch %BRANCH% branch intake backwards compatibility checks.
   - matrix-yaml-file: ".ci/snapshotBwcVersions"
   - matrix-variable: BWC_VERSION
   - gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files v$BWC_VERSION#bwcTest"
diff --git a/.ci/jobs.t/elastic+elasticsearch+intake+multijob+part1.yml b/.ci/jobs.t/elastic+elasticsearch+intake+multijob+part1.yml
index e8a52d7953063..999dfaf94b4b6 100644
--- a/.ci/jobs.t/elastic+elasticsearch+intake+multijob+part1.yml
+++ b/.ci/jobs.t/elastic+elasticsearch+intake+multijob+part1.yml
@@ -3,5 +3,4 @@ jjbb-template: generic-gradle-unix.yml
 vars:
   - job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+part1
   - job-display-name: "elastic / elasticsearch # %BRANCH% - intake part 1"
-  - job-description: Elasticsearch %BRANCH% branch intake check part 1.
   - gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart1"
diff --git a/.ci/jobs.t/elastic+elasticsearch+intake+multijob+part2.yml b/.ci/jobs.t/elastic+elasticsearch+intake+multijob+part2.yml
index 15cb91eea5724..7cb51800bd784 100644
--- a/.ci/jobs.t/elastic+elasticsearch+intake+multijob+part2.yml
+++ b/.ci/jobs.t/elastic+elasticsearch+intake+multijob+part2.yml
@@ -3,5 +3,4 @@ jjbb-template: generic-gradle-unix.yml
 vars:
   - job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+part2
   - job-display-name: "elastic / elasticsearch # %BRANCH% - intake part 2"
-  - job-description: Elasticsearch %BRANCH% branch intake check part 2.
   - gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart2"
diff --git a/.ci/jobs.t/elastic+elasticsearch+intake+multijob+part3.yml b/.ci/jobs.t/elastic+elasticsearch+intake+multijob+part3.yml
index 685c957dc28c2..0965b566aeebe 100644
--- a/.ci/jobs.t/elastic+elasticsearch+intake+multijob+part3.yml
+++ b/.ci/jobs.t/elastic+elasticsearch+intake+multijob+part3.yml
@@ -3,5 +3,4 @@ jjbb-template: generic-gradle-unix.yml
 vars:
   - job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+part3
   - job-display-name: "elastic / elasticsearch # %BRANCH% - intake part 3"
-  - job-description: Elasticsearch %BRANCH% branch intake check part 3.
   - gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart3"
diff --git a/.ci/jobs.t/elastic+elasticsearch+intake+multijob+rest-compat.yml b/.ci/jobs.t/elastic+elasticsearch+intake+multijob+rest-compat.yml
index eea1cfecdb126..13feea1bc99df 100644
--- a/.ci/jobs.t/elastic+elasticsearch+intake+multijob+rest-compat.yml
+++ b/.ci/jobs.t/elastic+elasticsearch+intake+multijob+rest-compat.yml
@@ -3,5 +3,4 @@ jjbb-template: generic-gradle-unix.yml
 vars:
   - job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+rest-compat
   - job-display-name: "elastic / elasticsearch # %BRANCH% - intake rest compatibility"
-  - job-description: Elasticsearch %BRANCH% branch intake REST compatibility checks.
   - gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkRestCompat"
diff --git a/.ci/jobs.t/elastic+elasticsearch+intake+multijob+sanity-check.yml b/.ci/jobs.t/elastic+elasticsearch+intake+multijob+sanity-check.yml
index 047eca2cf5a4d..77720544e45c0 100644
--- a/.ci/jobs.t/elastic+elasticsearch+intake+multijob+sanity-check.yml
+++ b/.ci/jobs.t/elastic+elasticsearch+intake+multijob+sanity-check.yml
@@ -3,5 +3,4 @@ jjbb-template: generic-gradle-unix.yml
 vars:
   - job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+sanity-check
   - job-display-name: "elastic / elasticsearch # %BRANCH% - intake sanity check"
-  - job-description: Elasticsearch %BRANCH% branch intake sanity check.
   - gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files precommit"
diff --git a/.ci/jobs.t/elastic+elasticsearch+intake+multijob+update-last-good-commit.yml b/.ci/jobs.t/elastic+elasticsearch+intake+multijob+update-last-good-commit.yml
index 2a1d462d9ac89..a224e9b0eee41 100644
--- a/.ci/jobs.t/elastic+elasticsearch+intake+multijob+update-last-good-commit.yml
+++ b/.ci/jobs.t/elastic+elasticsearch+intake+multijob+update-last-good-commit.yml
@@ -2,7 +2,8 @@
 - job:
     name: elastic+elasticsearch+%BRANCH%+intake+multijob+update-last-good-commit
     display-name: "elastic / elasticsearch # %BRANCH% - update last good commit"
-    description: Elasticsearch %BRANCH% branch update last good commit in build-stats.
+    description: "This job has been migrated to Buildkite.\n"
+    disabled: true
     node: light
     properties: []
     builders:
diff --git a/.ci/jobs.t/elastic+elasticsearch+intake.yml b/.ci/jobs.t/elastic+elasticsearch+intake.yml
index 138318897b523..70af45a7aab25 100644
--- a/.ci/jobs.t/elastic+elasticsearch+intake.yml
+++ b/.ci/jobs.t/elastic+elasticsearch+intake.yml
@@ -2,24 +2,12 @@
 - job:
     name: elastic+elasticsearch+%BRANCH%+intake
     display-name: "elastic / elasticsearch # %BRANCH% - intake"
-    description: "Testing of the Elasticsearch %BRANCH% branch on every push.\n"
+    description: "This job has been migrated to Buildkite.\n"
+    disabled: true
     project-type: multijob
     node: master
     vault: []
-    triggers:
-      # We use this trigger instead of the provided "github" webhook trigger because it's more robust.
-      # Here we only trigger builds for pushes to the corresponding branch, rather than a push to any branch of the
-      # configured git repository. This avoids duplicate builds being triggered when pushes to multiple branches are
-      # done in quick succession.
-      - generic-webhook-trigger:
-          post-content-params:
-            - type: JSONPath
-              key: ref
-              value: '$.ref'
-          regex-filter-text: '$ref'
-          regex-filter-expression: "^refs/heads/%BRANCH%$"
-          cause: Push to GitHub (refs/heads/%BRANCH%)
-          silent-response: true
+    triggers: []
     scm:
       - git:
           wipe-workspace: false
diff --git a/.ci/jobs.t/elastic+elasticsearch+periodic+bwc.yml b/.ci/jobs.t/elastic+elasticsearch+periodic+bwc.yml
index 2eeb08c6cff65..9d64deadeabda 100644
--- a/.ci/jobs.t/elastic+elasticsearch+periodic+bwc.yml
+++ b/.ci/jobs.t/elastic+elasticsearch+periodic+bwc.yml
@@ -1,5 +1,5 @@
 ---
-jjbb-template: matrix-gradle-unix-disabled.yml
+jjbb-template: matrix-gradle-unix.yml
 vars:
   - job-name: elastic+elasticsearch+%BRANCH%+periodic+bwc
   - job-display-name: "elastic / elasticsearch # %BRANCH% - backwards compatibility matrix"
diff --git a/.ci/templates.t/generic-gradle-unix.yml b/.ci/templates.t/generic-gradle-unix.yml
index 6243155c5388a..a5de6178f7dfd 100644
--- a/.ci/templates.t/generic-gradle-unix.yml
+++ b/.ci/templates.t/generic-gradle-unix.yml
@@ -2,11 +2,12 @@
 - job:
     name: "{job-name}"
     display-name: "{job-display-name}"
-    description: "{job-description}"
+    description: "This job has been migrated to Buildkite.\n"
+    disabled: true
     workspace: /dev/shm/{job-name}
     builders:
       - inject:
-          properties-file: '.ci/java-versions.properties'
+          properties-file: ".ci/java-versions.properties"
           properties-content: |
             JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
             JAVA11_HOME=$HOME/.java/java11
diff --git a/.ci/templates.t/matrix-gradle-unix-disabled.yml b/.ci/templates.t/matrix-gradle-unix-disabled.yml
deleted file mode 100644
index 1eafe77a5ec78..0000000000000
--- a/.ci/templates.t/matrix-gradle-unix-disabled.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-- job:
-    name: "{job-name}"
-    display-name: "{job-display-name}"
-    description: "This job has been migrated to Buildkite.\n"
-    disabled: true
-    project-type: matrix
-    child-workspace: /dev/shm/{job-name}
-    node: master
-    scm:
-      - git:
-          wipe-workspace: false
-    axes:
-      - axis:
-          type: slave
-          name: nodes
-          values:
-            - "general-purpose"
-      - axis:
-          type: yaml
-          filename: "{matrix-yaml-file}"
-          name: "{matrix-variable}"
-    builders:
-      - inject:
-          properties-file: ".ci/java-versions.properties"
-          properties-content: |
-            JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
-            JAVA11_HOME=$HOME/.java/java11
-            JAVA16_HOME=$HOME/.java/openjdk16
-      - shell: |
-          #!/usr/local/bin/runbld --redirect-stderr
-          $WORKSPACE/.ci/scripts/run-gradle.sh {gradle-args}
diff --git a/.ci/templates.t/matrix-gradle-unix.yml b/.ci/templates.t/matrix-gradle-unix.yml
index c69eb4ce65ce8..1eafe77a5ec78 100644
--- a/.ci/templates.t/matrix-gradle-unix.yml
+++ b/.ci/templates.t/matrix-gradle-unix.yml
@@ -2,7 +2,8 @@
 - job:
     name: "{job-name}"
     display-name: "{job-display-name}"
-    description: "{job-description}"
+    description: "This job has been migrated to Buildkite.\n"
+    disabled: true
     project-type: matrix
     child-workspace: /dev/shm/{job-name}
     node: master
@@ -21,7 +22,7 @@
           name: "{matrix-variable}"
     builders:
       - inject:
-          properties-file: '.ci/java-versions.properties'
+          properties-file: ".ci/java-versions.properties"
           properties-content: |
             JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
             JAVA11_HOME=$HOME/.java/java11