diff --git a/terraform-organization-info-role/main.tf b/terraform-organization-info-role/main.tf
index b7e6133..1d0cb2b 100644
--- a/terraform-organization-info-role/main.tf
+++ b/terraform-organization-info-role/main.tf
@@ -26,8 +26,9 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
-    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
-    "boc:created_by"        = "terraform"
+    #    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
+    "boc:tf_module_name" = local._module_name
+    "boc:created_by"     = "terraform"
   }
 
   role_name        = format("%v%v", lookup(local._prefixes, "role", ""), var.role_name)