diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml
index 98a18c3bfdb1..36e6ffab8614 100644
--- a/.buildkite/metricbeat/pipeline.yml
+++ b/.buildkite/metricbeat/pipeline.yml
@@ -57,7 +57,7 @@ steps:
           # defines the MODULE env var based on what's changed in a PR
           source .buildkite/scripts/changesets.sh
           defineModuleFromTheChangeSet metricbeat
-          echo "~~~ Running tests"
+          echo "--- MODULE IS: ${MODULE}"
 
           # TODO move this section to base image / pre-command hook
           # echo "~~~ Installing kind"
diff --git a/.buildkite/scripts/setup_cloud_env.sh b/.buildkite/scripts/setup_cloud_env.sh
deleted file mode 100644
index a13a8446dc71..000000000000
--- a/.buildkite/scripts/setup_cloud_env.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-REPO_DIR=$(pwd)
-
-teardown() {
-  # reset the directory to the root of the project
-  cd $REPO_DIR
-  # Teardown resources after using them
-  echo "~~~ Terraform Cleanup"
-  tf_cleanup "${MODULE_DIR}"              #TODO: move all docker-compose files from the .ci to .buildkite folder before switching to BK
-
-  echo "~~~ Docker Compose Cleanup"
-  docker-compose -f .buildkite/deploy/docker/docker-compose.yml down -v
-}
-
-tf_cleanup() {
-  DIRECTORY=${1:-.}
-
-  for tfstate in $(find $DIRECTORY -name terraform.tfstate); do
-    cd $(dirname $tfstate)
-    terraform init
-    if ! terraform destroy -auto-approve; then
-        echo "+++ Failed to Terraform destroy the resources"
-    fi
-    cd -
-  done
-}
-
-trap 'teardown' EXIT
-
-# Prepare the cloud resources using Terraform
-echo "~~~ Loading creds"
-set +o xtrace
-export AWS_ACCESS_KEY_ID=$BEATS_AWS_ACCESS_KEY
-export AWS_SECRET_ACCESS_KEY=$BEATS_AWS_SECRET_KEY
-export TEST_TAGS="${TEST_TAGS:+$TEST_TAGS,}aws"
-set -o xtrace
-
-echo "~~~ Run docker-compose services for emulated cloud env"
-docker-compose -f .buildkite/deploy/docker/docker-compose.yml up -d
-echo "~~~ Initialize TF cloud resources"
-cd "$MODULE_DIR"
-export TF_VAR_BRANCH=$(echo "${BUILDKITE_BRANCH}" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9-]/-/g')
-export TF_VAR_BUILD_ID="${BUILDKITE_BUILD_ID}"
-export TF_VAR_CREATED_DATE=$(date +%s)
-export TF_VAR_ENVIRONMENT="ci"
-export TF_VAR_REPO="${REPO}"
-terraform init && terraform apply -auto-approve
-cd -
diff --git a/.buildkite/x-pack/pipeline.xpack.filebeat.yml b/.buildkite/x-pack/pipeline.xpack.filebeat.yml
index a3521813f5f5..5f3e86dd288d 100644
--- a/.buildkite/x-pack/pipeline.xpack.filebeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.filebeat.yml
@@ -42,7 +42,7 @@ steps:
         notify:
           - github_commit_status:
               context: "x-pack-filebeat: check/update"
-      
+
   - wait: ~
     # with PRs, we want to run mandatory tests only if check/update step succeed
     # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
@@ -249,6 +249,8 @@ steps:
 
       - label: ":ubuntu: x-pack/filebeat AWS Tests"
         key: "x-pack-filebeat-extended-cloud-test"
+        skip: "skipping due to elastic/ingest-dev#3467"
+        # https://github.com/elastic/ingest-dev/issues/3467
         if: build.env("GITHUB_PR_LABELS") =~ /.*aws.*/
         command: |
           set -euo pipefail
diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
index 427d0087312a..b883ee13f607 100644
--- a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
@@ -216,7 +216,6 @@ steps:
           - github_commit_status:
               context: "x-pack/metricbeat: AWS Tests"
 
-
   - wait: ~
     # with PRs, we want to run packaging only if mandatory tests succeed
     # for other cases, e.g. merge commits, we want to run packaging (and publish) independently of other tests