diff --git a/modules/cloud-build-v2-connection/README.md b/modules/cloud-build-v2-connection/README.md
index 901efefa8..d2052f0a7 100644
--- a/modules/cloud-build-v2-connection/README.md
+++ b/modules/cloud-build-v2-connection/README.md
@@ -540,7 +540,7 @@ module "cb_connection" {
 | [iam_bindings](variables-iam.tf#L23) | Authoritative IAM bindings in {KEY => {role = ROLE, members = [], condition = {}}}. Keys are arbitrary. | <code title="map&#40;object&#40;&#123;&#10;  members &#61; list&#40;string&#41;&#10;  role    &#61; string&#10;  condition &#61; optional&#40;object&#40;&#123;&#10;    expression  &#61; string&#10;    title       &#61; string&#10;    description &#61; optional&#40;string&#41;&#10;  &#125;&#41;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
 | [iam_bindings_additive](variables-iam.tf#L38) | Individual additive IAM bindings. Keys are arbitrary. | <code title="map&#40;object&#40;&#123;&#10;  member &#61; string&#10;  role   &#61; string&#10;  condition &#61; optional&#40;object&#40;&#123;&#10;    expression  &#61; string&#10;    title       &#61; string&#10;    description &#61; optional&#40;string&#41;&#10;  &#125;&#41;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
 | [iam_by_principals](variables-iam.tf#L53) | Authoritative IAM binding in {PRINCIPAL => [ROLES]} format. Principals need to be statically defined to avoid cycle errors. Merged internally with the `iam` variable. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [repositories](variables.tf#L118) | Repositories. | <code title="map&#40;object&#40;&#123;&#10;  remote_uri  &#61; string&#10;  annotations &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;  triggers &#61; optional&#40;map&#40;object&#40;&#123;&#10;    approval_required &#61; optional&#40;bool, false&#41;&#10;    description       &#61; optional&#40;string&#41;&#10;    pull_request &#61; optional&#40;object&#40;&#123;&#10;      branch          &#61; optional&#40;string&#41;&#10;      invert_regex    &#61; optional&#40;string&#41;&#10;      comment_control &#61; optional&#40;string&#41;&#10;    &#125;&#41;&#41;&#10;    push &#61; optional&#40;object&#40;&#123;&#10;      branch       &#61; optional&#40;string&#41;&#10;      invert_regex &#61; optional&#40;string&#41;&#10;      tag          &#61; optional&#40;string&#41;&#10;    &#125;&#41;&#41;&#10;    disabled           &#61; optional&#40;bool, false&#41;&#10;    filename           &#61; string&#10;    include_build_logs &#61; optional&#40;string&#41;&#10;    substitutions      &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;    service_account    &#61; optional&#40;string&#41;&#10;    tags               &#61; optional&#40;map&#40;string&#41;&#41;&#10;  &#125;&#41;&#41;, &#123;&#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [repositories](variables.tf#L118) | Repositories. | <code title="map&#40;object&#40;&#123;&#10;  remote_uri  &#61; string&#10;  annotations &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;  triggers &#61; optional&#40;map&#40;object&#40;&#123;&#10;    approval_required &#61; optional&#40;bool, false&#41;&#10;    description       &#61; optional&#40;string&#41;&#10;    pull_request &#61; optional&#40;object&#40;&#123;&#10;      branch          &#61; optional&#40;string&#41;&#10;      invert_regex    &#61; optional&#40;string&#41;&#10;      comment_control &#61; optional&#40;string&#41;&#10;    &#125;&#41;&#41;&#10;    push &#61; optional&#40;object&#40;&#123;&#10;      branch       &#61; optional&#40;string&#41;&#10;      invert_regex &#61; optional&#40;string&#41;&#10;      tag          &#61; optional&#40;string&#41;&#10;    &#125;&#41;&#41;&#10;    disabled           &#61; optional&#40;bool, false&#41;&#10;    filename           &#61; string&#10;    include_build_logs &#61; optional&#40;string&#41;&#10;    substitutions      &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;    service_account    &#61; optional&#40;string&#41;&#10;    tags               &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;  &#125;&#41;&#41;, &#123;&#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
 
 ## Outputs
 
diff --git a/modules/cloud-build-v2-connection/main.tf b/modules/cloud-build-v2-connection/main.tf
index 76f162cda..a385897f0 100644
--- a/modules/cloud-build-v2-connection/main.tf
+++ b/modules/cloud-build-v2-connection/main.tf
@@ -165,6 +165,9 @@ resource "google_cloudbuild_trigger" "triggers" {
       }
     }
   }
-
-  filename = each.value.filename
-}
\ No newline at end of file
+  include_build_logs = each.value.include_build_logs
+  tags               = each.value.tags
+  substitutions      = each.value.substitutions
+  service_account    = each.value.service_account
+  filename           = each.value.filename
+}
diff --git a/modules/cloud-build-v2-connection/variables.tf b/modules/cloud-build-v2-connection/variables.tf
index 93667e886..d07de7504 100644
--- a/modules/cloud-build-v2-connection/variables.tf
+++ b/modules/cloud-build-v2-connection/variables.tf
@@ -138,7 +138,7 @@ variable "repositories" {
       include_build_logs = optional(string)
       substitutions      = optional(map(string), {})
       service_account    = optional(string)
-      tags               = optional(map(string))
+      tags               = optional(list(string), [])
     })), {})
   }))
   default  = {}
diff --git a/tests/modules/cloud_build_v2_connection/examples/bitbucket-cloud.yaml b/tests/modules/cloud_build_v2_connection/examples/bitbucket-cloud.yaml
index 995459840..db0c0561d 100644
--- a/tests/modules/cloud_build_v2_connection/examples/bitbucket-cloud.yaml
+++ b/tests/modules/cloud_build_v2_connection/examples/bitbucket-cloud.yaml
@@ -40,7 +40,7 @@ values:
     service_account: null
     source_to_build: []
     substitutions: null
-    tags: null
+    tags: []
     timeouts: null
     trigger_template: []
     webhook_config: []
diff --git a/tests/modules/cloud_build_v2_connection/examples/bitbucket-data-center.yaml b/tests/modules/cloud_build_v2_connection/examples/bitbucket-data-center.yaml
index 90bb58a71..15b6064c8 100644
--- a/tests/modules/cloud_build_v2_connection/examples/bitbucket-data-center.yaml
+++ b/tests/modules/cloud_build_v2_connection/examples/bitbucket-data-center.yaml
@@ -40,7 +40,7 @@ values:
     service_account: null
     source_to_build: []
     substitutions: null
-    tags: null
+    tags: []
     timeouts: null
     trigger_template: []
     webhook_config: []
diff --git a/tests/modules/cloud_build_v2_connection/examples/github-enterprise.yaml b/tests/modules/cloud_build_v2_connection/examples/github-enterprise.yaml
index adee8fbdc..e861b8ea5 100644
--- a/tests/modules/cloud_build_v2_connection/examples/github-enterprise.yaml
+++ b/tests/modules/cloud_build_v2_connection/examples/github-enterprise.yaml
@@ -39,7 +39,7 @@ values:
     service_account: null
     source_to_build: []
     substitutions: null
-    tags: null
+    tags: []
     timeouts: null
     trigger_template: []
     webhook_config: []
diff --git a/tests/modules/cloud_build_v2_connection/examples/github.yaml b/tests/modules/cloud_build_v2_connection/examples/github.yaml
index e98268f08..47dfa8f3d 100644
--- a/tests/modules/cloud_build_v2_connection/examples/github.yaml
+++ b/tests/modules/cloud_build_v2_connection/examples/github.yaml
@@ -39,7 +39,7 @@ values:
     service_account: null
     source_to_build: []
     substitutions: null
-    tags: null
+    tags: []
     timeouts: null
     trigger_template: []
     webhook_config: []
diff --git a/tests/modules/cloud_build_v2_connection/examples/gitlab.yaml b/tests/modules/cloud_build_v2_connection/examples/gitlab.yaml
index ed183f888..77eacf7d2 100644
--- a/tests/modules/cloud_build_v2_connection/examples/gitlab.yaml
+++ b/tests/modules/cloud_build_v2_connection/examples/gitlab.yaml
@@ -39,7 +39,7 @@ values:
     service_account: null
     source_to_build: []
     substitutions: null
-    tags: null
+    tags: []
     timeouts: null
     trigger_template: []
     webhook_config: []