diff --git a/autogen.sh b/autogen.sh
index acbcacb2..b0b8ab95 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@ set -e
 app_root_dir="diagrams"
 
 # NOTE: azure icon set is not latest version
-providers=("onprem" "aws" "azure" "digitalocean" "gcp" "ibm" "firebase" "k8s" "alibabacloud" "oci" "programming" "saas" "elastic" "generic" "openstack" "outscale" )
+providers=("onprem" "aws" "azure" "digitalocean" "gcp" "ibm" "firebase" "k8s" "alibabacloud" "oci" "programming" "saas" "elastic" "generic" "openstack" "outscale" "hashicorp")
 
 if ! [ -x "$(command -v round)" ]; then
   echo 'round is not installed'
diff --git a/config.py b/config.py
index cbec9c9d..cc29140a 100644
--- a/config.py
+++ b/config.py
@@ -13,7 +13,7 @@ DIR_TEMPLATE = "templates"
 
 PROVIDERS = (
     "base", "onprem", "aws", "azure", "digitalocean", "gcp", "ibm", "firebase", "k8s", "alibabacloud", "oci",
-    "programming", "saas", "elastic", "generic", "openstack", "outscale")
+    "programming", "saas", "elastic", "generic", "openstack", "outscale", "hashicorp")
 
 #########################
 #  Resource Processing  #
@@ -31,6 +31,7 @@ FILE_PREFIXES = {
     "aws": ("Amazon-", "AWS-"),
     "azure": ("Azure-",),
     "digitalocean": (),
+    "hashicorp": (),
     "gcp": ("Cloud-",),
     "firebase": ("Cloud-",),
     "ibm": (),
@@ -88,6 +89,9 @@ TITLE_WORDS = {
     "digitalocean": {
         "digitalocean": "DigitalOcean"
     },
+    "hashicorp": {
+        "hashicorp": "HashiCorp"
+    },
     "openstack": {
         "openstack": "OpenStack"
     },
@@ -391,6 +395,7 @@ ALIASES = {
         }
     },
     "digitalocean": {},
+    "hashicorp": {},
     "oci": {
         "compute": {
             "VM": "VirtualMachine",
diff --git a/diagrams/hashicorp/__init__.py b/diagrams/hashicorp/__init__.py
new file mode 100644
index 00000000..6030ebcb
--- /dev/null
+++ b/diagrams/hashicorp/__init__.py
@@ -0,0 +1,12 @@
+"""
+HashiCorp provides a set of services for HashiCorp provider.
+"""
+
+from diagrams import Node
+
+
+class _HashiCorp(Node):
+    _provider = "hashicorp"
+    _icon_dir = "resources/hashicorp"
+
+    fontcolor = "#ffffff"
diff --git a/diagrams/hashicorp/applications.py b/diagrams/hashicorp/applications.py
new file mode 100644
index 00000000..11eefac9
--- /dev/null
+++ b/diagrams/hashicorp/applications.py
@@ -0,0 +1,23 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _HashiCorp
+
+
+class _Applications(_HashiCorp):
+    _type = "applications"
+    _icon_dir = "resources/hashicorp/applications"
+
+
+class Nomad(_Applications):
+    _icon = "nomad.png"
+
+
+class Vagrant(_Applications):
+    _icon = "vagrant.png"
+
+
+class Waypoint(_Applications):
+    _icon = "waypoint.png"
+
+
+# Aliases
diff --git a/diagrams/hashicorp/infrastructure.py b/diagrams/hashicorp/infrastructure.py
new file mode 100644
index 00000000..4aa6d3f7
--- /dev/null
+++ b/diagrams/hashicorp/infrastructure.py
@@ -0,0 +1,19 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _HashiCorp
+
+
+class _Infrastructure(_HashiCorp):
+    _type = "infrastructure"
+    _icon_dir = "resources/hashicorp/infrastructure"
+
+
+class Packer(_Infrastructure):
+    _icon = "packer.png"
+
+
+class Terraform(_Infrastructure):
+    _icon = "terraform.png"
+
+
+# Aliases
diff --git a/diagrams/hashicorp/networking.py b/diagrams/hashicorp/networking.py
new file mode 100644
index 00000000..5fa68d84
--- /dev/null
+++ b/diagrams/hashicorp/networking.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _HashiCorp
+
+
+class _Networking(_HashiCorp):
+    _type = "networking"
+    _icon_dir = "resources/hashicorp/networking"
+
+
+class Consul(_Networking):
+    _icon = "consul.png"
+
+
+# Aliases
diff --git a/diagrams/hashicorp/security.py b/diagrams/hashicorp/security.py
new file mode 100644
index 00000000..d4359fb0
--- /dev/null
+++ b/diagrams/hashicorp/security.py
@@ -0,0 +1,19 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _HashiCorp
+
+
+class _Security(_HashiCorp):
+    _type = "security"
+    _icon_dir = "resources/hashicorp/security"
+
+
+class Boundary(_Security):
+    _icon = "boundary.png"
+
+
+class Vault(_Security):
+    _icon = "vault.png"
+
+
+# Aliases
diff --git a/docs/nodes/hashicorp.md b/docs/nodes/hashicorp.md
new file mode 100644
index 00000000..6c4cd8b9
--- /dev/null
+++ b/docs/nodes/hashicorp.md
@@ -0,0 +1,26 @@
+---
+id: hashicorp
+title: HashiCorp
+---
+
+Node classes list of hashicorp provider.
+
+## hashicorp.applications
+
+- **diagrams.hashicorp.applications.Nomad**
+- **diagrams.hashicorp.applications.Vagrant**
+- **diagrams.hashicorp.applications.Waypoint**
+
+## hashicorp.infrastructure
+
+- **diagrams.hashicorp.infrastructure.Packer**
+- **diagrams.hashicorp.infrastructure.Terraform**
+
+## hashicorp.networking
+
+- **diagrams.hashicorp.networking.Consul**
+
+## hashicorp.security
+
+- **diagrams.hashicorp.security.Boundary**
+- **diagrams.hashicorp.security.Vault**
diff --git a/resources/hashicorp/applications/nomad.png b/resources/hashicorp/applications/nomad.png
new file mode 100755
index 00000000..41d92b94
Binary files /dev/null and b/resources/hashicorp/applications/nomad.png differ
diff --git a/resources/hashicorp/applications/vagrant.png b/resources/hashicorp/applications/vagrant.png
new file mode 100755
index 00000000..47a1ece8
Binary files /dev/null and b/resources/hashicorp/applications/vagrant.png differ
diff --git a/resources/hashicorp/applications/waypoint.png b/resources/hashicorp/applications/waypoint.png
new file mode 100755
index 00000000..32c970b7
Binary files /dev/null and b/resources/hashicorp/applications/waypoint.png differ
diff --git a/resources/hashicorp/infrastructure/packer.png b/resources/hashicorp/infrastructure/packer.png
new file mode 100755
index 00000000..329e708b
Binary files /dev/null and b/resources/hashicorp/infrastructure/packer.png differ
diff --git a/resources/hashicorp/infrastructure/terraform.png b/resources/hashicorp/infrastructure/terraform.png
new file mode 100755
index 00000000..0eb536f7
Binary files /dev/null and b/resources/hashicorp/infrastructure/terraform.png differ
diff --git a/resources/hashicorp/networking/consul.png b/resources/hashicorp/networking/consul.png
new file mode 100755
index 00000000..6a6a7f95
Binary files /dev/null and b/resources/hashicorp/networking/consul.png differ
diff --git a/resources/hashicorp/security/boundary.png b/resources/hashicorp/security/boundary.png
new file mode 100755
index 00000000..fb9e485a
Binary files /dev/null and b/resources/hashicorp/security/boundary.png differ
diff --git a/resources/hashicorp/security/vault.png b/resources/hashicorp/security/vault.png
new file mode 100644
index 00000000..8728372b
Binary files /dev/null and b/resources/hashicorp/security/vault.png differ
diff --git a/scripts/resource.py b/scripts/resource.py
index d2b0f4c8..e489b178 100644
--- a/scripts/resource.py
+++ b/scripts/resource.py
@@ -84,6 +84,7 @@ def cleaner_k8s(f):
             break
     return f.lower()
 
+
 def cleaner_digitalocean(f):
     f = f.replace("-32", "")
     for p in cfg.FILE_PREFIXES["digitalocean"]:
@@ -135,6 +136,10 @@ def cleaner_openstack(f):
     return f.lower()
 
 
+def cleaner_hashicorp(f):
+    return f.lower()
+
+
 cleaners = {
     "onprem": cleaner_onprem,
     "aws": cleaner_aws,
@@ -152,6 +157,7 @@ cleaners = {
     "outscale": cleaner_outscale,
     "generic": cleaner_generic,
     "openstack": cleaner_openstack,
+    "hashicorp": cleaner_hashicorp,
 }