diff --git a/google/resource_composer_environment.go b/google/resource_composer_environment.go
index 1c09f40e..19c6dba5 100644
--- a/google/resource_composer_environment.go
+++ b/google/resource_composer_environment.go
@@ -91,8 +91,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/website/docs/r/composer_environment.html.markdown b/website/docs/r/composer_environment.html.markdown
index 9f2f98d5..d154bdfd 100644
--- a/website/docs/r/composer_environment.html.markdown
+++ b/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
diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown
index d1c380d0..08c77cb0 100644
--- a/website/docs/r/container_cluster.html.markdown
+++ b/website/docs/r/container_cluster.html.markdown
@@ -113,11 +113,6 @@ resource "google_container_cluster" "primary" {
 
     tags = ["foo", "bar"]
   }
-
-  timeouts {
-    create = "30m"
-    update = "40m"
-  }
 }
 
 # The following outputs allow authentication and connectivity to the GKE Cluster
@@ -564,8 +559,8 @@ exported:
 [Timeouts](/docs/configuration/resources.html#timeouts) configuration options:
 
 - `create` - (Default `30 minutes`) Used for clusters
-- `update` - (Default `30 minutes`) Used for updates to clusters
-- `delete` - (Default `30 minutes`) Used for destroying clusters.
+- `update` - (Default `10 minutes`) Used for updates to clusters
+- `delete` - (Default `10 minutes`) Used for destroying clusters.
 
 ## Import
 
diff --git a/website/docs/r/container_node_pool.html.markdown b/website/docs/r/container_node_pool.html.markdown
index 3694f72d..3b50b485 100644
--- a/website/docs/r/container_node_pool.html.markdown
+++ b/website/docs/r/container_node_pool.html.markdown
@@ -54,11 +54,6 @@ resource "google_container_node_pool" "np" {
   zone       = "us-central1-a"
   cluster    = "${google_container_cluster.primary.name}"
   node_count = 3
-  
-  timeouts {
-    create = "30m"
-    update = "20m"
-  }
 }
 
 resource "google_container_cluster" "primary" {
@@ -149,16 +144,6 @@ The `management` block supports:
 
 * `auto_upgrade` - (Optional) Whether the nodes will be automatically upgraded.
 
-<a id="timeouts"></a>
-## Timeouts
-
-`google_container_node_pool` provides the following
-[Timeouts](/docs/configuration/resources.html#timeouts) configuration options:
-
-- `create` - (Default `30 minutes`) Used for adding node pools
-- `update` - (Default `10 minutes`) Used for updates to node pools
-- `delete` - (Default `10 minutes`) Used for removing node pools.
-
 ## Import
 
 Node pools can be imported using the `project`, `zone`, `cluster` and `name`. If