diff --git a/local-app/aws-account-setup/ansible/roles/inf-common/files/tags.tf b/local-app/aws-account-setup/ansible/roles/inf-common/files/tags.tf
new file mode 100644
index 00000000..4ce19b82
--- /dev/null
+++ b/local-app/aws-account-setup/ansible/roles/inf-common/files/tags.tf
@@ -0,0 +1,10 @@
+module "tags" {
+  source   = "git@github.e.it.census.gov:terraform-modules/boc-nts//tags"
+  filename = format("%v/%v", path.root, "tags.yml")
+
+  legacy_tags = merge(
+    var.account_tags,
+    var.infrastructure_tags,
+    var.application_tags,
+  )
+}
diff --git a/local-app/aws-account-setup/ansible/roles/inf-common/files/tags.yml b/local-app/aws-account-setup/ansible/roles/inf-common/files/tags.yml
new file mode 100644
index 00000000..4e7c6bbb
--- /dev/null
+++ b/local-app/aws-account-setup/ansible/roles/inf-common/files/tags.yml
@@ -0,0 +1,5 @@
+finops:
+  number: 0
+  name: inf_management
+  roles:
+    - servicelinkedrole
diff --git a/local-app/aws-account-setup/ansible/roles/inf-common/vars/main.yml b/local-app/aws-account-setup/ansible/roles/inf-common/vars/main.yml
index 9e3938dd..6771f497 100644
--- a/local-app/aws-account-setup/ansible/roles/inf-common/vars/main.yml
+++ b/local-app/aws-account-setup/ansible/roles/inf-common/vars/main.yml
@@ -16,6 +16,8 @@ main_files:
   - service-linked-roles.tf
   - variables.service-linked-roles.auto.tfvars
   - variables.service-linked-roles.tf
+  - tags.tf
+  - tags.yml
 
 main_files_ew:
   - INF.role.billing.tf