diff --git a/.ci/jobs/beats-schedule-weekly.yml b/.ci/jobs/beats-schedule-weekly.yml
index b90391da29bd..ee01d2308fa8 100644
--- a/.ci/jobs/beats-schedule-weekly.yml
+++ b/.ci/jobs/beats-schedule-weekly.yml
@@ -19,7 +19,7 @@
             wipe-workspace: 'True'
             name: origin
             shallow-clone: true
-            credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba
+            credentials-id: github-app-beats-ci
             reference-repo: /var/lib/jenkins/.git-references/beats.git
             branches:
               - $branch_specifier
diff --git a/x-pack/filebeat/input/awscloudwatch/_meta/terraform/main.tf b/x-pack/filebeat/input/awscloudwatch/_meta/terraform/main.tf
index bb3b24593028..ba5e4bb6ef28 100644
--- a/x-pack/filebeat/input/awscloudwatch/_meta/terraform/main.tf
+++ b/x-pack/filebeat/input/awscloudwatch/_meta/terraform/main.tf
@@ -9,6 +9,19 @@ terraform {
 
 provider "aws" {
   region = var.aws_region
+  default_tags {
+    tags = {
+      environment  = var.ENVIRONMENT
+      repo         = var.REPO
+      branch       = var.BRANCH
+      build        = var.BUILD_ID
+      created_date = var.CREATED_DATE
+      division     = "engineering"
+      org          = "obs"
+      team         = "cloud-monitoring"
+      project      = "filebeat_aws-ci"
+    }
+  }
 }
 
 resource "random_string" "random" {
diff --git a/x-pack/filebeat/input/awscloudwatch/_meta/terraform/variables.tf b/x-pack/filebeat/input/awscloudwatch/_meta/terraform/variables.tf
index 2c4fb00786bc..78b0a4741477 100644
--- a/x-pack/filebeat/input/awscloudwatch/_meta/terraform/variables.tf
+++ b/x-pack/filebeat/input/awscloudwatch/_meta/terraform/variables.tf
@@ -3,3 +3,26 @@ variable "aws_region" {
   type        = string
   default     = "us-east-1"
 }
+
+variable "BRANCH" {
+  description = "Branch name or pull request for tagging purposes"
+  default = "unknown-branch"
+}
+
+variable "BUILD_ID" {
+  description = "Build ID in the CI for tagging purposes"
+  default = "unknown-build"
+}
+
+variable "CREATED_DATE" {
+  description = "Creation date in epoch time for tagging purposes"
+  default = "unknown-date"
+}
+
+variable "ENVIRONMENT" {
+  default = "unknown-environment"
+}
+
+variable "REPO" {
+  default = "unknown-repo-name"
+}
diff --git a/x-pack/filebeat/input/awss3/_meta/terraform/main.tf b/x-pack/filebeat/input/awss3/_meta/terraform/main.tf
index 81a24b3f1612..34d8016abf13 100644
--- a/x-pack/filebeat/input/awss3/_meta/terraform/main.tf
+++ b/x-pack/filebeat/input/awss3/_meta/terraform/main.tf
@@ -16,6 +16,10 @@ provider "aws" {
       branch       = var.BRANCH
       build        = var.BUILD_ID
       created_date = var.CREATED_DATE
+      division     = "engineering"
+      org          = "obs"
+      team         = "cloud-monitoring"
+      project      = "filebeat_aws-ci"
     }
   }
 }
diff --git a/x-pack/metricbeat/module/aws/terraform.tf b/x-pack/metricbeat/module/aws/terraform.tf
index 6a7ec6e24786..991650b1433c 100644
--- a/x-pack/metricbeat/module/aws/terraform.tf
+++ b/x-pack/metricbeat/module/aws/terraform.tf
@@ -7,6 +7,10 @@ provider "aws" {
       branch       = var.BRANCH
       build        = var.BUILD_ID
       created_date = var.CREATED_DATE
+      division     = "engineering"
+      org          = "obs"
+      team         = "cloud-monitoring"
+      project      = "metricbeat_aws-ci"
     }
   }
 }