diff --git a/README.md b/README.md
index d87068c79..a4277e292 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@
 ![firebase provider](https://img.shields.io/badge/provider-Firebase-orange?logo=firebase&color=FFCA28)
 ![elastic provider](https://img.shields.io/badge/provider-Elastic-orange?logo=elastic&color=005571)
 ![saas provider](https://img.shields.io/badge/provider-SaaS-orange?color=5f87bf)
+![openstack provider](https://img.shields.io/badge/provider-OpenStack-orange?logo=openstack&color=da1a32)
 
 <a href="https://www.buymeacoffee.com/mingrammer" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: 41px !important;width: 174px !important;box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" ></a>
 
diff --git a/autogen.sh b/autogen.sh
index 1486dd0be..3a01fa582 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" "gcp" "firebase" "k8s" "alibabacloud" "oci" "programming" "saas" "elastic" "generic")
+providers=("onprem" "aws" "azure" "gcp" "firebase" "k8s" "alibabacloud" "oci" "programming" "saas" "elastic" "generic" "openstack")
 
 if ! [ -x "$(command -v round)" ]; then
   echo 'round is not installed'
diff --git a/config.py b/config.py
index 04608be95..69900b8e7 100644
--- a/config.py
+++ b/config.py
@@ -13,7 +13,7 @@
 
 PROVIDERS = (
     "base", "onprem", "aws", "azure", "gcp", "firebase", "k8s", "alibabacloud", "oci", "programming", "saas", "elastic",
-    "generic")
+    "generic", "openstack")
 
 #########################
 #  Resource Processing  #
@@ -39,6 +39,7 @@
     "saas": (),
     "elastic": (),
     "generic": (),
+    "openstack": (),
 }
 
 #########################
@@ -65,6 +66,7 @@
     "oci": ("oci",),
     "elastic": ("apm", "siem", "ece", "eck"),
     "generic": ("vpn", "ios", "xen"),
+    "openstack": ("rpm", "loci", "nfv", "ec2api"),
 }
 
 TITLE_WORDS = {
@@ -76,7 +78,10 @@
     },
     "aws": {
         "cloudfront": "CloudFront"
-    }
+    },
+    "openstack": {
+        "openstack": "OpenStack"
+    },
 }
 
 # TODO: check if the classname exists
@@ -381,4 +386,16 @@
         }
     },
     "generic": {},
+    "openstack": {
+        "user": {
+            "Openstackclient": "OpenStackClient",
+        },
+        "billing": {
+            "Cloudkitty": "CloudKitty",
+        },
+        "deployment": {
+            "Kolla": "KollaAnsible",
+            "Tripleo": "TripleO",
+        }
+    },
 }
diff --git a/diagrams/openstack/__init__.py b/diagrams/openstack/__init__.py
new file mode 100644
index 000000000..7b36e1bb0
--- /dev/null
+++ b/diagrams/openstack/__init__.py
@@ -0,0 +1,12 @@
+"""
+Openstack provides a set of general OpenStack services.
+"""
+
+from diagrams import Node
+
+
+class _OpenStack(Node):
+    _provider = "openstack"
+    _icon_dir = "resources/openstack"
+
+    fontcolor = "#ffffff"
diff --git a/diagrams/openstack/adjacentenablers.py b/diagrams/openstack/adjacentenablers.py
new file mode 100644
index 000000000..08b69a526
--- /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 000000000..d9b642bc3
--- /dev/null
+++ b/diagrams/openstack/apiproxies.py
@@ -0,0 +1,15 @@
+# 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
diff --git a/diagrams/openstack/applicationlifecycle.py b/diagrams/openstack/applicationlifecycle.py
new file mode 100644
index 000000000..06aad6386
--- /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 000000000..f4535e0b6
--- /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 000000000..fabe17fb2
--- /dev/null
+++ b/diagrams/openstack/billing.py
@@ -0,0 +1,17 @@
+# 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
+
+CloudKitty = Cloudkitty
diff --git a/diagrams/openstack/compute.py b/diagrams/openstack/compute.py
new file mode 100644
index 000000000..749010875
--- /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 000000000..cf3690f66
--- /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 000000000..fba5d4b31
--- /dev/null
+++ b/diagrams/openstack/deployment.py
@@ -0,0 +1,38 @@
+# 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
+
+KollaAnsible = Kolla
+TripleO = Tripleo
diff --git a/diagrams/openstack/frontend.py b/diagrams/openstack/frontend.py
new file mode 100644
index 000000000..b490f0228
--- /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 000000000..d657ba45c
--- /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 000000000..d13792659
--- /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 000000000..2d7c132c8
--- /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 000000000..24226c9c8
--- /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 000000000..59f05598f
--- /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 000000000..1e954f9f2
--- /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 000000000..71e611cf9
--- /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 000000000..1718dd86c
--- /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 000000000..47a61c377
--- /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 000000000..d01634efb
--- /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 000000000..6c5ddf155
--- /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 000000000..b3a9e6f93
--- /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 000000000..d43f37ae4
--- /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 000000000..0d4c5059f
--- /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**, **CloudKitty** (alias)
+
+## 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**, **KollaAnsible** (alias)
+- **diagrams.openstack.deployment.Tripleo**, **TripleO** (alias)
+
+## 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/adjacentenablers/containerservices/kuryr.png b/resources/openstack/adjacentenablers/containerservices/kuryr.png
new file mode 100644
index 000000000..608e64ca6
Binary files /dev/null and b/resources/openstack/adjacentenablers/containerservices/kuryr.png differ
diff --git a/resources/openstack/adjacentenablers/nfv/tacker.png b/resources/openstack/adjacentenablers/nfv/tacker.png
new file mode 100644
index 000000000..15a5424ca
Binary files /dev/null and b/resources/openstack/adjacentenablers/nfv/tacker.png differ
diff --git a/resources/openstack/apiproxies/ec2api.png b/resources/openstack/apiproxies/ec2api.png
new file mode 100644
index 000000000..d31079cc1
Binary files /dev/null and b/resources/openstack/apiproxies/ec2api.png differ
diff --git a/resources/openstack/applicationlifecycle/freezer.png b/resources/openstack/applicationlifecycle/freezer.png
new file mode 100644
index 000000000..3be906062
Binary files /dev/null and b/resources/openstack/applicationlifecycle/freezer.png differ
diff --git a/resources/openstack/applicationlifecycle/masakari.png b/resources/openstack/applicationlifecycle/masakari.png
new file mode 100644
index 000000000..ee244205e
Binary files /dev/null and b/resources/openstack/applicationlifecycle/masakari.png differ
diff --git a/resources/openstack/applicationlifecycle/murano.png b/resources/openstack/applicationlifecycle/murano.png
new file mode 100644
index 000000000..7b49b0dcd
Binary files /dev/null and b/resources/openstack/applicationlifecycle/murano.png differ
diff --git a/resources/openstack/applicationlifecycle/solum.png b/resources/openstack/applicationlifecycle/solum.png
new file mode 100644
index 000000000..39539e425
Binary files /dev/null and b/resources/openstack/applicationlifecycle/solum.png differ
diff --git a/resources/openstack/baremetal/cyborg.png b/resources/openstack/baremetal/cyborg.png
new file mode 100644
index 000000000..d833e3fa0
Binary files /dev/null and b/resources/openstack/baremetal/cyborg.png differ
diff --git a/resources/openstack/baremetal/ironic.png b/resources/openstack/baremetal/ironic.png
new file mode 100644
index 000000000..036012b1e
Binary files /dev/null and b/resources/openstack/baremetal/ironic.png differ
diff --git a/resources/openstack/compute/nova.png b/resources/openstack/compute/nova.png
new file mode 100644
index 000000000..e894c117a
Binary files /dev/null and b/resources/openstack/compute/nova.png differ
diff --git a/resources/openstack/compute/qinling.png b/resources/openstack/compute/qinling.png
new file mode 100644
index 000000000..b09928ecb
Binary files /dev/null and b/resources/openstack/compute/qinling.png differ
diff --git a/resources/openstack/compute/zun.png b/resources/openstack/compute/zun.png
new file mode 100644
index 000000000..e4cbdc220
Binary files /dev/null and b/resources/openstack/compute/zun.png differ
diff --git a/resources/openstack/frontend/horizon.png b/resources/openstack/frontend/horizon.png
new file mode 100644
index 000000000..569377de4
Binary files /dev/null and b/resources/openstack/frontend/horizon.png differ
diff --git a/resources/openstack/lifecyclemanagement/deployment/ansible.png b/resources/openstack/lifecyclemanagement/deployment/ansible.png
new file mode 100644
index 000000000..2803e98fa
Binary files /dev/null and b/resources/openstack/lifecyclemanagement/deployment/ansible.png differ
diff --git a/resources/openstack/lifecyclemanagement/deployment/charms.png b/resources/openstack/lifecyclemanagement/deployment/charms.png
new file mode 100644
index 000000000..dd040c004
Binary files /dev/null and b/resources/openstack/lifecyclemanagement/deployment/charms.png differ
diff --git a/resources/openstack/lifecyclemanagement/deployment/chef.png b/resources/openstack/lifecyclemanagement/deployment/chef.png
new file mode 100644
index 000000000..1e47dc93a
Binary files /dev/null and b/resources/openstack/lifecyclemanagement/deployment/chef.png differ
diff --git a/resources/openstack/lifecyclemanagement/deployment/helm.png b/resources/openstack/lifecyclemanagement/deployment/helm.png
new file mode 100644
index 000000000..35bb4eab4
Binary files /dev/null and b/resources/openstack/lifecyclemanagement/deployment/helm.png differ
diff --git a/resources/openstack/lifecyclemanagement/deployment/kolla.png b/resources/openstack/lifecyclemanagement/deployment/kolla.png
new file mode 100644
index 000000000..9f74c917c
Binary files /dev/null and b/resources/openstack/lifecyclemanagement/deployment/kolla.png differ
diff --git a/resources/openstack/lifecyclemanagement/deployment/tripleo.png b/resources/openstack/lifecyclemanagement/deployment/tripleo.png
new file mode 100644
index 000000000..21afc5b29
Binary files /dev/null and b/resources/openstack/lifecyclemanagement/deployment/tripleo.png differ
diff --git a/resources/openstack/lifecyclemanagement/packaging/loci.png b/resources/openstack/lifecyclemanagement/packaging/loci.png
new file mode 100644
index 000000000..5f277a4d3
Binary files /dev/null and b/resources/openstack/lifecyclemanagement/packaging/loci.png differ
diff --git a/resources/openstack/lifecyclemanagement/packaging/puppet.png b/resources/openstack/lifecyclemanagement/packaging/puppet.png
new file mode 100644
index 000000000..78e80bff6
Binary files /dev/null and b/resources/openstack/lifecyclemanagement/packaging/puppet.png differ
diff --git a/resources/openstack/lifecyclemanagement/packaging/rpm.png b/resources/openstack/lifecyclemanagement/packaging/rpm.png
new file mode 100644
index 000000000..ad93fc5cf
Binary files /dev/null and b/resources/openstack/lifecyclemanagement/packaging/rpm.png differ
diff --git a/resources/openstack/networking/designate.png b/resources/openstack/networking/designate.png
new file mode 100644
index 000000000..940aee7b9
Binary files /dev/null and b/resources/openstack/networking/designate.png differ
diff --git a/resources/openstack/networking/neutron.png b/resources/openstack/networking/neutron.png
new file mode 100644
index 000000000..7d2b1fbff
Binary files /dev/null and b/resources/openstack/networking/neutron.png differ
diff --git a/resources/openstack/networking/octavia.png b/resources/openstack/networking/octavia.png
new file mode 100644
index 000000000..69a870489
Binary files /dev/null and b/resources/openstack/networking/octavia.png differ
diff --git a/resources/openstack/openstack.png b/resources/openstack/openstack.png
new file mode 100644
index 000000000..75152a7cb
Binary files /dev/null and b/resources/openstack/openstack.png differ
diff --git a/resources/openstack/operations/billing/cloudkitty.png b/resources/openstack/operations/billing/cloudkitty.png
new file mode 100644
index 000000000..984d3087b
Binary files /dev/null and b/resources/openstack/operations/billing/cloudkitty.png differ
diff --git a/resources/openstack/operations/monitoring/monasca.png b/resources/openstack/operations/monitoring/monasca.png
new file mode 100644
index 000000000..c9bc3771f
Binary files /dev/null and b/resources/openstack/operations/monitoring/monasca.png differ
diff --git a/resources/openstack/operations/monitoring/telemetry.png b/resources/openstack/operations/monitoring/telemetry.png
new file mode 100644
index 000000000..59f83aa6c
Binary files /dev/null and b/resources/openstack/operations/monitoring/telemetry.png differ
diff --git a/resources/openstack/operations/multiregion/tricircle.png b/resources/openstack/operations/multiregion/tricircle.png
new file mode 100644
index 000000000..4931aebe3
Binary files /dev/null and b/resources/openstack/operations/multiregion/tricircle.png differ
diff --git a/resources/openstack/operations/optimization/congress.png b/resources/openstack/operations/optimization/congress.png
new file mode 100644
index 000000000..1b16e1495
Binary files /dev/null and b/resources/openstack/operations/optimization/congress.png differ
diff --git a/resources/openstack/operations/optimization/rally.png b/resources/openstack/operations/optimization/rally.png
new file mode 100644
index 000000000..2eec8b65b
Binary files /dev/null and b/resources/openstack/operations/optimization/rally.png differ
diff --git a/resources/openstack/operations/optimization/vitrage.png b/resources/openstack/operations/optimization/vitrage.png
new file mode 100644
index 000000000..89bbdbe6f
Binary files /dev/null and b/resources/openstack/operations/optimization/vitrage.png differ
diff --git a/resources/openstack/operations/optimization/watcher.png b/resources/openstack/operations/optimization/watcher.png
new file mode 100644
index 000000000..8fdbb6d92
Binary files /dev/null and b/resources/openstack/operations/optimization/watcher.png differ
diff --git a/resources/openstack/orchestration/blazar.png b/resources/openstack/orchestration/blazar.png
new file mode 100644
index 000000000..c0a39b992
Binary files /dev/null and b/resources/openstack/orchestration/blazar.png differ
diff --git a/resources/openstack/orchestration/heat.png b/resources/openstack/orchestration/heat.png
new file mode 100644
index 000000000..d72913289
Binary files /dev/null and b/resources/openstack/orchestration/heat.png differ
diff --git a/resources/openstack/orchestration/mistral.png b/resources/openstack/orchestration/mistral.png
new file mode 100644
index 000000000..96bb25f0c
Binary files /dev/null and b/resources/openstack/orchestration/mistral.png differ
diff --git a/resources/openstack/orchestration/senlin.png b/resources/openstack/orchestration/senlin.png
new file mode 100644
index 000000000..2c5c2c607
Binary files /dev/null and b/resources/openstack/orchestration/senlin.png differ
diff --git a/resources/openstack/orchestration/zaqar.png b/resources/openstack/orchestration/zaqar.png
new file mode 100644
index 000000000..ac9947fa0
Binary files /dev/null and b/resources/openstack/orchestration/zaqar.png differ
diff --git a/resources/openstack/sharedservices/barbican.png b/resources/openstack/sharedservices/barbican.png
new file mode 100644
index 000000000..b5292c550
Binary files /dev/null and b/resources/openstack/sharedservices/barbican.png differ
diff --git a/resources/openstack/sharedservices/glance.png b/resources/openstack/sharedservices/glance.png
new file mode 100644
index 000000000..cc1fe21c5
Binary files /dev/null and b/resources/openstack/sharedservices/glance.png differ
diff --git a/resources/openstack/sharedservices/karbor.png b/resources/openstack/sharedservices/karbor.png
new file mode 100644
index 000000000..74b8bd3e1
Binary files /dev/null and b/resources/openstack/sharedservices/karbor.png differ
diff --git a/resources/openstack/sharedservices/keystone.png b/resources/openstack/sharedservices/keystone.png
new file mode 100644
index 000000000..3617cc45f
Binary files /dev/null and b/resources/openstack/sharedservices/keystone.png differ
diff --git a/resources/openstack/sharedservices/searchlight.png b/resources/openstack/sharedservices/searchlight.png
new file mode 100644
index 000000000..e0f47405e
Binary files /dev/null and b/resources/openstack/sharedservices/searchlight.png differ
diff --git a/resources/openstack/storage/cinder.png b/resources/openstack/storage/cinder.png
new file mode 100644
index 000000000..3d9304d3b
Binary files /dev/null and b/resources/openstack/storage/cinder.png differ
diff --git a/resources/openstack/storage/manila.png b/resources/openstack/storage/manila.png
new file mode 100644
index 000000000..eebbe5113
Binary files /dev/null and b/resources/openstack/storage/manila.png differ
diff --git a/resources/openstack/storage/swift.png b/resources/openstack/storage/swift.png
new file mode 100644
index 000000000..5ac0fd524
Binary files /dev/null and b/resources/openstack/storage/swift.png differ
diff --git a/resources/openstack/user/openstackclient.png b/resources/openstack/user/openstackclient.png
new file mode 100644
index 000000000..f4611b06e
Binary files /dev/null and b/resources/openstack/user/openstackclient.png differ
diff --git a/resources/openstack/workloadprovisioning/magnum.png b/resources/openstack/workloadprovisioning/magnum.png
new file mode 100644
index 000000000..118ba40b6
Binary files /dev/null and b/resources/openstack/workloadprovisioning/magnum.png differ
diff --git a/resources/openstack/workloadprovisioning/sahara.png b/resources/openstack/workloadprovisioning/sahara.png
new file mode 100644
index 000000000..34a066b81
Binary files /dev/null and b/resources/openstack/workloadprovisioning/sahara.png differ
diff --git a/resources/openstack/workloadprovisioning/trove.png b/resources/openstack/workloadprovisioning/trove.png
new file mode 100644
index 000000000..3cad74cc0
Binary files /dev/null and b/resources/openstack/workloadprovisioning/trove.png differ
diff --git a/scripts/resource.py b/scripts/resource.py
index 9941f6e65..0c9639665 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 @@ def cleaner_elastic(f):
     "saas": cleaner_saas,
     "elastic": cleaner_elastic,
     "generic": cleaner_generic,
+    "openstack": cleaner_openstack,
 }