diff --git a/terraform-static-analysis/tflint-configs/tflint.azure.hcl b/terraform-static-analysis/tflint-configs/tflint.azure.hcl
index 9f7ec00a..c27f37a0 100755
--- a/terraform-static-analysis/tflint-configs/tflint.azure.hcl
+++ b/terraform-static-analysis/tflint-configs/tflint.azure.hcl
@@ -1,13 +1,23 @@
 plugin "azurerm" {
     enabled = true
-    version = "0.17.1"
+    version = "0.18.0"
     source  = "github.com/terraform-linters/tflint-ruleset-azurerm"
 }
 
+plugin "terraform" {
+    enabled = true
+    version = "0.1.0"
+    source  = "github.com/terraform-linters/tflint-ruleset-terraform"
+}
+
 rule "terraform_comment_syntax" {
   enabled = false
 }
 
+rule "terraform_deprecated_index" {
+  enabled = false
+}
+
 rule "terraform_documented_outputs" {
   enabled = true
 }
@@ -16,6 +26,10 @@ rule "terraform_documented_variables" {
   enabled = true
 }
 
+rule "terraform_empty_list_equality" {
+  enabled = false
+}
+
 rule "terraform_module_pinned_source" {
   enabled = false
   style = "flexible"
@@ -55,3 +69,7 @@ rule "terraform_unused_declarations" {
 rule "terraform_unused_required_providers" {
   enabled = true
 }
+
+rule "terraform_workspace_remote" {
+  enabled = true
+}
diff --git a/terraform-static-analysis/tflint-configs/tflint.default.hcl b/terraform-static-analysis/tflint-configs/tflint.default.hcl
index ab46f3dc..67d971b7 100755
--- a/terraform-static-analysis/tflint-configs/tflint.default.hcl
+++ b/terraform-static-analysis/tflint-configs/tflint.default.hcl
@@ -1,5 +1,16 @@
 plugin "aws" {
     enabled = true
-    version = "0.15.0"
+    version = "0.17.0"
     source  = "github.com/terraform-linters/tflint-ruleset-aws"
+}
+
+plugin "terraform" {
+    enabled = true
+    version = "0.1.0"
+    preset  = "recommended"
+    source  = "github.com/terraform-linters/tflint-ruleset-terraform"
+}
+
+rule "terraform_deprecated_index" {
+    enabled = false
 }
\ No newline at end of file