diff --git a/scripts/teardown.sh b/scripts/teardown.sh
index 847d16b..945a515 100644
--- a/scripts/teardown.sh
+++ b/scripts/teardown.sh
@@ -30,5 +30,6 @@ ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 source "$ROOT/scripts/common.sh"
 
 # Tear down Terraform-managed resources and remove generated tfvars
+cd "$ROOT/terraform" || exit; terraform destroy -target google_container_cluster.primary -input=false -auto-approve
 cd "$ROOT/terraform" || exit; terraform destroy -input=false -auto-approve
 rm -f "$ROOT/terraform/terraform.tfvars"
diff --git a/terraform/main.tf b/terraform/main.tf
index 0176b8f..a75cf74 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -17,8 +17,8 @@ limitations under the License.
 // Provides access to available Google Container Engine versions in a zone for a given project.
 // https://www.terraform.io/docs/providers/google/d/google_container_engine_versions.html
 data "google_container_engine_versions" "on-prem" {
-  zone    = var.zone
-  project = var.project
+  location = var.zone
+  project  = var.project
 }
 
 // https://www.terraform.io/docs/providers/google/r/google_container_cluster.html
@@ -84,7 +84,7 @@ module "auditor_instance" {
 resource "google_container_cluster" "primary" {
   name               = var.cluster_name
   project            = var.project
-  zone               = var.zone
+  location           = var.zone
   network            = module.network.network_self_link
   subnetwork         = module.network.subnet_self_link
   min_master_version = data.google_container_engine_versions.on-prem.latest_master_version
@@ -162,5 +162,10 @@ resource "google_container_cluster" "primary" {
       disabled = false
     }
   }
+  timeouts {
+    create = "60m"
+    update = "60m"
+    delete = "60m"
+  }
 }
 
diff --git a/terraform/provider.tf b/terraform/provider.tf
index a5c4450..621d680 100644
--- a/terraform/provider.tf
+++ b/terraform/provider.tf
@@ -18,7 +18,7 @@ limitations under the License.
 provider "google" {
   project = var.project
   zone    = var.zone
-  version = "~> 2.17.0"
+  version = "~> 2.18.0"
 }
 
 // Pins the version of the "random" provider