diff --git a/main.tf b/main.tf
index 7a35ed9..49ac753 100644
--- a/main.tf
+++ b/main.tf
@@ -11,6 +11,11 @@ locals {
     "172.16.0.0/12",
   "192.168.0.0/16"])
   filtered_endpoint_public_access_cidrs = distinct([for cidr in var.census_private_cidr : cidr if ! contains(local.disallowed_public_endpoint_cidrs, lower(trimspace(cidr)))])
+  tags = merge(
+    module.tags.tags,
+    { "kubernetes.io/cluster/${var.cluster_name}" = "owned" },
+    { "boc:created-by" = "launch-template" }
+  )
 }
 
 resource "terraform_data" "subnet_validation" {
@@ -89,13 +94,8 @@ module "cluster" {
       labels = {
         "karpenter.sh/controller" = "true"
       }
-      tag_specifications = ["instance", "volume"]
-      tags = merge(
-        module.tags.tags,
-        {
-          "kubernetes.io/cluster/${var.cluster_name}" = "owned"
-        }
-      )
+      tag_specifications = ["instance", "volume", "network-interface"]
+      tags               = local.tags
     }
   }
 }
diff --git a/tags.tf b/tags.tf
index 7ed73e0..d94339b 100644
--- a/tags.tf
+++ b/tags.tf
@@ -1,6 +1,7 @@
 module "tags" {
   # tflint-ignore: terraform_module_pinned_source
-  source   = "git@github.e.it.census.gov:terraform-modules/boc-nts//tags"
+  source = "git@github.e.it.census.gov:terraform-modules/boc-nts//tags"
+  # tags.yml will be generated via terragrunt in root.hcl
   filename = format("%v/%v", path.root, "tags.yml")
 
 }
diff --git a/tags.yml b/tags.yml
deleted file mode 100644
index 18fa5e4..0000000
--- a/tags.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-finops:
-  number: tonumber(regex("[0-9]+$", var.finops_project_number))
-  name: "${var.finops_project_name}"
-  roles:
-    - eks