diff --git a/build/terraform b/build/terraform
index 51bf6f432acd..742c060dcc30 160000
--- a/build/terraform
+++ b/build/terraform
@@ -1 +1 @@
-Subproject commit 51bf6f432acd82f315e7ab653c1f30d7225533c7
+Subproject commit 742c060dcc301628f382f739c3ff30882eb35d85
diff --git a/build/terraform-beta b/build/terraform-beta
index 28be3da093b9..3b998e224a40 160000
--- a/build/terraform-beta
+++ b/build/terraform-beta
@@ -1 +1 @@
-Subproject commit 28be3da093b921ecbcde1d482b6e13b121cf4e53
+Subproject commit 3b998e224a40dc4b2865ff3d447f7daa9e579e7c
diff --git a/third_party/terraform/website/docs/r/container_cluster.html.markdown b/third_party/terraform/website/docs/r/container_cluster.html.markdown
index a46a60f45a5c..a7c87578c4b5 100644
--- a/third_party/terraform/website/docs/r/container_cluster.html.markdown
+++ b/third_party/terraform/website/docs/r/container_cluster.html.markdown
@@ -48,6 +48,11 @@ resource "google_container_cluster" "primary" {
 
     tags = ["foo", "bar"]
   }
+
+  timeouts {
+    create = "30m"
+    update = "40m"
+  }
 }
 
 # The following outputs allow authentication and connectivity to the GKE Cluster.
@@ -484,8 +489,8 @@ exported:
 [Timeouts](/docs/configuration/resources.html#timeouts) configuration options:
 
 - `create` - (Default `30 minutes`) Used for clusters
-- `update` - (Default `10 minutes`) Used for updates to clusters
-- `delete` - (Default `10 minutes`) Used for destroying clusters.
+- `update` - (Default `30 minutes`) Used for updates to clusters
+- `delete` - (Default `30 minutes`) Used for destroying clusters.
 
 ## Import
 
diff --git a/third_party/terraform/website/docs/r/container_node_pool.html.markdown b/third_party/terraform/website/docs/r/container_node_pool.html.markdown
index cd1061be8de2..cd7600ef2802 100644
--- a/third_party/terraform/website/docs/r/container_node_pool.html.markdown
+++ b/third_party/terraform/website/docs/r/container_node_pool.html.markdown
@@ -21,6 +21,11 @@ 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" {
@@ -162,6 +167,16 @@ 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