diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index caad0a2..c846d06 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -946,6 +946,17 @@
         "sha": "b93007e9a726c6ee93c57a949e732744ef5acbfd"
       },
       "homepage": "https://github.com/zapier/zapier-mcp/tree/main/plugins/zapier"
+    },
+    {
+      "name": "terraform",
+      "description": "The Terraform MCP Server provides seamless integration with Terraform ecosystem, enabling advanced automation and interaction capabilities for Infrastructure as Code (IaC) development.",
+      "author": {
+        "name": "HashiCorp",
+        "email": "support@hashicorp.com"
+      },
+      "category": "development",
+      "source": "./external_plugins/terraform",
+      "homepage": "https://github.com/anthropics/claude-plugins-public/tree/main/external_plugins/terraform"
     }
   ]
 }
diff --git a/external_plugins/terraform/.claude-plugin/plugin.json b/external_plugins/terraform/.claude-plugin/plugin.json
new file mode 100644
index 0000000..8ed4540
--- /dev/null
+++ b/external_plugins/terraform/.claude-plugin/plugin.json
@@ -0,0 +1,7 @@
+{
+  "name": "terraform",
+  "description": "The Terraform MCP Server provides seamless integration with Terraform ecosystem, enabling advanced automation and interaction capabilities for Infrastructure as Code (IaC) development.",
+  "author": {
+    "name": "HashiCorp"
+  }
+}
diff --git a/external_plugins/terraform/.mcp.json b/external_plugins/terraform/.mcp.json
new file mode 100644
index 0000000..b21446a
--- /dev/null
+++ b/external_plugins/terraform/.mcp.json
@@ -0,0 +1,12 @@
+{
+  "terraform": {
+    "command": "docker",
+    "args": [
+      "run",
+      "-i",
+      "--rm",
+      "-e", "TFE_TOKEN=${TFE_TOKEN}",
+      "hashicorp/terraform-mcp-server:0.3.3"
+    ]
+  }
+}