diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+staging+cluster-cleanup.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+staging+cluster-cleanup.yml
deleted file mode 100644
index 7c6bc2dc9..000000000
--- a/.ci/jobs.t/elastic+helm-charts+{branch}+staging+cluster-cleanup.yml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- job:
-    name: elastic+helm-charts+%BRANCH%+staging+cluster-cleanup
-    display-name: elastic / helm-charts - staging - cluster cleanup
-    description: staging - cluster cleanup
-    parameters:
-      - string:
-          name: BUILD_ID
-          description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
-    scm:
-    - git:
-        wipe-workspace: 'True'
-    axes:
-    - axis:
-        type: slave
-        name: label
-        values:
-        - docker&&virtual
-    - axis:
-        type: yaml
-        name: KUBERNETES_VERSION
-        filename: helpers/matrix.yml
-    builders:
-    - shell: |-
-        #!/usr/local/bin/runbld
-        set -euo pipefail
-
-        source /usr/local/bin/bash_standard_lib.sh
-
-        set +x
-        VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
-        export VAULT_TOKEN
-        unset VAULT_ROLE_ID VAULT_SECRET_ID
-        set -x
-
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}"
-
-        cd helpers/terraform/
-        ./in-docker make destroy KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name}
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+staging+cluster-creation.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+staging+cluster-creation.yml
deleted file mode 100644
index 0279a6cfb..000000000
--- a/.ci/jobs.t/elastic+helm-charts+{branch}+staging+cluster-creation.yml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-- job:
-    name: elastic+helm-charts+%BRANCH%+staging+cluster-creation
-    display-name: elastic / helm-charts - staging - cluster creation
-    description: staging - cluster creation
-    parameters:
-      - string:
-          name: BUILD_ID
-          description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
-    scm:
-    - git:
-        wipe-workspace: 'True'
-    axes:
-    - axis:
-        type: slave
-        name: label
-        values:
-        - docker&&virtual
-    - axis:
-        type: yaml
-        name: KUBERNETES_VERSION
-        filename: helpers/matrix.yml
-    builders:
-    - shell: |-
-        #!/usr/local/bin/runbld
-        set -euo pipefail
-
-        source /usr/local/bin/bash_standard_lib.sh
-
-        set +x
-        VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
-        export VAULT_TOKEN
-        unset VAULT_ROLE_ID VAULT_SECRET_ID
-        set -x
-
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}"
-
-        cd helpers/terraform/
-        ./in-docker make up KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name}
-        ./in-docker make k8s-staging-registry KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name}
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+staging+integration-apm-server.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+staging+integration-apm-server.yml
deleted file mode 100644
index 0496ad456..000000000
--- a/.ci/jobs.t/elastic+helm-charts+{branch}+staging+integration-apm-server.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-- job:
-    name: elastic+helm-charts+%BRANCH%+staging+integration-apm-server
-    display-name: elastic / helm-charts - staging - integration apm-server
-    description: staging - integration apm-server
-    parameters:
-      - string:
-          name: BUILD_ID
-          description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
-    scm:
-    - git:
-        wipe-workspace: 'True'
-    axes:
-    - axis:
-        type: slave
-        name: label
-        values:
-        - docker&&virtual
-    - axis:
-        type: yaml
-        name: APM_SERVER_SUITE
-        filename: helpers/matrix.yml
-    - axis:
-        type: yaml
-        name: KUBERNETES_VERSION
-        filename: helpers/matrix.yml
-    builders:
-    - shell: |-
-        #!/usr/local/bin/runbld
-        set -euo pipefail
-
-        source /usr/local/bin/bash_standard_lib.sh
-
-        set +x
-        VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
-        export VAULT_TOKEN
-        unset VAULT_ROLE_ID VAULT_SECRET_ID
-        set -x
-
-        env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py
-
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}"
-
-        cd helpers/terraform/
-        ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${APM_SERVER_SUITE} CHART=apm-server
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+staging+integration-elasticsearch.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+staging+integration-elasticsearch.yml
deleted file mode 100644
index e441f2141..000000000
--- a/.ci/jobs.t/elastic+helm-charts+{branch}+staging+integration-elasticsearch.yml
+++ /dev/null
@@ -1,54 +0,0 @@
----
-- job:
-    name: elastic+helm-charts+%BRANCH%+staging+integration-elasticsearch
-    display-name: elastic / helm-charts - staging - integration elasticsearch
-    description: staging - integration elasticsearch
-    parameters:
-      - string:
-          name: BUILD_ID
-          description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
-    scm:
-    - git:
-        wipe-workspace: 'True'
-    axes:
-    - axis:
-        type: slave
-        name: label
-        values:
-        - docker&&virtual
-    - axis:
-        type: yaml
-        name: ES_SUITE
-        filename: helpers/matrix.yml
-    - axis:
-        type: yaml
-        name: KUBERNETES_VERSION
-        filename: helpers/matrix.yml
-    builders:
-    - shell: |-
-        #!/usr/local/bin/runbld
-        set -euo pipefail
-
-        source /usr/local/bin/bash_standard_lib.sh
-
-        set +x
-        VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
-        export VAULT_TOKEN
-        unset VAULT_ROLE_ID VAULT_SECRET_ID
-
-        DOCKER_PASSWORD=$(retry 5 vault read -field password secret/devops-ci/docker.elastic.co/devops-ci)
-        retry 5 docker login -u devops-ci -p $DOCKER_PASSWORD docker.elastic.co
-        unset DOCKER_PASSWORD
-        set -x
-
-        env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py
-
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}"
-
-        cd helpers/terraform/
-
-        # pull private images while we have the hosts docker daemon authenticated
-        make pull-private-images
-
-        # the private images will be used in here
-        ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${ES_SUITE} CHART=elasticsearch
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+staging+integration-filebeat.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+staging+integration-filebeat.yml
deleted file mode 100644
index da18266be..000000000
--- a/.ci/jobs.t/elastic+helm-charts+{branch}+staging+integration-filebeat.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-- job:
-    name: elastic+helm-charts+%BRANCH%+staging+integration-filebeat
-    display-name: elastic / helm-charts - staging - integration filebeat
-    description: staging - integration filebeat
-    parameters:
-      - string:
-          name: BUILD_ID
-          description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
-    scm:
-    - git:
-        wipe-workspace: 'True'
-    axes:
-    - axis:
-        type: slave
-        name: label
-        values:
-        - docker&&virtual
-    - axis:
-        type: yaml
-        name: FILEBEAT_SUITE
-        filename: helpers/matrix.yml
-    - axis:
-        type: yaml
-        name: KUBERNETES_VERSION
-        filename: helpers/matrix.yml
-    builders:
-    - shell: |-
-        #!/usr/local/bin/runbld
-        set -euo pipefail
-
-        source /usr/local/bin/bash_standard_lib.sh
-
-        set +x
-        VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
-        export VAULT_TOKEN
-        unset VAULT_ROLE_ID VAULT_SECRET_ID
-        set -x
-
-        env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py
-
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}"
-
-        cd helpers/terraform/
-        ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${FILEBEAT_SUITE} CHART=filebeat
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+staging+integration-kibana.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+staging+integration-kibana.yml
deleted file mode 100644
index 8944098a1..000000000
--- a/.ci/jobs.t/elastic+helm-charts+{branch}+staging+integration-kibana.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-- job:
-    name: elastic+helm-charts+%BRANCH%+staging+integration-kibana
-    display-name: elastic / helm-charts - staging - integration kibana
-    description: staging - integration kibana
-    parameters:
-      - string:
-          name: BUILD_ID
-          description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
-    scm:
-    - git:
-        wipe-workspace: 'True'
-    axes:
-    - axis:
-        type: slave
-        name: label
-        values:
-        - docker&&virtual
-    - axis:
-        type: yaml
-        name: KIBANA_SUITE
-        filename: helpers/matrix.yml
-    - axis:
-        type: yaml
-        name: KUBERNETES_VERSION
-        filename: helpers/matrix.yml
-    builders:
-    - shell: |-
-        #!/usr/local/bin/runbld
-        set -euo pipefail
-
-        source /usr/local/bin/bash_standard_lib.sh
-
-        set +x
-        VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
-        export VAULT_TOKEN
-        unset VAULT_ROLE_ID VAULT_SECRET_ID
-        set -x
-
-        env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py
-
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}"
-
-        cd helpers/terraform/
-        ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${KIBANA_SUITE} CHART=kibana
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+staging+integration-logstash.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+staging+integration-logstash.yml
deleted file mode 100644
index 7db73f065..000000000
--- a/.ci/jobs.t/elastic+helm-charts+{branch}+staging+integration-logstash.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-- job:
-    name: elastic+helm-charts+%BRANCH%+staging+integration-logstash
-    display-name: elastic / helm-charts - staging - integration logstash
-    description: staging - integration logstash
-    parameters:
-      - string:
-          name: BUILD_ID
-          description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
-    scm:
-    - git:
-        wipe-workspace: 'True'
-    axes:
-    - axis:
-        type: slave
-        name: label
-        values:
-        - docker&&virtual
-    - axis:
-        type: yaml
-        name: LOGSTASH_SUITE
-        filename: helpers/matrix.yml
-    - axis:
-        type: yaml
-        name: KUBERNETES_VERSION
-        filename: helpers/matrix.yml
-    builders:
-    - shell: |-
-        #!/usr/local/bin/runbld
-        set -euo pipefail
-
-        source /usr/local/bin/bash_standard_lib.sh
-
-        set +x
-        VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
-        export VAULT_TOKEN
-        unset VAULT_ROLE_ID VAULT_SECRET_ID
-        set -x
-
-        env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py
-
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}"
-
-        cd helpers/terraform/
-        ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${LOGSTASH_SUITE} CHART=logstash
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+staging+integration-metricbeat.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+staging+integration-metricbeat.yml
deleted file mode 100644
index 1046c0a83..000000000
--- a/.ci/jobs.t/elastic+helm-charts+{branch}+staging+integration-metricbeat.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-- job:
-    name: elastic+helm-charts+%BRANCH%+staging+integration-metricbeat
-    display-name: elastic / helm-charts - staging - integration metricbeat
-    description: staging - integration metricbeat
-    parameters:
-      - string:
-          name: BUILD_ID
-          description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
-    scm:
-    - git:
-        wipe-workspace: 'True'
-    axes:
-    - axis:
-        type: slave
-        name: label
-        values:
-        - docker&&virtual
-    - axis:
-        type: yaml
-        name: METRICBEAT_SUITE
-        filename: helpers/matrix.yml
-    - axis:
-        type: yaml
-        name: KUBERNETES_VERSION
-        filename: helpers/matrix.yml
-    builders:
-    - shell: |-
-        #!/usr/local/bin/runbld
-        set -euo pipefail
-
-        source /usr/local/bin/bash_standard_lib.sh
-
-        set +x
-        VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
-        export VAULT_TOKEN
-        unset VAULT_ROLE_ID VAULT_SECRET_ID
-        set -x
-
-        env BUMPER_VERSION_7="$BUILD_ID" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py
-
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${BUILD_ID//./-}"
-
-        cd helpers/terraform/
-        ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${METRICBEAT_SUITE} CHART=metricbeat
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+staging.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+staging.yml
deleted file mode 100644
index 6499e903f..000000000
--- a/.ci/jobs.t/elastic+helm-charts+{branch}+staging.yml
+++ /dev/null
@@ -1,53 +0,0 @@
----
-- job:
-    name: elastic+helm-charts+%BRANCH%+staging
-    display-name: elastic / helm-charts +%BRANCH%+ - staging tests
-    description: Staging image testing
-    concurrent: true
-    parameters:
-      - string:
-          name: BUILD_ID
-          description: "The buildId for the staging images. (Example: 6.8.11-abcdabcd)"
-    project-type: multijob
-    scm:
-    - git:
-        wipe-workspace: 'False'
-    builders:
-    - multijob:
-        name: template testing and kubernetes cluster creation
-        condition: SUCCESSFUL
-        projects:
-        - name: elastic+helm-charts+%BRANCH%+staging+cluster-creation
-          current-parameters: true
-    - multijob:
-        name: elasticsearch integration testing
-        condition: ALWAYS
-        projects:
-        - name: elastic+helm-charts+%BRANCH%+staging+integration-elasticsearch
-          current-parameters: true
-    - multijob:
-        name: integration testing
-        condition: ALWAYS
-        projects:
-        - name: elastic+helm-charts+%BRANCH%+staging+integration-kibana
-          current-parameters: true
-        - name: elastic+helm-charts+%BRANCH%+staging+integration-filebeat
-          current-parameters: true
-        - name: elastic+helm-charts+%BRANCH%+staging+integration-metricbeat
-          current-parameters: true
-        - name: elastic+helm-charts+%BRANCH%+staging+integration-logstash
-          current-parameters: true
-        - name: elastic+helm-charts+%BRANCH%+staging+integration-apm-server
-          current-parameters: true
-    publishers:
-    - trigger-parameterized-builds:
-      - project: elastic+helm-charts+%BRANCH%+staging+cluster-cleanup
-        current-parameters: true
-        trigger-with-no-params: false
-    - slack:
-        notify-back-to-normal: True
-        notify-every-failure: True
-        room: infra-release-notify
-        team-domain: elastic
-        auth-token-id: release-slack-integration-token
-        auth-token-credential-id: release-slack-integration-token