diff --git a/infra/terraform/test-org/test-cleanup/.terraform.lock.hcl b/infra/terraform/test-org/test-cleanup/.terraform.lock.hcl
index 798229f1ce8..4d482b42957 100644
--- a/infra/terraform/test-org/test-cleanup/.terraform.lock.hcl
+++ b/infra/terraform/test-org/test-cleanup/.terraform.lock.hcl
@@ -22,42 +22,62 @@ provider "registry.terraform.io/hashicorp/archive" {
 }
 
 provider "registry.terraform.io/hashicorp/google" {
-  version     = "5.39.1"
-  constraints = ">= 3.38.0, >= 3.43.0, >= 3.53.0, >= 4.23.0, >= 4.28.0, >= 4.78.0, >= 5.22.0, < 6.0.0"
+  version     = "6.2.0"
+  constraints = ">= 3.38.0, < 7.0.0"
   hashes = [
-    "h1:6AJPkCW3JqdpVO+HCb8g0mzZyZXPUEt/+3BTmCGnTTg=",
-    "zh:28763694f5f06a98a4745f0e37f8f8ae412e48a6cfd9b7339599abf89e7577c5",
-    "zh:469a415b398a08c8b479e32cb24b028791eac57bdab3c15d8b987290e55bfa55",
-    "zh:4a1f97c58f22379f7c98c7bfe94c923d58c41cb9801679e1a54f85c9848af48c",
-    "zh:4b2bc066b977cf57de895d1a68f47cc4df48cc7ce0054f8c3de06f6cd63f263d",
-    "zh:6436aa9a7721079f0784b3ccc0da953337f96500bd34a5ba927fe1833392c54a",
-    "zh:6b0833e932bc904dee2ca320d5efb785766fd4474c041128868232cc78a0e764",
-    "zh:8c2a47a571dce3b825fd90789d1af3699cdd615f06e5bf13258585d1560222b8",
-    "zh:ae5b4cdc76720165023870bc9899bb7de9aee8f4ead95dd368a6ebad95176fe4",
-    "zh:c30307a74d64f61fbd5a6b5e8658e4d11152ee1f54f43a02c0fe734e5f0f529a",
-    "zh:e892a200145641b8ae55ba0f69cf83454267b41e0f2d3b6932d4d917d8112911",
-    "zh:ecd95d22838181ae578eba90154a972661bcdc779f728d71957c059b56c7fd61",
+    "h1:+Ay1yMTOoQUNhjnJ/eFEtcTMFwRsEXR+wgQWQpzpUuw=",
+    "h1:3DEuIo5tM30/5qLmPxSSpqsLXTG34Ytpn1LrCrUxy4M=",
+    "h1:7JIgzQKRW0AT6UliiYSjYUKxDr03baZpQmt5XVkrujs=",
+    "h1:7TKW5gYtdDdKsw1ClsmMvMmXYJ8ZS3Jj2XAQ2PE6UL8=",
+    "h1:BniZy2CQQ0fDpMQgbZ0yOYGWpHVYNz7MSDeo43pSUi4=",
+    "h1:EDFKnPnWxF2Ybh4J0JI0lTZH8qirZ1YhpQnjzYmjgiU=",
+    "h1:Eyeu/3LudGXSl1Qjc85N6hgMLRBsVvexDO/yV0HE2QU=",
+    "h1:PFveImR1MxjStqlyBnhdIVFcW9oQVbF1CDPPvPzyjQU=",
+    "h1:UxvDChhLSDDaAi0ZVnpy7Kkuig++i4hoAphxSLvDUBE=",
+    "h1:obzdN6cgJTQT9T7yGqyAj9CQsromh4AFvtu33YZS5Fk=",
+    "h1:uIH0V+p/2CkA0BKowLg9BqeJPka6+Cc3qMI0XXlrFZE=",
+    "zh:08a7dc0b53d2b63baab928e66086bf3e09107516af078ce011d2667456e64834",
+    "zh:1cf9a1373e516844b43fdcea36e73f5a68f19ad07afcf6093788eb235c710163",
+    "zh:2d4a7cb26c3f0d036d51db219a09013d3d779e44d584e0fc631df0f2cd5e5550",
+    "zh:47e1fc68e455f99f1875deaed9aa5434a852e2a70a3cb5a5e9b5a2d8c25d7b74",
+    "zh:78531a8624ddcd45277e1b465e773ac92001ea0e200e9dc1147ebeb24d56359e",
+    "zh:a76751723c034d44764df22925178f78d8b4852e3e6ac6c5d86f51666c9e666c",
+    "zh:a83a59a7e667cfffb0d501a501e9b3d2d4fcc83deb07a318c9690d537cbdc4b6",
+    "zh:b16473b7e59e01690d8234a0044c304505688f5518b205e9ed06fc63ddc82977",
+    "zh:b957648ad0383e17149bf3a02def81ebc6bd55ca0cffb6ec1c368a1b4f33c4fd",
+    "zh:e2f3f4a27b41a20bdbb7a80fbcde1a4c36bbd1c83edb9256bc1724754f8d370f",
+    "zh:ecfce738f85a81603aa51162d5237d6faaa2ffc0f0e52694f8b420ad761a8957",
     "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/google-beta" {
-  version     = "5.39.1"
-  constraints = ">= 3.38.0, >= 3.43.0, >= 4.11.0, >= 5.22.0, < 6.0.0"
+  version     = "6.2.0"
+  constraints = ">= 3.38.0, < 7.0.0"
   hashes = [
-    "h1:KOBwBBNtenF6bAgQlvIdtx4tfnrl2iXNRyAYAYfpqA4=",
-    "zh:07fcc7db2fdc302627f2cddd16fe6b2bf1e8a0fd24e41172afaee96dcb7894bd",
-    "zh:0f17e28afe3322b692cf912b09378333f59e51d3e62da27e8a337e86b34cb9e9",
-    "zh:252abaeb1dd9739f7b919d1ed3728c20f266c761125b6c33dc17fbbf08af77fb",
-    "zh:313c8db8dfb4b80d44aff470d6dcc2c7f5f6dbf4484717636e7fe42a401f5dff",
-    "zh:353ecd422983e3d993c7daa3fb0d7fd6663b663dfd95894734dc8f5261dba6bf",
-    "zh:486ffdfe5e834a03dd374813451fb6ec15392934b1adfadac0b9c2485f6f8e27",
-    "zh:847a88f8c392efd0c84e85d716d2ab7ec3a2d52c213c6b79db67aedd31b23a81",
-    "zh:9569b0d3029198d5dac39a7d714553d3456eb9db885393965f585b33ded60c7e",
-    "zh:b79475e63c78a24c70500c0e28e7526104b385fd5fa08f332d8bf0c94d6597de",
-    "zh:bf70c9fcd96d2abd1d3682cfd39075709745185b874a005465c6c067ce102dee",
-    "zh:d644a1043481d16a5788847b4204933f528bf65fb571546aec62f7da19d7e6b4",
+    "h1:7YrL+OYouqsQo6djWzB5hgSP08v83FA313u1COKJ5O4=",
+    "h1:PdobuOl1Qr5YmKCHXd+NJpVN7J1XXPayB3vk2RU+vbk=",
+    "h1:TNLv7TBGcUsYoX4ZSUCbPNkAFfEtfcaVJC3+qA9SSKo=",
+    "h1:V0g3vq58XGOAlICVusnK+z2VodB3Kyuqu+RyTPOC2cE=",
+    "h1:YQrCVGVyVEKQ3pIbcus4t1X9NMHCesGd4wVErbzz0kQ=",
+    "h1:Zvs/MtvRC3mtk3ewQxT55SoUXW1tsT1ssq7IlZXz+Lg=",
+    "h1:dDtKVeSAp8J+JbmANU4+0RnsmW+4LtN2G9Fjo/BX4qc=",
+    "h1:dXvks0WhbUYXaidNAF40/Zk/vroWqPWfGnJmaJMvc0Y=",
+    "h1:rDpLrqSZEnuUP697LITaMqmIF6k2j9wGLG9mGNl79Zs=",
+    "h1:to4q49Q7eL5ybePsEdArAPiPRfWl8R3fX4j26nwc7T0=",
+    "h1:zNreg7fJLOg1IKIvHeo+vtAfDPTi1EN2xSfV/6sSReI=",
+    "zh:01d227ce9fd7538b331efa669fadb33cc9cf6fd3c76351a70b6f71fc513494a2",
+    "zh:03113bccea6da3ac7c9187728182e940869f17285854709bb9f2d4aed34e44f2",
+    "zh:33b93d97b757b3d92a566a553a79b1ebd1c6bbdfa3c5e3244b8fe6f73789dff8",
+    "zh:697a6cb1b86ca5bc2e03845a6a4cbfe9ce3c287d4df3cfdc51673a7a47c71a8e",
+    "zh:7232e153f55f6b92377e482a93c4c790b9b7ed87ac79b84fac046bf04aa0b22b",
+    "zh:a9ca71fe4f5ab3800bde2bff312d1d3ed21864692a7948577f4d3d9b4753c503",
+    "zh:bdbb86941ec6d9be00d7ed37917a90ffe10314a2c604f1517c4ecf5d7d2d6aac",
+    "zh:caeaa6f1dca10564c73b86692da63976f971af9a36d93129ae571300c0002ff5",
+    "zh:cd6e45a56a707e84a84dd17b1357ad7615eaaf1335bcb2ee8dcb9ad239e015f9",
+    "zh:ce85d507416433bca5ea31537c93dee6d3900f01b2f1d3b3d7caca16294383a6",
     "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c",
+    "zh:fa95af70f352338e73615500ccee22c79ce7f2ec25444b52cde9f798e75eafeb",
   ]
 }
 
diff --git a/infra/terraform/test-org/test-cleanup/versions.tf b/infra/terraform/test-org/test-cleanup/versions.tf
index bbda7795e22..ad3410585ba 100644
--- a/infra/terraform/test-org/test-cleanup/versions.tf
+++ b/infra/terraform/test-org/test-cleanup/versions.tf
@@ -23,11 +23,11 @@ terraform {
     }
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.38, < 6"
+      version = ">= 3.38, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 3.38, < 6"
+      version = ">= 3.38, < 7"
     }
     null = {
       source  = "hashicorp/null"