diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..c881e1cd
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,33 @@
+# Changelogs
+
+## 0.16.0
+
+### Breaking Changes
+
+- The following import changes:
+  - from diagrams.onprem.logging import Logstash is now from diagrams.elastic.elasticsearch import Logstash
+  - from diagrams.onprem.monitoring import Kibana is now from diagrams.elastic.elasticsearch import Kibana
+  - from diagrams.onprem.search import Elasticsearch(*) is now from diagrams.elastic.elasticsearch import Elasticsearch
+  *The previous icon was the company icon not the elasticsearch product, for the company icon: from diagrams.elastic.saas import Elastic
+
+### Added
+
+- Docker local development setup [#210] https://github.com/mingrammer/diagrams/pull/210
+- Support OpenStack [#211] https://github.com/mingrammer/diagrams/pull/211
+
+### Fixed
+
+-
+
+## 0.15.0
+
+### Added
+
+- Support curvestyle option (ortho or curved)
+- Support Auth0, Cloudflare and Recombee: [#209] https://github.com/mingrammer/diagrams/pull/209
+
+
+### Fixed
+
+- Fix typo for PersistentVolume: [#207] https://github.com/mingrammer/diagrams/pull/207
+- Fix misaligned label text position
diff --git a/config.py b/config.py
index ddcf35dc..b5e5aeb7 100644
--- a/config.py
+++ b/config.py
@@ -116,7 +116,6 @@ ALIASES = {
         },
         "logging": {
             "Fluentbit": "FluentBit",
-            "Logstash": "LogStash",
             "Rsyslog": "RSyslog",
         },
         "network": {
diff --git a/diagrams/elastic/saas.py b/diagrams/elastic/saas.py
new file mode 100644
index 00000000..4821d62f
--- /dev/null
+++ b/diagrams/elastic/saas.py
@@ -0,0 +1,19 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Elastic
+
+
+class _Saas(_Elastic):
+    _type = "saas"
+    _icon_dir = "resources/elastic/saas"
+
+
+class Cloud(_Saas):
+    _icon = "cloud.png"
+
+
+class Elastic(_Saas):
+    _icon = "elastic.png"
+
+
+# Aliases
diff --git a/diagrams/onprem/logging.py b/diagrams/onprem/logging.py
index 068f63c5..48babb65 100644
--- a/diagrams/onprem/logging.py
+++ b/diagrams/onprem/logging.py
@@ -20,10 +20,6 @@ class Graylog(_Logging):
     _icon = "graylog.png"
 
 
-class Logstash(_Logging):
-    _icon = "logstash.png"
-
-
 class Loki(_Logging):
     _icon = "loki.png"
 
@@ -39,5 +35,4 @@ class SyslogNg(_Logging):
 # Aliases
 
 FluentBit = Fluentbit
-LogStash = Logstash
 RSyslog = Rsyslog
diff --git a/diagrams/onprem/monitoring.py b/diagrams/onprem/monitoring.py
index cbabfce7..cd1d2998 100644
--- a/diagrams/onprem/monitoring.py
+++ b/diagrams/onprem/monitoring.py
@@ -16,10 +16,6 @@ class Grafana(_Monitoring):
     _icon = "grafana.png"
 
 
-class Kibana(_Monitoring):
-    _icon = "kibana.png"
-
-
 class Prometheus(_Monitoring):
     _icon = "prometheus.png"
 
diff --git a/diagrams/onprem/search.py b/diagrams/onprem/search.py
index 5e33a156..da5f0b4e 100644
--- a/diagrams/onprem/search.py
+++ b/diagrams/onprem/search.py
@@ -8,10 +8,6 @@ class _Search(_OnPrem):
     _icon_dir = "resources/onprem/search"
 
 
-class Elasticsearch(_Search):
-    _icon = "elasticsearch.png"
-
-
 class Solr(_Search):
     _icon = "solr.png"
 
diff --git a/docs/nodes/elastic.md b/docs/nodes/elastic.md
index cbe65932..28ed1e2e 100644
--- a/docs/nodes/elastic.md
+++ b/docs/nodes/elastic.md
@@ -38,6 +38,11 @@ Node classes list of elastic provider.
 - **diagrams.elastic.orchestration.ECE**
 - **diagrams.elastic.orchestration.ECK**
 
+## elastic.saas
+
+- **diagrams.elastic.saas.Cloud**
+- **diagrams.elastic.saas.Elastic**
+
 ## elastic.security
 
 - **diagrams.elastic.security.Endpoint**
diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md
index 01fdf6c5..eac5bc34 100644
--- a/docs/nodes/onprem.md
+++ b/docs/nodes/onprem.md
@@ -99,7 +99,6 @@ Node classes list of onprem provider.
 - **diagrams.onprem.logging.Fluentbit**, **FluentBit** (alias)
 - **diagrams.onprem.logging.Fluentd**
 - **diagrams.onprem.logging.Graylog**
-- **diagrams.onprem.logging.Logstash**, **LogStash** (alias)
 - **diagrams.onprem.logging.Loki**
 - **diagrams.onprem.logging.Rsyslog**, **RSyslog** (alias)
 - **diagrams.onprem.logging.SyslogNg**
@@ -112,7 +111,6 @@ Node classes list of onprem provider.
 
 - **diagrams.onprem.monitoring.Datadog**
 - **diagrams.onprem.monitoring.Grafana**
-- **diagrams.onprem.monitoring.Kibana**
 - **diagrams.onprem.monitoring.Prometheus**
 - **diagrams.onprem.monitoring.Sentry**
 - **diagrams.onprem.monitoring.Splunk**
@@ -148,7 +146,6 @@ Node classes list of onprem provider.
 
 ## onprem.search
 
-- **diagrams.onprem.search.Elasticsearch**
 - **diagrams.onprem.search.Solr**
 
 ## onprem.security
diff --git a/resources/elastic/cloud.png b/resources/elastic/saas/cloud.png
similarity index 100%
rename from resources/elastic/cloud.png
rename to resources/elastic/saas/cloud.png
diff --git a/resources/onprem/search/elasticsearch.png b/resources/elastic/saas/elastic.png
similarity index 100%
rename from resources/onprem/search/elasticsearch.png
rename to resources/elastic/saas/elastic.png
diff --git a/resources/onprem/logging/logstash.png b/resources/onprem/logging/logstash.png
deleted file mode 100644
index 5b23370b..00000000
Binary files a/resources/onprem/logging/logstash.png and /dev/null differ
diff --git a/resources/onprem/monitoring/kibana.png b/resources/onprem/monitoring/kibana.png
deleted file mode 100644
index c7be5244..00000000
Binary files a/resources/onprem/monitoring/kibana.png and /dev/null differ