diff --git a/terraform/aws/db-app.tf b/terraform/aws/db-app.tf
index f87f544b65..232db34681 100644
--- a/terraform/aws/db-app.tf
+++ b/terraform/aws/db-app.tf
@@ -33,6 +33,8 @@ resource "aws_db_instance" "default" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "47c13290-c2ce-48a7-b666-1b0085effb92"
+    }, {
+    application = "sockshop"
   })
 
   # Ignore password changes from tf plan diff
@@ -59,6 +61,8 @@ resource "aws_db_option_group" "default" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "c8076043-5de7-4203-9a1c-b4e61900628a"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -91,6 +95,8 @@ resource "aws_db_parameter_group" "default" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "6432b3f9-3f45-4463-befc-2e0f2fbdffc1"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -111,6 +117,8 @@ resource "aws_db_subnet_group" "default" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "b8368249-50c5-4a24-bdb0-9f83d197b11c"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -130,6 +138,8 @@ resource "aws_security_group" "default" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "7b251090-8ac1-4290-bd2e-bf3e16126430"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -165,6 +175,7 @@ resource "aws_iam_instance_profile" "ec2profile" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "6d33b2b9-2dd3-4915-b5d4-283152c928f1"
+    application          = "sockshop"
   }
 }
 
@@ -200,6 +211,8 @@ EOF
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "d4b631c1-c1d0-4986-affb-fb8b94a6a7a5"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -409,6 +422,8 @@ EOF
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "f7999d4e-c983-43ee-bd88-7903a6f8483e"
+    }, {
+    application = "sockshop"
   })
 }
 
diff --git a/terraform/aws/ec2.tf b/terraform/aws/ec2.tf
index 00e0ba940f..0ac6f376fc 100644
--- a/terraform/aws/ec2.tf
+++ b/terraform/aws/ec2.tf
@@ -28,6 +28,8 @@ EOF
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "347af3cd-4f70-4632-aca3-4d5e30ffc0b6"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -47,6 +49,8 @@ resource "aws_ebs_volume" "web_host_storage" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "c5509daf-10f0-46af-9e03-41989212521d"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -65,6 +69,8 @@ resource "aws_ebs_snapshot" "example_snapshot" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "c1008080-ec2f-4512-a0d0-2e9330aa58f0"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -111,6 +117,7 @@ resource "aws_security_group" "web-node" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "b7af1b40-64eb-4519-a1a0-ab198db4b193"
+    application          = "sockshop"
   }
 }
 
@@ -129,6 +136,8 @@ resource "aws_vpc" "web_vpc" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "9bf2359b-952e-4570-9595-52eba4c20473"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -149,6 +158,8 @@ resource "aws_subnet" "web_subnet" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "0345f650-d280-4ca8-86c9-c71c38c0eda8"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -169,6 +180,8 @@ resource "aws_subnet" "web_subnet2" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "224af03a-00e0-4981-be30-14965833c2db"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -187,6 +200,8 @@ resource "aws_internet_gateway" "web_igw" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "d8e63cb4-2fb5-4726-9c86-5fd05ef03674"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -204,6 +219,8 @@ resource "aws_route_table" "web_rtb" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "5e4fee6e-a6aa-4b61-a741-47c5efb463e1"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -243,6 +260,8 @@ resource "aws_network_interface" "web-eni" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "7e2ffea8-739f-467d-b57b-53cbc0d7ccbe"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -265,6 +284,8 @@ resource "aws_flow_log" "vpcflowlogs" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "6808d4b7-45bc-4d1d-9523-96757a3add3a"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -284,6 +305,8 @@ resource "aws_s3_bucket" "flowbucket" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "f058838a-b1e0-4383-b965-7e06e987ffb1"
+    }, {
+    application = "sockshop"
   })
 }
 
diff --git a/terraform/aws/ecr.tf b/terraform/aws/ecr.tf
index 54973c606e..dea58f9ee2 100644
--- a/terraform/aws/ecr.tf
+++ b/terraform/aws/ecr.tf
@@ -14,6 +14,8 @@ resource aws_ecr_repository "repository" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "7a3ec657-fa54-4aa2-8467-5d08d6c90bc2"
+    }, {
+    application = "sockshop"
   })
 }
 
diff --git a/terraform/aws/eks.tf b/terraform/aws/eks.tf
index 0dd6b0ea37..3d64387871 100644
--- a/terraform/aws/eks.tf
+++ b/terraform/aws/eks.tf
@@ -28,6 +28,7 @@ resource aws_iam_role "iam_for_eks" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "de052596-21a0-43de-8153-469add277b18"
+    application          = "sockshop"
   }
 }
 
@@ -56,6 +57,8 @@ resource aws_vpc "eks_vpc" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "1600ca6c-72f6-45c0-a71d-88e117e51d6b"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -84,6 +87,8 @@ resource aws_subnet "eks_subnet1" {
     "kubernetes.io/cluster/$$$${local.eks_name.value}" = "shared"
     "kubernetes.io/cluster/$$${local.eks_name.value}"  = "shared"
     "kubernetes.io/cluster/$${local.eks_name.value}"   = "shared"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -112,6 +117,8 @@ resource aws_subnet "eks_subnet2" {
     "kubernetes.io/cluster/$$$${local.eks_name.value}" = "shared"
     "kubernetes.io/cluster/$$${local.eks_name.value}"  = "shared"
     "kubernetes.io/cluster/$${local.eks_name.value}"   = "shared"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -137,6 +144,7 @@ resource aws_eks_cluster "eks_cluster" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "7fa14261-c18d-4fa2-aec4-746f6e64d2d3"
+    application          = "sockshop"
   }
 }
 
diff --git a/terraform/aws/elb.tf b/terraform/aws/elb.tf
index 7327513b3d..c5b72e7de8 100644
--- a/terraform/aws/elb.tf
+++ b/terraform/aws/elb.tf
@@ -36,5 +36,7 @@ resource "aws_elb" "weblb" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "b4a83ce9-9a45-43b4-b6d9-1783c282f702"
+    }, {
+    application = "sockshop"
   })
 }
\ No newline at end of file
diff --git a/terraform/aws/es.tf b/terraform/aws/es.tf
index 77df79857b..97f3a34de4 100644
--- a/terraform/aws/es.tf
+++ b/terraform/aws/es.tf
@@ -24,6 +24,7 @@ resource "aws_elasticsearch_domain" "monitoring-framework" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "95131dec-d7c9-49bb-9aff-eb0e2736603b"
+    application          = "sockshop"
   }
 }
 
diff --git a/terraform/aws/iam.tf b/terraform/aws/iam.tf
index 03d9360ccc..07c0d94f03 100644
--- a/terraform/aws/iam.tf
+++ b/terraform/aws/iam.tf
@@ -14,6 +14,8 @@ resource "aws_iam_user" "user" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "9b45b298-c1ea-426a-9644-610780021eaa"
+    }, {
+    application = "sockshop"
   })
 
 }
diff --git a/terraform/aws/kms.tf b/terraform/aws/kms.tf
index 8f27b4f6c1..b17dc77fef 100644
--- a/terraform/aws/kms.tf
+++ b/terraform/aws/kms.tf
@@ -12,6 +12,7 @@ resource "aws_kms_key" "logs_key" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "cd8fa2a7-4868-4cd1-993d-da4644808ce5"
+    application          = "sockshop"
   }
 }
 
diff --git a/terraform/aws/lambda.tf b/terraform/aws/lambda.tf
index 40500dc0a9..3288277bd1 100644
--- a/terraform/aws/lambda.tf
+++ b/terraform/aws/lambda.tf
@@ -26,6 +26,7 @@ EOF
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "93cfa6f9-a257-40c3-b7dc-3c3686929734"
+    application          = "sockshop"
   }
 }
 
@@ -55,5 +56,6 @@ resource "aws_lambda_function" "analysis_lambda" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "f7d8bc47-e5d9-4b09-9d8f-e7b9724d826e"
+    application          = "sockshop"
   }
 }
\ No newline at end of file
diff --git a/terraform/aws/neptune.tf b/terraform/aws/neptune.tf
index 7dd4a0d138..ca60f2453c 100644
--- a/terraform/aws/neptune.tf
+++ b/terraform/aws/neptune.tf
@@ -16,6 +16,7 @@ resource "aws_neptune_cluster" "default" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "0d4cbb85-73ed-4ca0-b1da-296e4185f34e"
+    application          = "sockshop"
   }
 }
 
@@ -35,6 +36,7 @@ resource "aws_neptune_cluster_instance" "default" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "9b2b45fd-6f9f-44fd-b8bc-868b1db178b3"
+    application          = "sockshop"
   }
 }
 
diff --git a/terraform/aws/rds.tf b/terraform/aws/rds.tf
index b9d5b5aebe..d7fab6c133 100644
--- a/terraform/aws/rds.tf
+++ b/terraform/aws/rds.tf
@@ -11,6 +11,7 @@ resource "aws_rds_cluster" "app1-rds-cluster" {
     git_org              = "matansha"
     git_repo             = "terragoat"
     yor_trace            = "b6f2c2ec-0715-46a0-83d4-502e588826d1"
+    application          = "sockshop"
   }
 }
 
@@ -27,6 +28,7 @@ resource "aws_rds_cluster" "app2-rds-cluster" {
     git_org              = "matansha"
     git_repo             = "terragoat"
     yor_trace            = "d33c9292-952b-4c1f-9973-b6dbad519461"
+    application          = "sockshop"
   }
 }
 
@@ -43,6 +45,7 @@ resource "aws_rds_cluster" "app3-rds-cluster" {
     git_org              = "matansha"
     git_repo             = "terragoat"
     yor_trace            = "2a8584b1-7e9d-4739-8e37-366620c92027"
+    application          = "sockshop"
   }
 }
 
@@ -59,6 +62,7 @@ resource "aws_rds_cluster" "app4-rds-cluster" {
     git_org              = "matansha"
     git_repo             = "terragoat"
     yor_trace            = "284aaeed-fd3f-4b7a-b5f8-61a8457f4d83"
+    application          = "sockshop"
   }
 }
 
@@ -75,6 +79,7 @@ resource "aws_rds_cluster" "app5-rds-cluster" {
     git_org              = "matansha"
     git_repo             = "terragoat"
     yor_trace            = "0b2bea23-5ca5-4bd1-956e-b9ed978daadf"
+    application          = "sockshop"
   }
 }
 
@@ -91,6 +96,7 @@ resource "aws_rds_cluster" "app6-rds-cluster" {
     git_org              = "matansha"
     git_repo             = "terragoat"
     yor_trace            = "fcffb961-d859-4be5-997f-d51b50665ada"
+    application          = "sockshop"
   }
 }
 
@@ -107,6 +113,7 @@ resource "aws_rds_cluster" "app7-rds-cluster" {
     git_org              = "matansha"
     git_repo             = "terragoat"
     yor_trace            = "ebc2ac20-23a3-4518-a7ef-3a102b003ab6"
+    application          = "sockshop"
   }
 }
 
@@ -124,6 +131,7 @@ resource "aws_rds_cluster" "app8-rds-cluster" {
     git_repo             = "terragoat"
     yor_trace            = "af643747-0967-4251-8645-3b54882c2507"
 
+    application = "sockshop"
   }
 }
 
@@ -140,5 +148,6 @@ resource "aws_rds_cluster" "app9-rds-cluster" {
     git_org              = "matansha"
     git_repo             = "terragoat"
     yor_trace            = "a0c98536-c751-4743-92f1-a106ce750249"
+    application          = "sockshop"
   }
 }
diff --git a/terraform/aws/s3.tf b/terraform/aws/s3.tf
index 432c57c58b..1e98b2093d 100644
--- a/terraform/aws/s3.tf
+++ b/terraform/aws/s3.tf
@@ -17,12 +17,17 @@ resource "aws_s3_bucket" "data" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "0874007d-903a-4b4c-945f-c9c233e13243"
+    }, {
+    application = "sockshop"
   })
 }
 
 
 resource "aws_s3_bucket" "data_log_bucket" {
   bucket = "data-log-bucket"
+  tags = {
+    application = "sockshop"
+  }
 }
 
 resource "aws_s3_bucket_logging" "data" {
@@ -58,6 +63,8 @@ resource "aws_s3_bucket_object" "data_object" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "a7f01cc7-63c2-41a8-8555-6665e5e39a64"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -80,6 +87,8 @@ resource "aws_s3_bucket" "financials" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "0e012640-b597-4e5d-9378-d4b584aea913"
+    }, {
+    application = "sockshop"
   })
 
 }
@@ -87,6 +96,9 @@ resource "aws_s3_bucket" "financials" {
 
 resource "aws_s3_bucket" "financials_log_bucket" {
   bucket = "financials-log-bucket"
+  tags = {
+    application = "sockshop"
+  }
 }
 
 resource "aws_s3_bucket_logging" "financials" {
@@ -127,12 +139,17 @@ resource "aws_s3_bucket" "operations" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "29efcf7b-22a8-4bd6-8e14-1f55b3a2d743"
+    }, {
+    application = "sockshop"
   })
 }
 
 
 resource "aws_s3_bucket" "operations_log_bucket" {
   bucket = "operations-log-bucket"
+  tags = {
+    application = "sockshop"
+  }
 }
 
 resource "aws_s3_bucket_logging" "operations" {
@@ -164,6 +181,7 @@ resource "aws_s3_bucket" "data_science" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "9a7c8788-5655-4708-bbc3-64ead9847f64"
+    application          = "sockshop"
   }
 }
 
@@ -194,12 +212,17 @@ resource "aws_s3_bucket" "logs" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "01946fe9-aae2-4c99-a975-e9b0d3a4696c"
+    }, {
+    application = "sockshop"
   })
 }
 
 
 resource "aws_s3_bucket" "logs_log_bucket" {
   bucket = "logs-log-bucket"
+  tags = {
+    application = "sockshop"
+  }
 }
 
 resource "aws_s3_bucket_logging" "logs" {
diff --git a/terraform/azure/aks.tf b/terraform/azure/aks.tf
index ebb613bdf0..76df0d48d9 100644
--- a/terraform/azure/aks.tf
+++ b/terraform/azure/aks.tf
@@ -31,5 +31,6 @@ resource azurerm_kubernetes_cluster "k8s_cluster" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "6103d111-864e-42e5-899c-1864de281fd1"
+    application          = "sockshop"
   }
 }
\ No newline at end of file
diff --git a/terraform/azure/app_service.tf b/terraform/azure/app_service.tf
index fa4f23edff..e92f36adda 100644
--- a/terraform/azure/app_service.tf
+++ b/terraform/azure/app_service.tf
@@ -16,6 +16,7 @@ resource azurerm_app_service_plan "example" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "6611bf45-fd5b-467e-b119-d533cd7539b8"
+    application          = "sockshop"
   }
 }
 
@@ -37,6 +38,7 @@ resource azurerm_app_service "app-service1" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "13be096d-c599-46e5-bf54-51c6e9732858"
+    application          = "sockshop"
   }
 }
 
@@ -59,6 +61,7 @@ resource azurerm_app_service "app-service2" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "ec8295ab-af68-4cff-b0f1-b0cf5eaf1b75"
+    application          = "sockshop"
   }
 }
 
diff --git a/terraform/azure/instance.tf b/terraform/azure/instance.tf
index 225872bab1..2cba6848d4 100644
--- a/terraform/azure/instance.tf
+++ b/terraform/azure/instance.tf
@@ -38,6 +38,8 @@ resource azurerm_linux_virtual_machine "linux_machine" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "736ef713-51b8-4178-ad69-406be81f6ef2"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -73,5 +75,7 @@ resource azurerm_windows_virtual_machine "windows_machine" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "41938587-bdfc-4234-b941-560f1ae7d6c0"
+    }, {
+    application = "sockshop"
   })
 }
\ No newline at end of file
diff --git a/terraform/azure/key_vault.tf b/terraform/azure/key_vault.tf
index 7f2be4a6d7..1ad3b4bbc7 100644
--- a/terraform/azure/key_vault.tf
+++ b/terraform/azure/key_vault.tf
@@ -27,6 +27,8 @@ resource "azurerm_key_vault" "example" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "79afeacc-248a-4015-a4fa-76a6a57f06e2"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -52,6 +54,7 @@ resource "azurerm_key_vault_key" "generated" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "afbc6e13-63d9-4e6c-8914-d58b7744b5dd"
+    application          = "sockshop"
   }
 }
 
@@ -68,5 +71,6 @@ resource "azurerm_key_vault_secret" "secret" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "40517524-f05d-485b-bfbe-3fa0dbee511e"
+    application          = "sockshop"
   }
 }
\ No newline at end of file
diff --git a/terraform/azure/mssql.tf b/terraform/azure/mssql.tf
index 1c7f1f9ff4..27a5d1c79f 100644
--- a/terraform/azure/mssql.tf
+++ b/terraform/azure/mssql.tf
@@ -14,6 +14,7 @@ resource "azurerm_storage_account" "security_storage_account" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "4b504d4d-608c-45fe-ae56-807bde6d969f"
+    application          = "sockshop"
   }
 }
 
@@ -33,6 +34,7 @@ resource "azurerm_mssql_server" "mssql1" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "54f6cb23-b30a-4f1d-8064-6f777b9b75db"
+    application          = "sockshop"
   }
 }
 
@@ -52,6 +54,7 @@ resource "azurerm_mssql_server" "mssql2" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "096d2cf2-6d47-41b2-9418-cdedea85e184"
+    application          = "sockshop"
   }
 }
 
@@ -71,6 +74,7 @@ resource "azurerm_mssql_server" "mssql3" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "e71d3fb5-addc-481d-ada6-b7432a768de3"
+    application          = "sockshop"
   }
 }
 
@@ -90,6 +94,7 @@ resource "azurerm_mssql_server" "mssql4" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "c3b85724-4f7e-4c63-a17d-3d04239beae8"
+    application          = "sockshop"
   }
 }
 
@@ -109,6 +114,7 @@ resource "azurerm_mssql_server" "mssql5" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "0240ca84-acc9-47d9-b491-9e7e359787a1"
+    application          = "sockshop"
   }
 }
 
@@ -128,6 +134,7 @@ resource "azurerm_mssql_server" "mssql6" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "042d15fb-edfa-484b-b65e-3d70c50cdee7"
+    application          = "sockshop"
   }
 }
 
@@ -147,6 +154,7 @@ resource "azurerm_mssql_server" "mssql7" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "3f1118e1-5067-452e-906f-5123cfc93711"
+    application          = "sockshop"
   }
 }
 
diff --git a/terraform/azure/networking.tf b/terraform/azure/networking.tf
index ab01c60d07..02092ba38b 100644
--- a/terraform/azure/networking.tf
+++ b/terraform/azure/networking.tf
@@ -12,6 +12,7 @@ resource "azurerm_virtual_network" "example" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "eb19f165-9c21-4a7a-96e5-5bb557a38228"
+    application          = "sockshop"
   }
 }
 
@@ -41,6 +42,7 @@ resource "azurerm_network_interface" "ni_linux" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "2647f099-dff8-4514-8cef-96159380c02a"
+    application          = "sockshop"
   }
 }
 
@@ -63,6 +65,7 @@ resource "azurerm_network_interface" "ni_win" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "2b5dbf28-04fb-4151-a637-a731bbe7ed1d"
+    application          = "sockshop"
   }
 }
 
@@ -103,6 +106,7 @@ resource azurerm_network_security_group "bad_sg" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "1a591ba4-d969-4572-9704-87b5c55c0ba3"
+    application          = "sockshop"
   }
 }
 
@@ -119,6 +123,7 @@ resource azurerm_network_watcher "network_watcher" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "3da368fc-723f-43d2-8e82-08dcc91e5094"
+    application          = "sockshop"
   }
 }
 
@@ -141,5 +146,6 @@ resource azurerm_network_watcher_flow_log "flow_log" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "33a7212e-7f1a-49fc-af73-8e525c5546ec"
+    application          = "sockshop"
   }
 }
\ No newline at end of file
diff --git a/terraform/azure/resource_group.tf b/terraform/azure/resource_group.tf
index cb7ab25f4c..7450d50639 100644
--- a/terraform/azure/resource_group.tf
+++ b/terraform/azure/resource_group.tf
@@ -10,5 +10,6 @@ resource "azurerm_resource_group" "example" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "80b3b0ca-e0d8-4266-8a1f-12c71afd7e18"
+    application          = "sockshop"
   }
 }
\ No newline at end of file
diff --git a/terraform/azure/sql.tf b/terraform/azure/sql.tf
index c466020b92..278ddf93ec 100644
--- a/terraform/azure/sql.tf
+++ b/terraform/azure/sql.tf
@@ -25,6 +25,8 @@ resource "azurerm_sql_server" "example" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "e5ec3432-e61f-4244-b59e-9ecc24ddd4cb"
+    }, {
+    application = "sockshop"
   })
 }
 
@@ -67,6 +69,7 @@ resource "azurerm_mysql_server" "example" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "1ac18c16-09a4-41c9-9a66-6f514050178e"
+    application          = "sockshop"
   }
 }
 
@@ -92,6 +95,7 @@ resource "azurerm_postgresql_server" "example" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "9eae126d-9404-4511-9c32-2243457df459"
+    application          = "sockshop"
   }
 }
 
diff --git a/terraform/azure/storage.tf b/terraform/azure/storage.tf
index 8d6886286d..1cb086bcb8 100644
--- a/terraform/azure/storage.tf
+++ b/terraform/azure/storage.tf
@@ -17,6 +17,7 @@ resource "azurerm_managed_disk" "example" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "d17da7b3-f1c5-4723-9f77-d1b9069459c7"
+    application          = "sockshop"
   }
 }
 
@@ -56,6 +57,7 @@ resource "azurerm_storage_account" "example" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "23861ff4-c42d-495e-80ac-776c74035f43"
+    application          = "sockshop"
   }
 }
 
diff --git a/terraform/gcp/big_data.tf b/terraform/gcp/big_data.tf
index 6ac3b07b2e..0f409503ee 100644
--- a/terraform/gcp/big_data.tf
+++ b/terraform/gcp/big_data.tf
@@ -33,5 +33,6 @@ resource "google_bigquery_dataset" "dataset" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "2560d883-bc3a-4cb6-b9fc-fb666edf626e"
+    application          = "sockshop"
   }
 }
\ No newline at end of file
diff --git a/terraform/gcp/gcs.tf b/terraform/gcp/gcs.tf
index cd6dbac2a8..a3d5bf2c86 100644
--- a/terraform/gcp/gcs.tf
+++ b/terraform/gcp/gcs.tf
@@ -11,6 +11,7 @@ resource "google_storage_bucket" "terragoat_website" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "bd00cd2e-f53f-4daf-8d4d-74c47846c1cc"
+    application          = "sockshop"
   }
 }
 
diff --git a/terraform/gcp/instances.tf b/terraform/gcp/instances.tf
index a1b035dd63..45e340b239 100644
--- a/terraform/gcp/instances.tf
+++ b/terraform/gcp/instances.tf
@@ -30,6 +30,7 @@ resource "google_compute_instance" "server" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "cd562b76-fbce-4e60-8c75-c9f43d7ffc16"
+    application          = "sockshop"
   }
 }
 
@@ -44,5 +45,6 @@ resource "google_compute_disk" "unencrypted_disk" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "bf87b7d7-a9d8-4f03-a0d4-8a4cbb647d03"
+    application          = "sockshop"
   }
 }
\ No newline at end of file