diff --git a/config.py b/config.py
index 30d93887..5bed570e 100644
--- a/config.py
+++ b/config.py
@@ -66,7 +66,7 @@ UPPER_WORDS = {
     "oci": ("oci",),
     "elastic": ("apm", "siem", "ece", "eck"),
     "generic": ("vpn", "ios", "xen"),
-    "openstack": (),
+    "openstack": ("rpm", "loci", "nfv"),
 }
 
 TITLE_WORDS = {
@@ -386,5 +386,12 @@ ALIASES = {
         }
     },
     "generic": {},
-    "openstack": {},
+    "openstack": {
+        "apiproxies": {
+            "Ec2api": "EC2API",
+        },
+        "user": {
+            "Openstackclient": "OpenStackClient",
+        },
+    },
 }
diff --git a/diagrams/openstack/adjacentenablers.py b/diagrams/openstack/adjacentenablers.py
new file mode 100644
index 00000000..08b69a52
--- /dev/null
+++ b/diagrams/openstack/adjacentenablers.py
@@ -0,0 +1,11 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Adjacentenablers(_OpenStack):
+    _type = "adjacentenablers"
+    _icon_dir = "resources/openstack/adjacentenablers"
+
+
+# Aliases
diff --git a/diagrams/openstack/apiproxies.py b/diagrams/openstack/apiproxies.py
new file mode 100644
index 00000000..2caf0f4c
--- /dev/null
+++ b/diagrams/openstack/apiproxies.py
@@ -0,0 +1,17 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Apiproxies(_OpenStack):
+    _type = "apiproxies"
+    _icon_dir = "resources/openstack/apiproxies"
+
+
+class Ec2Api(_Apiproxies):
+    _icon = "ec2api.png"
+
+
+# Aliases
+
+EC2API = Ec2api
diff --git a/diagrams/openstack/applicationlifecycle.py b/diagrams/openstack/applicationlifecycle.py
new file mode 100644
index 00000000..06aad638
--- /dev/null
+++ b/diagrams/openstack/applicationlifecycle.py
@@ -0,0 +1,27 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Applicationlifecycle(_OpenStack):
+    _type = "applicationlifecycle"
+    _icon_dir = "resources/openstack/applicationlifecycle"
+
+
+class Freezer(_Applicationlifecycle):
+    _icon = "freezer.png"
+
+
+class Masakari(_Applicationlifecycle):
+    _icon = "masakari.png"
+
+
+class Murano(_Applicationlifecycle):
+    _icon = "murano.png"
+
+
+class Solum(_Applicationlifecycle):
+    _icon = "solum.png"
+
+
+# Aliases
diff --git a/diagrams/openstack/baremetal.py b/diagrams/openstack/baremetal.py
new file mode 100644
index 00000000..f4535e0b
--- /dev/null
+++ b/diagrams/openstack/baremetal.py
@@ -0,0 +1,19 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Baremetal(_OpenStack):
+    _type = "baremetal"
+    _icon_dir = "resources/openstack/baremetal"
+
+
+class Cyborg(_Baremetal):
+    _icon = "cyborg.png"
+
+
+class Ironic(_Baremetal):
+    _icon = "ironic.png"
+
+
+# Aliases
diff --git a/diagrams/openstack/billing.py b/diagrams/openstack/billing.py
new file mode 100644
index 00000000..1da5da63
--- /dev/null
+++ b/diagrams/openstack/billing.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Billing(_OpenStack):
+    _type = "billing"
+    _icon_dir = "resources/openstack/billing"
+
+
+class Cloudkitty(_Billing):
+    _icon = "cloudkitty.png"
+
+
+# Aliases
diff --git a/diagrams/openstack/compute.py b/diagrams/openstack/compute.py
new file mode 100644
index 00000000..74901087
--- /dev/null
+++ b/diagrams/openstack/compute.py
@@ -0,0 +1,23 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Compute(_OpenStack):
+    _type = "compute"
+    _icon_dir = "resources/openstack/compute"
+
+
+class Nova(_Compute):
+    _icon = "nova.png"
+
+
+class Qinling(_Compute):
+    _icon = "qinling.png"
+
+
+class Zun(_Compute):
+    _icon = "zun.png"
+
+
+# Aliases
diff --git a/diagrams/openstack/containerservices.py b/diagrams/openstack/containerservices.py
new file mode 100644
index 00000000..cf3690f6
--- /dev/null
+++ b/diagrams/openstack/containerservices.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Containerservices(_OpenStack):
+    _type = "containerservices"
+    _icon_dir = "resources/openstack/containerservices"
+
+
+class Kuryr(_Containerservices):
+    _icon = "kuryr.png"
+
+
+# Aliases
diff --git a/diagrams/openstack/deployment.py b/diagrams/openstack/deployment.py
new file mode 100644
index 00000000..65692cac
--- /dev/null
+++ b/diagrams/openstack/deployment.py
@@ -0,0 +1,35 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Deployment(_OpenStack):
+    _type = "deployment"
+    _icon_dir = "resources/openstack/deployment"
+
+
+class Ansible(_Deployment):
+    _icon = "ansible.png"
+
+
+class Charms(_Deployment):
+    _icon = "charms.png"
+
+
+class Chef(_Deployment):
+    _icon = "chef.png"
+
+
+class Helm(_Deployment):
+    _icon = "helm.png"
+
+
+class Kolla(_Deployment):
+    _icon = "kolla.png"
+
+
+class Tripleo(_Deployment):
+    _icon = "tripleo.png"
+
+
+# Aliases
diff --git a/diagrams/openstack/frontend.py b/diagrams/openstack/frontend.py
new file mode 100644
index 00000000..b490f022
--- /dev/null
+++ b/diagrams/openstack/frontend.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Frontend(_OpenStack):
+    _type = "frontend"
+    _icon_dir = "resources/openstack/frontend"
+
+
+class Horizon(_Frontend):
+    _icon = "horizon.png"
+
+
+# Aliases
diff --git a/diagrams/openstack/lifecyclemanagement.py b/diagrams/openstack/lifecyclemanagement.py
new file mode 100644
index 00000000..d657ba45
--- /dev/null
+++ b/diagrams/openstack/lifecyclemanagement.py
@@ -0,0 +1,11 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Lifecyclemanagement(_OpenStack):
+    _type = "lifecyclemanagement"
+    _icon_dir = "resources/openstack/lifecyclemanagement"
+
+
+# Aliases
diff --git a/diagrams/openstack/monitoring.py b/diagrams/openstack/monitoring.py
new file mode 100644
index 00000000..d1379265
--- /dev/null
+++ b/diagrams/openstack/monitoring.py
@@ -0,0 +1,19 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Monitoring(_OpenStack):
+    _type = "monitoring"
+    _icon_dir = "resources/openstack/monitoring"
+
+
+class Monasca(_Monitoring):
+    _icon = "monasca.png"
+
+
+class Telemetry(_Monitoring):
+    _icon = "telemetry.png"
+
+
+# Aliases
diff --git a/diagrams/openstack/multiregion.py b/diagrams/openstack/multiregion.py
new file mode 100644
index 00000000..2d7c132c
--- /dev/null
+++ b/diagrams/openstack/multiregion.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Multiregion(_OpenStack):
+    _type = "multiregion"
+    _icon_dir = "resources/openstack/multiregion"
+
+
+class Tricircle(_Multiregion):
+    _icon = "tricircle.png"
+
+
+# Aliases
diff --git a/diagrams/openstack/networking.py b/diagrams/openstack/networking.py
new file mode 100644
index 00000000..24226c9c
--- /dev/null
+++ b/diagrams/openstack/networking.py
@@ -0,0 +1,23 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Networking(_OpenStack):
+    _type = "networking"
+    _icon_dir = "resources/openstack/networking"
+
+
+class Designate(_Networking):
+    _icon = "designate.png"
+
+
+class Neutron(_Networking):
+    _icon = "neutron.png"
+
+
+class Octavia(_Networking):
+    _icon = "octavia.png"
+
+
+# Aliases
diff --git a/diagrams/openstack/nfv.py b/diagrams/openstack/nfv.py
new file mode 100644
index 00000000..59f05598
--- /dev/null
+++ b/diagrams/openstack/nfv.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _NFV(_OpenStack):
+    _type = "nfv"
+    _icon_dir = "resources/openstack/nfv"
+
+
+class Tacker(_NFV):
+    _icon = "tacker.png"
+
+
+# Aliases
diff --git a/diagrams/openstack/operations.py b/diagrams/openstack/operations.py
new file mode 100644
index 00000000..1e954f9f
--- /dev/null
+++ b/diagrams/openstack/operations.py
@@ -0,0 +1,11 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Operations(_OpenStack):
+    _type = "operations"
+    _icon_dir = "resources/openstack/operations"
+
+
+# Aliases
diff --git a/diagrams/openstack/optimization.py b/diagrams/openstack/optimization.py
new file mode 100644
index 00000000..71e611cf
--- /dev/null
+++ b/diagrams/openstack/optimization.py
@@ -0,0 +1,27 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Optimization(_OpenStack):
+    _type = "optimization"
+    _icon_dir = "resources/openstack/optimization"
+
+
+class Congress(_Optimization):
+    _icon = "congress.png"
+
+
+class Rally(_Optimization):
+    _icon = "rally.png"
+
+
+class Vitrage(_Optimization):
+    _icon = "vitrage.png"
+
+
+class Watcher(_Optimization):
+    _icon = "watcher.png"
+
+
+# Aliases
diff --git a/diagrams/openstack/orchestration.py b/diagrams/openstack/orchestration.py
new file mode 100644
index 00000000..1718dd86
--- /dev/null
+++ b/diagrams/openstack/orchestration.py
@@ -0,0 +1,31 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Orchestration(_OpenStack):
+    _type = "orchestration"
+    _icon_dir = "resources/openstack/orchestration"
+
+
+class Blazar(_Orchestration):
+    _icon = "blazar.png"
+
+
+class Heat(_Orchestration):
+    _icon = "heat.png"
+
+
+class Mistral(_Orchestration):
+    _icon = "mistral.png"
+
+
+class Senlin(_Orchestration):
+    _icon = "senlin.png"
+
+
+class Zaqar(_Orchestration):
+    _icon = "zaqar.png"
+
+
+# Aliases
diff --git a/diagrams/openstack/packaging.py b/diagrams/openstack/packaging.py
new file mode 100644
index 00000000..47a61c37
--- /dev/null
+++ b/diagrams/openstack/packaging.py
@@ -0,0 +1,23 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Packaging(_OpenStack):
+    _type = "packaging"
+    _icon_dir = "resources/openstack/packaging"
+
+
+class LOCI(_Packaging):
+    _icon = "loci.png"
+
+
+class Puppet(_Packaging):
+    _icon = "puppet.png"
+
+
+class RPM(_Packaging):
+    _icon = "rpm.png"
+
+
+# Aliases
diff --git a/diagrams/openstack/sharedservices.py b/diagrams/openstack/sharedservices.py
new file mode 100644
index 00000000..d01634ef
--- /dev/null
+++ b/diagrams/openstack/sharedservices.py
@@ -0,0 +1,31 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Sharedservices(_OpenStack):
+    _type = "sharedservices"
+    _icon_dir = "resources/openstack/sharedservices"
+
+
+class Barbican(_Sharedservices):
+    _icon = "barbican.png"
+
+
+class Glance(_Sharedservices):
+    _icon = "glance.png"
+
+
+class Karbor(_Sharedservices):
+    _icon = "karbor.png"
+
+
+class Keystone(_Sharedservices):
+    _icon = "keystone.png"
+
+
+class Searchlight(_Sharedservices):
+    _icon = "searchlight.png"
+
+
+# Aliases
diff --git a/diagrams/openstack/storage.py b/diagrams/openstack/storage.py
new file mode 100644
index 00000000..6c5ddf15
--- /dev/null
+++ b/diagrams/openstack/storage.py
@@ -0,0 +1,23 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Storage(_OpenStack):
+    _type = "storage"
+    _icon_dir = "resources/openstack/storage"
+
+
+class Cinder(_Storage):
+    _icon = "cinder.png"
+
+
+class Manila(_Storage):
+    _icon = "manila.png"
+
+
+class Swift(_Storage):
+    _icon = "swift.png"
+
+
+# Aliases
diff --git a/diagrams/openstack/user.py b/diagrams/openstack/user.py
new file mode 100644
index 00000000..b3a9e6f9
--- /dev/null
+++ b/diagrams/openstack/user.py
@@ -0,0 +1,17 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _User(_OpenStack):
+    _type = "user"
+    _icon_dir = "resources/openstack/user"
+
+
+class Openstackclient(_User):
+    _icon = "openstackclient.png"
+
+
+# Aliases
+
+OpenStackClient = Openstackclient
diff --git a/diagrams/openstack/workloadprovisioning.py b/diagrams/openstack/workloadprovisioning.py
new file mode 100644
index 00000000..d43f37ae
--- /dev/null
+++ b/diagrams/openstack/workloadprovisioning.py
@@ -0,0 +1,23 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OpenStack
+
+
+class _Workloadprovisioning(_OpenStack):
+    _type = "workloadprovisioning"
+    _icon_dir = "resources/openstack/workloadprovisioning"
+
+
+class Magnum(_Workloadprovisioning):
+    _icon = "magnum.png"
+
+
+class Sahara(_Workloadprovisioning):
+    _icon = "sahara.png"
+
+
+class Trove(_Workloadprovisioning):
+    _icon = "trove.png"
+
+
+# Aliases
diff --git a/docs/nodes/openstack.md b/docs/nodes/openstack.md
new file mode 100644
index 00000000..b95666e6
--- /dev/null
+++ b/docs/nodes/openstack.md
@@ -0,0 +1,122 @@
+---
+id: openstack
+title: OpenStack
+---
+
+Node classes list of openstack provider.
+
+## openstack.adjacentenablers
+
+
+## openstack.apiproxies
+
+- **diagrams.openstack.apiproxies.Ec2Api**
+
+## openstack.applicationlifecycle
+
+- **diagrams.openstack.applicationlifecycle.Freezer**
+- **diagrams.openstack.applicationlifecycle.Masakari**
+- **diagrams.openstack.applicationlifecycle.Murano**
+- **diagrams.openstack.applicationlifecycle.Solum**
+
+## openstack.baremetal
+
+- **diagrams.openstack.baremetal.Cyborg**
+- **diagrams.openstack.baremetal.Ironic**
+
+## openstack.billing
+
+- **diagrams.openstack.billing.Cloudkitty**
+
+## openstack.compute
+
+- **diagrams.openstack.compute.Nova**
+- **diagrams.openstack.compute.Qinling**
+- **diagrams.openstack.compute.Zun**
+
+## openstack.containerservices
+
+- **diagrams.openstack.containerservices.Kuryr**
+
+## openstack.deployment
+
+- **diagrams.openstack.deployment.Ansible**
+- **diagrams.openstack.deployment.Charms**
+- **diagrams.openstack.deployment.Chef**
+- **diagrams.openstack.deployment.Helm**
+- **diagrams.openstack.deployment.Kolla**
+- **diagrams.openstack.deployment.Tripleo**
+
+## openstack.frontend
+
+- **diagrams.openstack.frontend.Horizon**
+
+## openstack.lifecyclemanagement
+
+
+## openstack.monitoring
+
+- **diagrams.openstack.monitoring.Monasca**
+- **diagrams.openstack.monitoring.Telemetry**
+
+## openstack.multiregion
+
+- **diagrams.openstack.multiregion.Tricircle**
+
+## openstack.networking
+
+- **diagrams.openstack.networking.Designate**
+- **diagrams.openstack.networking.Neutron**
+- **diagrams.openstack.networking.Octavia**
+
+## openstack.nfv
+
+- **diagrams.openstack.nfv.Tacker**
+
+## openstack.operations
+
+
+## openstack.optimization
+
+- **diagrams.openstack.optimization.Congress**
+- **diagrams.openstack.optimization.Rally**
+- **diagrams.openstack.optimization.Vitrage**
+- **diagrams.openstack.optimization.Watcher**
+
+## openstack.orchestration
+
+- **diagrams.openstack.orchestration.Blazar**
+- **diagrams.openstack.orchestration.Heat**
+- **diagrams.openstack.orchestration.Mistral**
+- **diagrams.openstack.orchestration.Senlin**
+- **diagrams.openstack.orchestration.Zaqar**
+
+## openstack.packaging
+
+- **diagrams.openstack.packaging.LOCI**
+- **diagrams.openstack.packaging.Puppet**
+- **diagrams.openstack.packaging.RPM**
+
+## openstack.sharedservices
+
+- **diagrams.openstack.sharedservices.Barbican**
+- **diagrams.openstack.sharedservices.Glance**
+- **diagrams.openstack.sharedservices.Karbor**
+- **diagrams.openstack.sharedservices.Keystone**
+- **diagrams.openstack.sharedservices.Searchlight**
+
+## openstack.storage
+
+- **diagrams.openstack.storage.Cinder**
+- **diagrams.openstack.storage.Manila**
+- **diagrams.openstack.storage.Swift**
+
+## openstack.user
+
+- **diagrams.openstack.user.Openstackclient**, **OpenStackClient** (alias)
+
+## openstack.workloadprovisioning
+
+- **diagrams.openstack.workloadprovisioning.Magnum**
+- **diagrams.openstack.workloadprovisioning.Sahara**
+- **diagrams.openstack.workloadprovisioning.Trove**
diff --git a/resources/openstack/apiproxies/ec2-api.png b/resources/openstack/apiproxies/ec2api.png
similarity index 100%
rename from resources/openstack/apiproxies/ec2-api.png
rename to resources/openstack/apiproxies/ec2api.png
diff --git a/resources/openstack/operations/optimization/OpenStack_Project_Rally_mascot.png b/resources/openstack/operations/optimization/OpenStack_Project_Rally_mascot.png
deleted file mode 100644
index 6f09b314..00000000
Binary files a/resources/openstack/operations/optimization/OpenStack_Project_Rally_mascot.png and /dev/null differ
diff --git a/resources/openstack/operations/optimization/rally.png b/resources/openstack/operations/optimization/rally.png
new file mode 100644
index 00000000..2eec8b65
Binary files /dev/null and b/resources/openstack/operations/optimization/rally.png differ
diff --git a/scripts/resource.py b/scripts/resource.py
index 9941f6e6..0c963966 100644
--- a/scripts/resource.py
+++ b/scripts/resource.py
@@ -109,6 +109,10 @@ def cleaner_elastic(f):
     return f.lower()
 
 
+def cleaner_openstack(f):
+    return f.lower()
+
+
 cleaners = {
     "onprem": cleaner_onprem,
     "aws": cleaner_aws,
@@ -122,6 +126,7 @@ cleaners = {
     "saas": cleaner_saas,
     "elastic": cleaner_elastic,
     "generic": cleaner_generic,
+    "openstack": cleaner_openstack,
 }