diff --git a/terraform/aws/control-plane.tf b/terraform/aws/control-plane.tf
index de10576..43305af 100644
--- a/terraform/aws/control-plane.tf
+++ b/terraform/aws/control-plane.tf
@@ -5,7 +5,8 @@ locals {
 data "aws_subnet_ids" "private" {
   vpc_id = "${module.vpc.vpc_id}"
   tags = {
-    Tier = "private-${var.prefix}-${var.name}"
+    Name = "private-${var.prefix}-${var.name}"
+    Tier = "Private"
   }
 }
 
diff --git a/terraform/aws/vpc.tf b/terraform/aws/vpc.tf
index 0e8fc5a..a17e6ad 100644
--- a/terraform/aws/vpc.tf
+++ b/terraform/aws/vpc.tf
@@ -25,13 +25,14 @@ module "vpc" {
     Name = "private-${var.prefix}-${var.name}"
     Terraform = "true"
     Environment = "${local.environment}"
-
+    Tier = "Private"
   }
 
   public_subnet_tags = {
     Name = "public-${var.prefix}-${var.name}"
     Terraform = "true"
     Environment = "${local.environment}"
+    Tier = "Public"
   }
 
 }