diff --git a/tags.tf b/tags.tf
index f770068..5b5cd5f 100644
--- a/tags.tf
+++ b/tags.tf
@@ -10,6 +10,6 @@ locals {
     "sqs",
     "secret",
   ]
-  input_finops_roles = {for r in local.tag_roles: r => { "finops_project_role" = trimprefix(format("%v_%v",lookup(var.input_resource_tags,"finops_project_name","")),"_") } }
-  output_finops_roles = {for r in local.tag_roles: r => { "finops_project_role" = trimprefix(format("%v_%v",lookup(var.output_resource_tags,"finops_project_name","")),"_") } }
+  input_finops_roles = {for r in local.tag_roles: r => { "finops_project_role" = trimprefix(format("%v_%v",lookup(var.input_resource_tags,"finops_project_name",""),r),"_") } }
+  output_finops_roles = {for r in local.tag_roles: r => { "finops_project_role" = trimprefix(format("%v_%v",lookup(var.output_resource_tags,"finops_project_name",""),r),"_") } }
 }
diff --git a/version.tf b/version.tf
index 3c96249..d7d246c 100644
--- a/version.tf
+++ b/version.tf
@@ -1,4 +1,4 @@
 locals {
   _module_name = "aws-app-ditd-darhts-s3-transfer"
-  _module_version = "0.9.6"
+  _module_version = "0.9.7"
 }