diff --git a/modules/custom_role_iam/main.tf b/modules/custom_role_iam/main.tf
index d1ab8ffd..21a396f6 100644
--- a/modules/custom_role_iam/main.tf
+++ b/modules/custom_role_iam/main.tf
@@ -26,7 +26,7 @@ locals {
  *****************************************/
 data "google_iam_role" "role_permissions" {
   for_each = toset(var.base_roles)
-  name     = "${each.value}"
+  name     = each.value
 }
 
 /******************************************
diff --git a/modules/pubsub_topics_iam/README.md b/modules/pubsub_topics_iam/README.md
index 4bbb6812..122d1a27 100644
--- a/modules/pubsub_topics_iam/README.md
+++ b/modules/pubsub_topics_iam/README.md
@@ -30,7 +30,7 @@ module "pubsub_topic-iam-bindings" {
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| bindings | Map of role (key) and list of members (value) to add the IAM policies/bindings | map | n/a | yes |
+| bindings | Map of role (key) and list of members (value) to add the IAM policies/bindings | map(any) | n/a | yes |
 | mode | Mode for adding the IAM policies/bindings, additive and authoritative | string | `"additive"` | no |
 | project | Project to add the IAM policies/bindings | string | `""` | no |
 | pubsub\_topics | PubSub Topics list to add the IAM policies/bindings | list(string) | `<list>` | no |
diff --git a/modules/pubsub_topics_iam/variables.tf b/modules/pubsub_topics_iam/variables.tf
index d45ae155..4b5b2580 100644
--- a/modules/pubsub_topics_iam/variables.tf
+++ b/modules/pubsub_topics_iam/variables.tf
@@ -33,5 +33,5 @@ variable "mode" {
 
 variable "bindings" {
   description = "Map of role (key) and list of members (value) to add the IAM policies/bindings"
-  type        = map
+  type        = map(any)
 }