diff --git a/modules/cloud-run/main.tf b/modules/cloud-run/main.tf
index 1fb010e2a..35117337f 100644
--- a/modules/cloud-run/main.tf
+++ b/modules/cloud-run/main.tf
@@ -56,7 +56,7 @@ resource "google_cloud_run_service" "service" {
   template {
     spec {
       dynamic "containers" {
-        for_each = var.containers == null ? [] : var.containers
+        for_each = var.containers == null ? {} : {for i, container in var.containers: i => container}
         content {
           image   = containers.value["image"]
           command = containers.value["command"]