diff --git a/infra/terraform/test-org/org-iam-policy/.terraform.lock.hcl b/infra/terraform/test-org/org-iam-policy/.terraform.lock.hcl
index fc858c57bca..4bad9fe26fb 100644
--- a/infra/terraform/test-org/org-iam-policy/.terraform.lock.hcl
+++ b/infra/terraform/test-org/org-iam-policy/.terraform.lock.hcl
@@ -2,21 +2,21 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/hashicorp/google" {
-  version     = "4.23.0"
-  constraints = ">= 3.39.0, < 5.0.0"
+  version     = "5.3.0"
+  constraints = ">= 3.39.0, < 6.0.0"
   hashes = [
-    "h1:jy/SN60OhkytGOJUqCrV1lcDnuC/wKjtPJEmDUuoKYo=",
-    "zh:0827aed99587324e0f3f26f374fdbbd807ebff028f5fef02af9f88fedea07743",
-    "zh:1881533c70e995662241fbc33439202237c9570ae0c5e96bee0660e2f05c8e83",
-    "zh:195cb52ad2195c56926d6354c1ae8179a0ca63601da5aac3e9ac31537a8cffdd",
-    "zh:26bfff740b6ce167b6369dd99eece5a4f540b1efa13dfcba13d7b262b790873d",
-    "zh:5bd28272c02d4f4031d68f34c2d845167760b84b70172055cf9725315f2d0f8c",
-    "zh:6fda7aa01758175c025800bd29cd5c5904278c18eb225059d2d9655ce763c202",
-    "zh:7003b6bf8074e37b919ebcdc1dcfacba24b5244cb959dd5ea4ab2e32394da466",
-    "zh:9040f7bf02c473cbf87497b07bc28b1e6e137c1b5f28f3d959387f4738884b36",
-    "zh:b6d7752e332f7d48851e48d703254d0c2a0ee44d5ee289db89a04943c5c6c51d",
-    "zh:f51e41a41c358d953d08977cef118c1b192ce8968ffe4d063748903218d3b880",
+    "h1:FGOSaAf5Fcw2GVPlGMlytcmhDxnSt3f2PfAewDS9km4=",
+    "zh:17849daec20cd82de916c897c730285267c62b5291bc24cd3fbdac5d10be746a",
+    "zh:1bab50e2eb7382e7342095417a1119e65dee1b62a5c0d93f8df724be4421c3fd",
+    "zh:3a800e3ea8de0d2b3b69f3256461878a5e0a6cfd0801fd762a087578ad42a207",
+    "zh:3dc70168baa91f6815a7e1885c4e29cadd2c67f41d9267a9278b6626c8fac594",
+    "zh:4000c3e16ea1bc3b5636ec18dba080135a90c0d4365597331ead9f30860041af",
+    "zh:58d812b8869158b2bf9c4a1a9676b6283a1914104234e8e70c36d4e1985abded",
+    "zh:908ff6a2a144ee76f4b68ce88164533343b2f860b8ee510107ff8e026856f5c1",
+    "zh:b606b6516151a947b7d9485cf330366b9c1b439677f8732cae6677cc3dc0a71f",
+    "zh:b623cda8316699b40db50081f79e361935d6b66b07d9dd607ed3598e51a8ffdf",
+    "zh:e99693fc83a8017dab5136d41a688777bb1e76076e837f2039fd6d69fe5dcfc4",
     "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c",
-    "zh:fc502588ca54660f1701d786e4edb4aadb0e51078d9c1bd33f2a8b7b6373c7f0",
+    "zh:fd7a7e58aa0baa9f3dd05ec693a2849ed8f724c34b8c42b3cbc4919399e622cd",
   ]
 }
diff --git a/infra/terraform/test-org/org-iam-policy/iam.tf b/infra/terraform/test-org/org-iam-policy/iam.tf
index 87e4362acde..a8289d63527 100644
--- a/infra/terraform/test-org/org-iam-policy/iam.tf
+++ b/infra/terraform/test-org/org-iam-policy/iam.tf
@@ -35,10 +35,8 @@ locals {
     "roles/resourcemanager.lienModifier" : ["serviceAccount:${local.project_cleaner}"],
     "roles/resourcemanager.organizationAdmin" : [
       "group:${local.cft_ci_group}",
-      "group:${local.gcp_admins_group_test}",
-      "serviceAccount:${data.google_secret_manager_secret_version.org-admin-sa.secret_data}",
+      "group:${local.gcp_admins_group_test}",      
     ],
-    "roles/iam.organizationRoleAdmin" : ["serviceAccount:${data.google_secret_manager_secret_version.org-role-admin-sa.secret_data}", ],
     "roles/resourcemanager.organizationViewer" : ["group:${local.cft_ci_group}"],
     "roles/resourcemanager.projectDeleter" : ["serviceAccount:${local.project_cleaner}"],
     "roles/owner" : ["group:${local.gcp_admins_group_test}", "serviceAccount:${local.project_cleaner}"],
@@ -68,16 +66,6 @@ locals {
   }
 }
 
-data "google_secret_manager_secret_version" "org-admin-sa" {
-  project = "cloud-foundation-cicd"
-  secret  = "org-admin-sa"
-}
-
-data "google_secret_manager_secret_version" "org-role-admin-sa" {
-  project = "cloud-foundation-cicd"
-  secret  = "org-role-admin-sa"
-}
-
 data "google_secret_manager_secret_version" "ba-admin-1" {
   project = "cloud-foundation-cicd"
   secret  = "ba-admin-1"
diff --git a/infra/terraform/test-org/org-iam-policy/versions.tf b/infra/terraform/test-org/org-iam-policy/versions.tf
index f32914b7e7b..8f1f5b64571 100644
--- a/infra/terraform/test-org/org-iam-policy/versions.tf
+++ b/infra/terraform/test-org/org-iam-policy/versions.tf
@@ -18,7 +18,7 @@ terraform {
   required_version = ">= 1.4.4"
   required_providers {
     google = {
-      version = ">= 3.39, < 5.0"
+      version = ">= 3.39, < 6"
     }
   }
 }