diff --git a/build/terraform b/build/terraform
index 00f87a3da2ec..af80fe30cb85 160000
--- a/build/terraform
+++ b/build/terraform
@@ -1 +1 @@
-Subproject commit 00f87a3da2ec100764e4d04dfcd05f40267316a5
+Subproject commit af80fe30cb85e8f1bd16be15abd830aae98543ba
diff --git a/build/terraform-beta b/build/terraform-beta
index 42058e6ceaa2..ed7ae045fb8b 160000
--- a/build/terraform-beta
+++ b/build/terraform-beta
@@ -1 +1 @@
-Subproject commit 42058e6ceaa26e59b42bde18c933fef7c2181812
+Subproject commit ed7ae045fb8bc03f3a897286c7f4e4bd9b24bd39
diff --git a/third_party/terraform/resources/resource_cloudfunctions_function.go b/third_party/terraform/resources/resource_cloudfunctions_function.go
index a963808977ce..3e4b2806c339 100644
--- a/third_party/terraform/resources/resource_cloudfunctions_function.go
+++ b/third_party/terraform/resources/resource_cloudfunctions_function.go
@@ -52,11 +52,7 @@ func (s *cloudFunctionId) terraformId() string {
 }
 
 func parseCloudFunctionId(id string, config *Config) (*cloudFunctionId, error) {
-	parts := strings.Split(id, "/")
-
-	cloudFuncIdRegex := regexp.MustCompile("^([a-z0-9-]+)/([a-z0-9-])+/([a-zA-Z0-9_-]{1,63})$")
-
-	if cloudFuncIdRegex.MatchString(id) {
+	if parts := strings.Split(id, "/"); len(parts) == 3 {
 		return &cloudFunctionId{
 			Project: parts[0],
 			Region:  parts[1],