diff --git a/modules/services/cloud-bench-workload-identity/main.tf b/modules/services/cloud-bench-workload-identity/main.tf
index 1d18b2a..089d35a 100644
--- a/modules/services/cloud-bench-workload-identity/main.tf
+++ b/modules/services/cloud-bench-workload-identity/main.tf
@@ -6,12 +6,19 @@ data "google_projects" "all_projects" {
   filter = "parent.id:${data.google_organization.org.org_id} parent.type:organization lifecycleState:ACTIVE"
 }
 
+data "google_project" "project" {
+  for_each = {
+    for project_id in local.project_ids : project_id => project_id
+  }
+  project_id = each.key
+}
+
 locals {
   # If specific projects are specified, use that list. Otherwise, use all active projects in the org
   project_ids = length(var.project_ids) == 0 ? [for p in data.google_projects.all_projects.projects : p.project_id] : var.project_ids
 
   # Fetch both the project ID and project number (Needed by Workload Identity Federation)
-  project_id_to_number_map = { for p in data.google_projects.all_projects.projects : p.project_id => p.number }
+  project_id_to_number_map = { for project_id, project in data.google_project.project : project_id => project.number }
 }
 
 module "trust_relationship" {