diff --git a/modules/v2/main.tf b/modules/v2/main.tf
index 6a83bcd7..b65fdca8 100644
--- a/modules/v2/main.tf
+++ b/modules/v2/main.tf
@@ -69,9 +69,12 @@ resource "google_cloud_run_v2_service" "main" {
         working_dir = containers.value.working_dir
         depends_on  = containers.value.depends_on_container
 
-        ports {
-          name           = containers.value.ports["name"]
-          container_port = containers.value.ports["container_port"]
+        dynamic "ports" {
+          for_each = containers.value.ports != null ? [containers.value.ports] : []
+          content {
+            name           = ports.value["name"]
+            container_port = ports.value["container_port"]
+          }
         }
 
         resources {
diff --git a/modules/v2/variables.tf b/modules/v2/variables.tf
index 112e1df3..ace920d7 100644
--- a/modules/v2/variables.tf
+++ b/modules/v2/variables.tf
@@ -291,7 +291,10 @@ variable "containers" {
         http_headers = optional(list(object({
           name  = string
           value = string
-        })), null)
+        })), [])
+      }), null)
+      tcp_socket = optional(object({
+        port = optional(number)
       }), null)
       grpc = optional(object({
         port    = optional(number)