diff --git a/.env b/.env
index 828d055..fe4f4a2 100644
--- a/.env
+++ b/.env
@@ -1,13 +1,13 @@
-TERRAFORM_VERSION=1.1.8
-TF_PLUGIN_CACHE_DIR?=~/.terraform.d/plugin-cache/
+ TERRAFORM_VERSION=1.6.1
+TF_PLUGIN_CACHE_DIR?=${HOME}/.terraform.d/plugin-cache/
 AWS_DEFAULT_REGION?=ap-southeast-2
 
 ifneq (, $(shell which terraform))
 TERRAFORM=TF_PLUGIN_CACHE_DIR=$(TF_PLUGIN_CACHE_DIR) terraform
 else
 TERRAFORM=docker run --rm -v "${PWD}:/work" -v "$(TF_PLUGIN_CACHE_DIR):/plugin-cache" \
-    -e AWS_DEFAULT_REGION=$(AWS_DEFAULT_REGION) -e http_proxy=$(http_proxy) -e TF_PLUGIN_CACHE_DIR=/plugin-cache \
-    --net=host -w /work hashicorp/terraform:$(TERRAFORM_VERSION)
+    -e AWS_DEFAULT_REGION=$(AWS_DEFAULT_REGION) -e http_proxy=$(http_proxy) \
+    --net=host figurate/terraform:$(TERRAFORM_VERSION)
 endif
 
 TERRAFORM_DOCS=docker run --rm -v "${PWD}:/work" tmknom/terraform-docs
diff --git a/Makefile b/Makefile
index 8f5340d..70ebcd4 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ clean:
 	rm -rf .terraform/
 
 validate:
-	$(TERRAFORM) init -upgrade && $(TERRAFORM) validate
+	$(TERRAFORM) init  && $(TERRAFORM) validate
 
 test: validate
 	$(CHECKOV) -d /work