diff --git a/fast/stages/0-org-setup/cicd.tf b/fast/stages/0-org-setup/cicd.tf
index 6d09e56e7..f7006a797 100644
--- a/fast/stages/0-org-setup/cicd.tf
+++ b/fast/stages/0-org-setup/cicd.tf
@@ -23,7 +23,7 @@ locals {
     "$iam_principals:${k}" => v
   }
   cicd_ctx_wif = try({
-    "$wif_pools:${local.wif_pool_name}" = google_iam_workload_identity_pool.default.0.name
+    "$wif_pools:${local.wif_pool_name}" = google_iam_workload_identity_pool.default[0].name
   }, {})
   # normalize workflow configurations
   cicd_workflows = {
diff --git a/fast/stages/0-org-setup/output-files.tf b/fast/stages/0-org-setup/output-files.tf
index 8d138162c..e399aaf99 100644
--- a/fast/stages/0-org-setup/output-files.tf
+++ b/fast/stages/0-org-setup/output-files.tf
@@ -67,7 +67,7 @@ locals {
       )
       iam_principals = local.iam_principals
       logging = {
-        writer_identities = module.organization-iam.0.sink_writer_identities
+        writer_identities = module.organization-iam[0].sink_writer_identities
         project_number    = module.factory.project_numbers["log-0"]
       }
       project_ids = merge(