diff --git a/.buildkite/x-pack/pipeline.xpack.filebeat.yml b/.buildkite/x-pack/pipeline.xpack.filebeat.yml
index ef4410acbcd7..8e450de35ad7 100644
--- a/.buildkite/x-pack/pipeline.xpack.filebeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.filebeat.yml
@@ -197,13 +197,9 @@ steps:
         env:
           ASDF_TERRAFORM_VERSION: "1.9.3"
           ASDF_PYTHON_VERSION: "3.9.13" # Not needed by ECH tests, but needed by VM
-# We are temporarily using the Production CFT environment instead of the Staging GovCloud
-# one.  This is being done until issues with creating deployments in Staging GovCloud are
-# fixed. Once this happens, uncomment the lines below and delete the gcp-us-west2 line.
-#          EC_ENDPOINT: "https://api.staging.elastic-gov.com"
-#          TF_VAR_ech_region: "us-gov-east-1"
-#          TF_VAR_deployment_template_id: "aws-general-purpose"
-          TF_VAR_ech_region: "gcp-us-west2"
+          EC_ENDPOINT: "https://api.staging.elastic-gov.com"
+          TF_VAR_ech_region: "us-gov-east-1"
+          TF_VAR_deployment_template_id: "aws-general-purpose"
         command: |
           .buildkite/scripts/custom_fips_ech_test.sh x-pack/filebeat
         retry:
@@ -226,12 +222,7 @@ steps:
               branches: "main"
               debug: true
           - elastic/vault-secrets#v0.1.0:
-# We are temporarily using the Production CFT environment API key instead of the
-# Staging GovCloud one.  This is being done until issues with creating deployments in
-# Staging GovCloud are fixed. Once this happens, uncomment the line below and delete
-# the vault_ec_key_prod line.
-#              path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
-              path: "kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
+              path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
               field: "apiKey"
               env_var: "EC_API_KEY"
         notify:
@@ -538,4 +529,4 @@ steps:
           instanceType: "${AWS_ARM_INSTANCE_TYPE}"
         notify:
           - github_commit_status:
-              context: "x-pack/filebeat: Packaging Linux arm64 FIPS"
+              context: "x-pack/filebeat: Packaging Linux arm64 FIPS"
\ No newline at end of file
diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
index 4341194f3987..18a6f9c19ff1 100644
--- a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
@@ -234,13 +234,9 @@ steps:
         env:
           ASDF_TERRAFORM_VERSION: "1.9.3"
           ASDF_PYTHON_VERSION: "3.9.13" # Not needed by ECH tests, but needed by VM
-# We are temporarily using the Production CFT environment instead of the Staging GovCloud
-# one.  This is being done until issues with creating deployments in Staging GovCloud are
-# fixed. Once this happens, uncomment the lines below and delete the gcp-us-west2 line.
-#          EC_ENDPOINT: "https://api.staging.elastic-gov.com"
-#          TF_VAR_ech_region: "us-gov-east-1"
-#          TF_VAR_deployment_template_id: "aws-general-purpose"
-          TF_VAR_ech_region: "gcp-us-west2"
+          EC_ENDPOINT: "https://api.staging.elastic-gov.com"
+          TF_VAR_ech_region: "us-gov-east-1"
+          TF_VAR_deployment_template_id: "aws-general-purpose"
         command: |
           .buildkite/scripts/custom_fips_ech_test.sh x-pack/metricbeat
         retry:
@@ -263,12 +259,7 @@ steps:
               branches: "main"
               debug: true
           - elastic/vault-secrets#v0.1.0:
-# We are temporarily using the Production CFT environment API key instead of the
-# Staging GovCloud one.  This is being done until issues with creating deployments in
-# Staging GovCloud are fixed. Once this happens, uncomment the line below and delete
-# the vault_ec_key_prod line.
-#              path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
-              path: "kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
+              path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
               field: "apiKey"
               env_var: "EC_API_KEY"
         notify: