diff --git a/config.py b/config.py
index 9acb8260..de5d247f 100644
--- a/config.py
+++ b/config.py
@@ -355,9 +355,5 @@ ALIASES = {
             "Typescript": "TypeScript"
         },
     },
-    "saas": {
-        "elasticsearch": {
-            "Logstash": "LogStash",
-        }
-    },
+    "saas": {},
 }
diff --git a/diagrams/saas/elasticcloud.py b/diagrams/saas/elasticcloud.py
deleted file mode 100644
index 7537f120..00000000
--- a/diagrams/saas/elasticcloud.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# This module is automatically generated by autogen.sh. DO NOT EDIT.
-
-from . import _Saas
-
-
-class _ElasticCloud(_Saas):
-    _type = "elasticcloud"
-    _icon_dir = "resources/saas/elasticcloud"
-
-
-class Cloud(_ElasticCloud):
-    _icon = "cloud.png"
-
-
-# Aliases
diff --git a/diagrams/saas/elasticsearch.py b/diagrams/saas/elasticsearch.py
deleted file mode 100644
index ceced211..00000000
--- a/diagrams/saas/elasticsearch.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# This module is automatically generated by autogen.sh. DO NOT EDIT.
-
-from . import _Saas
-
-
-class _Elasticsearch(_Saas):
-    _type = "elasticsearch"
-    _icon_dir = "resources/saas/elasticsearch"
-
-
-class Alerting(_Elasticsearch):
-    _icon = "alerting.png"
-
-
-class Elasticsearch(_Elasticsearch):
-    _icon = "elasticsearch.png"
-
-
-class Kibana(_Elasticsearch):
-    _icon = "kibana.png"
-
-
-class Logstash(_Elasticsearch):
-    _icon = "logstash.png"
-
-
-class MachineLearning(_Elasticsearch):
-    _icon = "machine-learning.png"
-
-
-class Maps(_Elasticsearch):
-    _icon = "maps.png"
-
-
-class Monitoring(_Elasticsearch):
-    _icon = "monitoring.png"
-
-
-class SecuritySettings(_Elasticsearch):
-    _icon = "security-settings.png"
-
-
-class Sql(_Elasticsearch):
-    _icon = "sql.png"
-
-
-# Aliases
-
-LogStash = Logstash
diff --git a/diagrams/saas/enterprisesearch.py b/diagrams/saas/enterprisesearch.py
deleted file mode 100644
index 1b01c11c..00000000
--- a/diagrams/saas/enterprisesearch.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# This module is automatically generated by autogen.sh. DO NOT EDIT.
-
-from . import _Saas
-
-
-class _Enterprisesearch(_Saas):
-    _type = "enterprisesearch"
-    _icon_dir = "resources/saas/enterprisesearch"
-
-
-class AppSearch(_Enterprisesearch):
-    _icon = "app-search.png"
-
-
-class EnterpriseSearch(_Enterprisesearch):
-    _icon = "enterprise-search.png"
-
-
-class SiteSearch(_Enterprisesearch):
-    _icon = "site-search.png"
-
-
-class WorkplaceSearch(_Enterprisesearch):
-    _icon = "workplace-search.png"
-
-
-# Aliases
diff --git a/diagrams/saas/observability.py b/diagrams/saas/observability.py
deleted file mode 100644
index aa03064d..00000000
--- a/diagrams/saas/observability.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# This module is automatically generated by autogen.sh. DO NOT EDIT.
-
-from . import _Saas
-
-
-class _Observability(_Saas):
-    _type = "observability"
-    _icon_dir = "resources/saas/observability"
-
-
-class Apm(_Observability):
-    _icon = "apm.png"
-
-
-class Logs(_Observability):
-    _icon = "logs.png"
-
-
-class Metrics(_Observability):
-    _icon = "metrics.png"
-
-
-class Observability(_Observability):
-    _icon = "observability.png"
-
-
-class Uptime(_Observability):
-    _icon = "uptime.png"
-
-
-# Aliases
diff --git a/diagrams/saas/security.py b/diagrams/saas/security.py
deleted file mode 100644
index c2bacd2c..00000000
--- a/diagrams/saas/security.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# This module is automatically generated by autogen.sh. DO NOT EDIT.
-
-from . import _Saas
-
-
-class _Security(_Saas):
-    _type = "security"
-    _icon_dir = "resources/saas/security"
-
-
-class Endpoint(_Security):
-    _icon = "endpoint.png"
-
-
-class Security(_Security):
-    _icon = "security.png"
-
-
-class Siem(_Security):
-    _icon = "siem.png"
-
-
-# Aliases
diff --git a/docs/nodes/saas.md b/docs/nodes/saas.md
index ff50f854..4e7ae882 100644
--- a/docs/nodes/saas.md
+++ b/docs/nodes/saas.md
@@ -5,49 +5,12 @@ title: Saas
 
 Node classes list of saas provider.
 
-## saas.social
-
-- **diagrams.saas.social.Facebook**
-- **diagrams.saas.social.Twitter**
-
 ## saas.chat
 
 - **diagrams.saas.chat.Slack**
 - **diagrams.saas.chat.Telegram**
 
-## saas.elasticcloud
-
-- **diagrams.saas.elasticcloud.Cloud**
-
-## saas.elasticsearch
-
-- **diagrams.saas.elasticsearch.Alerting**
-- **diagrams.saas.elasticsearch.Elasticsearch**
-- **diagrams.saas.elasticsearch.Kibana**
-- **diagrams.saas.elasticsearch.Logstash**, **LogStash** (alias)
-- **diagrams.saas.elasticsearch.MachineLearning**
-- **diagrams.saas.elasticsearch.Maps**
-- **diagrams.saas.elasticsearch.Monitoring**
-- **diagrams.saas.elasticsearch.SecuritySettings**
-- **diagrams.saas.elasticsearch.Sql**
-
-## saas.security
-
-- **diagrams.saas.security.Endpoint**
-- **diagrams.saas.security.Security**
-- **diagrams.saas.security.Siem**
-
-## saas.observability
-
-- **diagrams.saas.observability.Apm**
-- **diagrams.saas.observability.Logs**
-- **diagrams.saas.observability.Metrics**
-- **diagrams.saas.observability.Observability**
-- **diagrams.saas.observability.Uptime**
-
-## saas.enterprisesearch
+## saas.social
 
-- **diagrams.saas.enterprisesearch.AppSearch**
-- **diagrams.saas.enterprisesearch.EnterpriseSearch**
-- **diagrams.saas.enterprisesearch.SiteSearch**
-- **diagrams.saas.enterprisesearch.WorkplaceSearch**
+- **diagrams.saas.social.Facebook**
+- **diagrams.saas.social.Twitter**
diff --git a/resources/saas/chat/slack.png b/resources/saas/chat/slack.png
index 66e9e72f..04be9691 100644
Binary files a/resources/saas/chat/slack.png and b/resources/saas/chat/slack.png differ
diff --git a/resources/saas/elasticcloud/cloud.png b/resources/saas/elasticcloud/cloud.png
deleted file mode 100644
index 92ee1c92..00000000
Binary files a/resources/saas/elasticcloud/cloud.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/elasticsearch/alerting.png b/resources/saas/elasticcloud/elasticsearch/alerting.png
deleted file mode 100644
index eb8c7c71..00000000
Binary files a/resources/saas/elasticcloud/elasticsearch/alerting.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/elasticsearch/elasticsearch.png b/resources/saas/elasticcloud/elasticsearch/elasticsearch.png
deleted file mode 100644
index 10188c30..00000000
Binary files a/resources/saas/elasticcloud/elasticsearch/elasticsearch.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/elasticsearch/kibana.png b/resources/saas/elasticcloud/elasticsearch/kibana.png
deleted file mode 100644
index b856e29b..00000000
Binary files a/resources/saas/elasticcloud/elasticsearch/kibana.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/elasticsearch/logstash.png b/resources/saas/elasticcloud/elasticsearch/logstash.png
deleted file mode 100644
index 7beca017..00000000
Binary files a/resources/saas/elasticcloud/elasticsearch/logstash.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/elasticsearch/machine-learning.png b/resources/saas/elasticcloud/elasticsearch/machine-learning.png
deleted file mode 100644
index d69926ce..00000000
Binary files a/resources/saas/elasticcloud/elasticsearch/machine-learning.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/elasticsearch/maps.png b/resources/saas/elasticcloud/elasticsearch/maps.png
deleted file mode 100644
index 5f597a9c..00000000
Binary files a/resources/saas/elasticcloud/elasticsearch/maps.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/elasticsearch/monitoring.png b/resources/saas/elasticcloud/elasticsearch/monitoring.png
deleted file mode 100644
index 00c9665c..00000000
Binary files a/resources/saas/elasticcloud/elasticsearch/monitoring.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/elasticsearch/security-settings.png b/resources/saas/elasticcloud/elasticsearch/security-settings.png
deleted file mode 100644
index 74a54816..00000000
Binary files a/resources/saas/elasticcloud/elasticsearch/security-settings.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/elasticsearch/sql.png b/resources/saas/elasticcloud/elasticsearch/sql.png
deleted file mode 100644
index ebb7fc3e..00000000
Binary files a/resources/saas/elasticcloud/elasticsearch/sql.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/enterprisesearch/app-search.png b/resources/saas/elasticcloud/enterprisesearch/app-search.png
deleted file mode 100644
index a7217232..00000000
Binary files a/resources/saas/elasticcloud/enterprisesearch/app-search.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/enterprisesearch/enterprise-search.png b/resources/saas/elasticcloud/enterprisesearch/enterprise-search.png
deleted file mode 100644
index 6354b21c..00000000
Binary files a/resources/saas/elasticcloud/enterprisesearch/enterprise-search.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/enterprisesearch/site-search.png b/resources/saas/elasticcloud/enterprisesearch/site-search.png
deleted file mode 100644
index eb41bb9c..00000000
Binary files a/resources/saas/elasticcloud/enterprisesearch/site-search.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/enterprisesearch/workplace-search.png b/resources/saas/elasticcloud/enterprisesearch/workplace-search.png
deleted file mode 100644
index 5e38b5e6..00000000
Binary files a/resources/saas/elasticcloud/enterprisesearch/workplace-search.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/observability/apm.png b/resources/saas/elasticcloud/observability/apm.png
deleted file mode 100644
index 3b1ba284..00000000
Binary files a/resources/saas/elasticcloud/observability/apm.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/observability/logs.png b/resources/saas/elasticcloud/observability/logs.png
deleted file mode 100644
index 2976ae21..00000000
Binary files a/resources/saas/elasticcloud/observability/logs.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/observability/metrics.png b/resources/saas/elasticcloud/observability/metrics.png
deleted file mode 100644
index bb354a07..00000000
Binary files a/resources/saas/elasticcloud/observability/metrics.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/observability/observability.png b/resources/saas/elasticcloud/observability/observability.png
deleted file mode 100644
index 5844caa9..00000000
Binary files a/resources/saas/elasticcloud/observability/observability.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/observability/uptime.png b/resources/saas/elasticcloud/observability/uptime.png
deleted file mode 100644
index f4e2709d..00000000
Binary files a/resources/saas/elasticcloud/observability/uptime.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/security/endpoint.png b/resources/saas/elasticcloud/security/endpoint.png
deleted file mode 100644
index 91facf99..00000000
Binary files a/resources/saas/elasticcloud/security/endpoint.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/security/security.png b/resources/saas/elasticcloud/security/security.png
deleted file mode 100644
index ebf98d16..00000000
Binary files a/resources/saas/elasticcloud/security/security.png and /dev/null differ
diff --git a/resources/saas/elasticcloud/security/siem.png b/resources/saas/elasticcloud/security/siem.png
deleted file mode 100644
index 4024b3c0..00000000
Binary files a/resources/saas/elasticcloud/security/siem.png and /dev/null differ