diff --git a/build/terraform b/build/terraform
index 69e445bd5930..2fa07bfd1409 160000
--- a/build/terraform
+++ b/build/terraform
@@ -1 +1 @@
-Subproject commit 69e445bd59301e491e17d3490babc6e2262ebf08
+Subproject commit 2fa07bfd1409c0e17eb375379c58afd3c49664e7
diff --git a/build/terraform-beta b/build/terraform-beta
index 979d9564b07c..26a6b49ac8d4 160000
--- a/build/terraform-beta
+++ b/build/terraform-beta
@@ -1 +1 @@
-Subproject commit 979d9564b07ccd68d6c66aa63c8885bfbc2e08e7
+Subproject commit 26a6b49ac8d45641f9d8cc972faa3d08c520b0c2
diff --git a/third_party/terraform/resources/resource_composer_environment.go.erb b/third_party/terraform/resources/resource_composer_environment.go.erb
index deb3ead3b209..86d81f107ec8 100644
--- a/third_party/terraform/resources/resource_composer_environment.go.erb
+++ b/third_party/terraform/resources/resource_composer_environment.go.erb
@@ -96,8 +96,7 @@ func resourceComposerEnvironment() *schema.Resource {
 								Schema: map[string]*schema.Schema{
 									"zone": {
 										Type:             schema.TypeString,
-										Computed:         true,
-										Optional:         true,
+										Required:         true,
 										ForceNew:         true,
 										DiffSuppressFunc: compareSelfLinkOrResourceName,
 									},
diff --git a/third_party/terraform/website/docs/r/composer_environment.html.markdown b/third_party/terraform/website/docs/r/composer_environment.html.markdown
index 9f2f98d5a99c..d154bdfd1764 100644
--- a/third_party/terraform/website/docs/r/composer_environment.html.markdown
+++ b/third_party/terraform/website/docs/r/composer_environment.html.markdown
@@ -167,16 +167,12 @@ The `config` block supports:
 The `node_config` block supports:
 
 * `zone` -
-  (Optional)
+  (Required)
   The Compute Engine zone in which to deploy the VMs running the
   Apache Airflow software, specified as the zone name or
   relative resource name (e.g. "projects/{project}/zones/{zone}"). Must belong to the enclosing environment's project 
   and region.
 
-  If both zone and machineType are specified, machineType must belong to this zone. If neither is specified, the service 
-  will pick default values in the specified resource's region. If only one of zone or machineType is specified, the 
-  location information from the specified field will be used for the location-unspecified field.
-
 * `machine_type` -
   (Optional)
   The Compute Engine machine type used for cluster instances,
@@ -184,10 +180,6 @@ The `node_config` block supports:
   "projects/{project}/zones/{zone}/machineTypes/{machineType}". Must belong to the enclosing environment's project and 
   region/zone.
 
-  If both zone and machineType are specified, machineType must belong to this zone. If neither is specified, the service 
-  will pick default values in the specified resource's region. If only one of zone or machineType is specified, the 
-  location information from the specified field will be used for the location-unspecified field.
-
 * `network` -
   (Optional)
   The Compute Engine network to be used for machine