diff --git a/deployment/environments/production/main.tf b/deployment/environments/production/main.tf
index 2b42580c..2ae0cc7d 100644
--- a/deployment/environments/production/main.tf
+++ b/deployment/environments/production/main.tf
@@ -10,6 +10,12 @@ terraform {
 
 provider "aws" {
   region = "us-east-2"
+  default_tags {
+    tags = {
+      ManagedBy   = "Terraform"
+      AppName     = "Indexer"
+    }
+  }
 }
 
 
diff --git a/deployment/environments/staging/main.tf b/deployment/environments/staging/main.tf
index 2d5202ed..c2b8e7ca 100644
--- a/deployment/environments/staging/main.tf
+++ b/deployment/environments/staging/main.tf
@@ -10,6 +10,12 @@ terraform {
 
 provider "aws" {
   region = "us-east-2"
+  default_tags {
+    tags = {
+      ManagedBy   = "Terraform"
+      AppName     = "Indexer"
+    }
+  }
 }
 
 
diff --git a/deployment/registry/main.tf b/deployment/registry/main.tf
index 50498506..dd12a3c0 100644
--- a/deployment/registry/main.tf
+++ b/deployment/registry/main.tf
@@ -1,5 +1,11 @@
 provider "aws" {
   region = var.AWS_REGION
+  default_tags {
+    tags = {
+      ManagedBy   = "Terraform"
+      AppName     = "Indexer"
+    }
+  }
 }
 
 module "container_registry" {
diff --git a/deployment/state/main.tf b/deployment/state/main.tf
index 9647b08b..e8331a6f 100644
--- a/deployment/state/main.tf
+++ b/deployment/state/main.tf
@@ -1,5 +1,11 @@
 provider "aws" {
   region = var.AWS_REGION
+  default_tags {
+    tags = {
+      ManagedBy   = "Terraform"
+      AppName     = "Indexer"
+    }
+  }
 }
 data "aws_caller_identity" "current" {}