diff --git a/README.md b/README.md
index d87068c7..a4277e29 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 1486dd0b..3a01fa58 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 04608be9..30d93887 100644
--- a/config.py
+++ b/config.py
@@ -13,7 +13,7 @@ DIR_TEMPLATE = "templates"
 
 PROVIDERS = (
     "base", "onprem", "aws", "azure", "gcp", "firebase", "k8s", "alibabacloud", "oci", "programming", "saas", "elastic",
-    "generic")
+    "generic", "openstack")
 
 #########################
 #  Resource Processing  #
@@ -39,6 +39,7 @@ FILE_PREFIXES = {
     "saas": (),
     "elastic": (),
     "generic": (),
+    "openstack": (),
 }
 
 #########################
@@ -65,6 +66,7 @@ UPPER_WORDS = {
     "oci": ("oci",),
     "elastic": ("apm", "siem", "ece", "eck"),
     "generic": ("vpn", "ios", "xen"),
+    "openstack": (),
 }
 
 TITLE_WORDS = {
@@ -76,7 +78,10 @@ TITLE_WORDS = {
     },
     "aws": {
         "cloudfront": "CloudFront"
-    }
+    },
+    "openstack": {
+        "openstack": "OpenStack"
+    },
 }
 
 # TODO: check if the classname exists
@@ -381,4 +386,5 @@ ALIASES = {
         }
     },
     "generic": {},
+    "openstack": {},
 }
diff --git a/diagrams/openstack/__init__.py b/diagrams/openstack/__init__.py
new file mode 100644
index 00000000..7e3b5c44
--- /dev/null
+++ b/diagrams/openstack/__init__.py
@@ -0,0 +1,12 @@
+"""
+Elastic 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/resources/openstack/adjacentenablers/containerservices/kuryr.png b/resources/openstack/adjacentenablers/containerservices/kuryr.png
new file mode 100644
index 00000000..608e64ca
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 00000000..15a5424c
Binary files /dev/null and b/resources/openstack/adjacentenablers/nfv/tacker.png differ
diff --git a/resources/openstack/apiproxies/ec2-api.png b/resources/openstack/apiproxies/ec2-api.png
new file mode 100644
index 00000000..d31079cc
Binary files /dev/null and b/resources/openstack/apiproxies/ec2-api.png differ
diff --git a/resources/openstack/applicationlifecycle/freezer.png b/resources/openstack/applicationlifecycle/freezer.png
new file mode 100644
index 00000000..3be90606
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 00000000..ee244205
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 00000000..7b49b0dc
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 00000000..39539e42
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 00000000..d833e3fa
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 00000000..036012b1
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 00000000..e894c117
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 00000000..b09928ec
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 00000000..e4cbdc22
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 00000000..569377de
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 00000000..2803e98f
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 00000000..dd040c00
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 00000000..1e47dc93
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 00000000..35bb4eab
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 00000000..9f74c917
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 00000000..21afc5b2
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 00000000..5f277a4d
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 00000000..78e80bff
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 00000000..ad93fc5c
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 00000000..940aee7b
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 00000000..7d2b1fbf
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 00000000..69a87048
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 00000000..75152a7c
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 00000000..984d3087
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 00000000..c9bc3771
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 00000000..59f83aa6
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 00000000..4931aebe
Binary files /dev/null and b/resources/openstack/operations/multiregion/tricircle.png differ
diff --git a/resources/openstack/operations/optimization/OpenStack_Project_Rally_mascot.png b/resources/openstack/operations/optimization/OpenStack_Project_Rally_mascot.png
new file mode 100644
index 00000000..6f09b314
Binary files /dev/null and b/resources/openstack/operations/optimization/OpenStack_Project_Rally_mascot.png differ
diff --git a/resources/openstack/operations/optimization/congress.png b/resources/openstack/operations/optimization/congress.png
new file mode 100644
index 00000000..1b16e149
Binary files /dev/null and b/resources/openstack/operations/optimization/congress.png differ
diff --git a/resources/openstack/operations/optimization/vitrage.png b/resources/openstack/operations/optimization/vitrage.png
new file mode 100644
index 00000000..89bbdbe6
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 00000000..8fdbb6d9
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 00000000..c0a39b99
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 00000000..d7291328
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 00000000..96bb25f0
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 00000000..2c5c2c60
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 00000000..ac9947fa
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 00000000..b5292c55
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 00000000..cc1fe21c
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 00000000..74b8bd3e
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 00000000..3617cc45
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 00000000..e0f47405
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 00000000..3d9304d3
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 00000000..eebbe511
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 00000000..5ac0fd52
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 00000000..f4611b06
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 00000000..118ba40b
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 00000000..34a066b8
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 00000000..3cad74cc
Binary files /dev/null and b/resources/openstack/workloadprovisioning/trove.png differ