diff --git a/templates/Makefile b/templates/Makefile
index 0ffb0ee..b8b3e31 100644
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -32,12 +32,13 @@ update-k8s-conf:
 teardown: teardown-k8s-utils teardown-env teardown-secrets teardown-remote-state
 
 teardown-remote-state:
-	export AWS_PAGER='' && \
+	export AWS_PAGER='' && export AWS_DEFAULT_REGION=<% index .Params `region` %> && \
+	aws s3 rm s3://<% .Name %>-$(ENVIRONMENT)-terraform-state --recursive && \
 	aws s3 rb s3://<% .Name %>-$(ENVIRONMENT)-terraform-state --force && \
 	aws dynamodb delete-table --table-name <% .Name %>-$(ENVIRONMENT)-terraform-state-locks
 
 teardown-secrets:
-	export AWS_PAGER='' && \
+	export AWS_PAGER='' && export AWS_DEFAULT_REGION=<% index .Params `region` %> && \
 	aws secretsmanager list-secrets --query "SecretList[?Tags[?Key=='project' && Value=='<% .Name %>']].[Name] | [0][0]" | xargs aws secretsmanager delete-secret --secret-id && \
 	aws iam delete-access-key --user-name <% .Name %>-ci-user --access-key-id $(shell aws iam list-access-keys --user-name <% .Name %>-ci-user --query "AccessKeyMetadata[0].AccessKeyId" | sed 's/"//g') && \
 	aws iam delete-user --user-name <% .Name %>-ci-user
diff --git a/templates/kubernetes/terraform/modules/kubernetes/cert_manager.tf b/templates/kubernetes/terraform/modules/kubernetes/cert_manager.tf
index 08935fa..72e27fa 100644
--- a/templates/kubernetes/terraform/modules/kubernetes/cert_manager.tf
+++ b/templates/kubernetes/terraform/modules/kubernetes/cert_manager.tf
@@ -61,22 +61,19 @@ resource "null_resource" "cert_manager_issuer" {
   depends_on = [null_resource.cert_manager]
 }
 
-data "helm_repository" "jetstack" {
-  name = "jetstack"
-  url  = "https://charts.jetstack.io"
-}
-
 resource "helm_release" "cert_manager" {
   name       = "cert-manager"
-  repository = data.helm_repository.jetstack.metadata[0].name
+  repository = "https://charts.jetstack.io"
   chart      = "cert-manager"
   version    = local.cert_manager_version
   namespace  = local.cert_manager_namespace
-  set_string {
+  set {
+    type  = "string"
     name  = "serviceAccount.annotations.eks\\.amazonaws\\.com/role-arn"
     value =  module.iam_assumable_role_cert_manager.this_iam_role_arn
   }
-  set_string {
+  set {
+    type  = "string"
     name  = "podAnnotations.eks\\.amazonaws\\.com/role-arn"
     value =  module.iam_assumable_role_cert_manager.this_iam_role_arn
   }
diff --git a/templates/kubernetes/terraform/modules/kubernetes/cluster_autoscaler.tf b/templates/kubernetes/terraform/modules/kubernetes/cluster_autoscaler.tf
index 8360f71..25b631b 100644
--- a/templates/kubernetes/terraform/modules/kubernetes/cluster_autoscaler.tf
+++ b/templates/kubernetes/terraform/modules/kubernetes/cluster_autoscaler.tf
@@ -5,7 +5,7 @@ locals {
 
 resource "helm_release" "cluster_autoscaler" {
   name       = "cluster-autoscaler"
-  repository = data.helm_repository.stable.metadata[0].name
+  repository = "https://kubernetes-charts.storage.googleapis.com"
   chart      = "cluster-autoscaler"
   namespace  = local.cluster_autoscaler_namespace
 
@@ -17,7 +17,8 @@ resource "helm_release" "cluster_autoscaler" {
     name  = "rbac.create"
     value = true
   }
-  set_string {
+  set {
+    type  = "string"
     name  = "rbac.serviceAccountAnnotations.eks\\.amazonaws\\.com/role-arn"
     value =  module.iam_assumable_role_cluster_autoscaler.this_iam_role_arn
   }
diff --git a/templates/kubernetes/terraform/modules/kubernetes/metrics_server.tf b/templates/kubernetes/terraform/modules/kubernetes/metrics_server.tf
index e547966..22ac653 100644
--- a/templates/kubernetes/terraform/modules/kubernetes/metrics_server.tf
+++ b/templates/kubernetes/terraform/modules/kubernetes/metrics_server.tf
@@ -5,7 +5,7 @@ locals {
 
 resource "helm_release" "metrics_server" {
   name       = "metrics-server"
-  repository = data.helm_repository.stable.metadata[0].name
+  repository = "https://kubernetes-charts.storage.googleapis.com"
   chart      = "metrics-server"
   namespace  = local.metrics_server_namespace
 
diff --git a/templates/kubernetes/terraform/modules/kubernetes/provider.tf b/templates/kubernetes/terraform/modules/kubernetes/provider.tf
index 9bd2bc2..a70cf1a 100644
--- a/templates/kubernetes/terraform/modules/kubernetes/provider.tf
+++ b/templates/kubernetes/terraform/modules/kubernetes/provider.tf
@@ -14,8 +14,3 @@ provider "kubernetes" {
   token                  = data.aws_eks_cluster_auth.cluster_auth.token
   load_config_file       = false
 }
-
-data "helm_repository" "stable" {
-  name = "stable"
-  url  = "https://kubernetes-charts.storage.googleapis.com"
-}