diff --git a/config.py b/config.py
index 34db7ecfb..85affc3e6 100644
--- a/config.py
+++ b/config.py
@@ -98,6 +98,7 @@
             "Argocd": "ArgoCD",
         },
         "logging": {
+            "Fluentbit": "FluentBit",
             "Logstash": "LogStash",
         },
         "network": {
diff --git a/diagrams/onprem/logging.py b/diagrams/onprem/logging.py
index f0cbd2abf..ed96385d2 100644
--- a/diagrams/onprem/logging.py
+++ b/diagrams/onprem/logging.py
@@ -8,6 +8,10 @@ class _Logging(_OnPrem):
     _icon_dir = "resources/onprem/logging"
 
 
+class Fluentbit(_Logging):
+    _icon = "fluentbit.png"
+
+
 class Fluentd(_Logging):
     _icon = "fluentd.png"
 
@@ -22,4 +26,5 @@ class Loki(_Logging):
 
 # Aliases
 
+FluentBit = Fluentbit
 LogStash = Logstash
diff --git a/docs/nodes/alibabacloud.md b/docs/nodes/alibabacloud.md
index eb62f5d20..cc274c240 100644
--- a/docs/nodes/alibabacloud.md
+++ b/docs/nodes/alibabacloud.md
@@ -5,6 +5,54 @@ title: AlibabaCloud
 
 Node classes list of alibabacloud provider.
 
+## alibabacloud.analytics
+
+- **diagrams.alibabacloud.analytics.AnalyticDb**
+- **diagrams.alibabacloud.analytics.ClickHouse**
+- **diagrams.alibabacloud.analytics.DataLakeAnalytics**
+- **diagrams.alibabacloud.analytics.ElaticMapReduce**
+- **diagrams.alibabacloud.analytics.OpenSearch**
+
+## alibabacloud.application
+
+- **diagrams.alibabacloud.application.ApiGateway**
+- **diagrams.alibabacloud.application.BeeBot**
+- **diagrams.alibabacloud.application.BlockchainAsAService**
+- **diagrams.alibabacloud.application.CloudCallCenter**
+- **diagrams.alibabacloud.application.CodePipeline**
+- **diagrams.alibabacloud.application.DirectMail**
+- **diagrams.alibabacloud.application.LogService**, **SLS** (alias)
+- **diagrams.alibabacloud.application.MessageNotificationService**, **MNS** (alias)
+- **diagrams.alibabacloud.application.NodeJsPerformancePlatform**
+- **diagrams.alibabacloud.application.OpenSearch**
+- **diagrams.alibabacloud.application.PerformanceTestingService**, **PTS** (alias)
+- **diagrams.alibabacloud.application.RdCloud**
+- **diagrams.alibabacloud.application.SmartConversationAnalysis**, **SCA** (alias)
+- **diagrams.alibabacloud.application.Yida**
+
+## alibabacloud.communication
+
+- **diagrams.alibabacloud.communication.DirectMail**
+- **diagrams.alibabacloud.communication.MobilePush**
+
+## alibabacloud.compute
+
+- **diagrams.alibabacloud.compute.AutoScaling**, **ESS** (alias)
+- **diagrams.alibabacloud.compute.BatchCompute**
+- **diagrams.alibabacloud.compute.ContainerRegistry**
+- **diagrams.alibabacloud.compute.ContainerService**
+- **diagrams.alibabacloud.compute.ElasticComputeService**, **ECS** (alias)
+- **diagrams.alibabacloud.compute.ElasticContainerInstance**, **ECI** (alias)
+- **diagrams.alibabacloud.compute.ElasticHighPerformanceComputing**, **EHPC** (alias)
+- **diagrams.alibabacloud.compute.ElasticSearch**
+- **diagrams.alibabacloud.compute.FunctionCompute**, **FC** (alias)
+- **diagrams.alibabacloud.compute.OperationOrchestrationService**, **OOS** (alias)
+- **diagrams.alibabacloud.compute.ResourceOrchestrationService**, **ROS** (alias)
+- **diagrams.alibabacloud.compute.ServerLoadBalancer**, **SLB** (alias)
+- **diagrams.alibabacloud.compute.ServerlessAppEngine**, **SAE** (alias)
+- **diagrams.alibabacloud.compute.SimpleApplicationServer**, **SAS** (alias)
+- **diagrams.alibabacloud.compute.WebAppService**, **WAS** (alias)
+
 ## alibabacloud.database
 
 - **diagrams.alibabacloud.database.ApsaradbCassandra**
@@ -25,6 +73,25 @@ Node classes list of alibabacloud provider.
 - **diagrams.alibabacloud.database.HybriddbForMysql**
 - **diagrams.alibabacloud.database.RelationalDatabaseService**, **RDS** (alias)
 
+## alibabacloud.iot
+
+- **diagrams.alibabacloud.iot.IotInternetDeviceId**
+- **diagrams.alibabacloud.iot.IotLinkWan**
+- **diagrams.alibabacloud.iot.IotMobileConnectionPackage**
+- **diagrams.alibabacloud.iot.IotPlatform**
+
+## alibabacloud.network
+
+- **diagrams.alibabacloud.network.Cdn**
+- **diagrams.alibabacloud.network.CloudEnterpriseNetwork**, **CEN** (alias)
+- **diagrams.alibabacloud.network.ElasticIpAddress**, **EIP** (alias)
+- **diagrams.alibabacloud.network.ExpressConnect**
+- **diagrams.alibabacloud.network.NatGateway**
+- **diagrams.alibabacloud.network.ServerLoadBalancer**, **SLB** (alias)
+- **diagrams.alibabacloud.network.SmartAccessGateway**
+- **diagrams.alibabacloud.network.VirtualPrivateCloud**, **VPC** (alias)
+- **diagrams.alibabacloud.network.VpnGateway**
+
 ## alibabacloud.security
 
 - **diagrams.alibabacloud.security.AntiBotService**, **ABS** (alias)
@@ -46,23 +113,6 @@ Node classes list of alibabacloud provider.
 - **diagrams.alibabacloud.security.SslCertificates**
 - **diagrams.alibabacloud.security.WebApplicationFirewall**, **WAF** (alias)
 
-## alibabacloud.web
-
-- **diagrams.alibabacloud.web.Dns**
-- **diagrams.alibabacloud.web.Domain**
-
-## alibabacloud.network
-
-- **diagrams.alibabacloud.network.Cdn**
-- **diagrams.alibabacloud.network.CloudEnterpriseNetwork**, **CEN** (alias)
-- **diagrams.alibabacloud.network.ElasticIpAddress**, **EIP** (alias)
-- **diagrams.alibabacloud.network.ExpressConnect**
-- **diagrams.alibabacloud.network.NatGateway**
-- **diagrams.alibabacloud.network.ServerLoadBalancer**, **SLB** (alias)
-- **diagrams.alibabacloud.network.SmartAccessGateway**
-- **diagrams.alibabacloud.network.VirtualPrivateCloud**, **VPC** (alias)
-- **diagrams.alibabacloud.network.VpnGateway**
-
 ## alibabacloud.storage
 
 - **diagrams.alibabacloud.storage.CloudStorageGateway**
@@ -74,57 +124,7 @@ Node classes list of alibabacloud provider.
 - **diagrams.alibabacloud.storage.ObjectStorageService**, **OSS** (alias)
 - **diagrams.alibabacloud.storage.ObjectTableStore**, **OTS** (alias)
 
-## alibabacloud.iot
-
-- **diagrams.alibabacloud.iot.IotInternetDeviceId**
-- **diagrams.alibabacloud.iot.IotLinkWan**
-- **diagrams.alibabacloud.iot.IotMobileConnectionPackage**
-- **diagrams.alibabacloud.iot.IotPlatform**
-
-## alibabacloud.compute
-
-- **diagrams.alibabacloud.compute.AutoScaling**, **ESS** (alias)
-- **diagrams.alibabacloud.compute.BatchCompute**
-- **diagrams.alibabacloud.compute.ContainerRegistry**
-- **diagrams.alibabacloud.compute.ContainerService**
-- **diagrams.alibabacloud.compute.ElasticComputeService**, **ECS** (alias)
-- **diagrams.alibabacloud.compute.ElasticContainerInstance**, **ECI** (alias)
-- **diagrams.alibabacloud.compute.ElasticHighPerformanceComputing**, **EHPC** (alias)
-- **diagrams.alibabacloud.compute.ElasticSearch**
-- **diagrams.alibabacloud.compute.FunctionCompute**, **FC** (alias)
-- **diagrams.alibabacloud.compute.OperationOrchestrationService**, **OOS** (alias)
-- **diagrams.alibabacloud.compute.ResourceOrchestrationService**, **ROS** (alias)
-- **diagrams.alibabacloud.compute.ServerLoadBalancer**, **SLB** (alias)
-- **diagrams.alibabacloud.compute.ServerlessAppEngine**, **SAE** (alias)
-- **diagrams.alibabacloud.compute.SimpleApplicationServer**, **SAS** (alias)
-- **diagrams.alibabacloud.compute.WebAppService**, **WAS** (alias)
-
-## alibabacloud.application
-
-- **diagrams.alibabacloud.application.ApiGateway**
-- **diagrams.alibabacloud.application.BeeBot**
-- **diagrams.alibabacloud.application.BlockchainAsAService**
-- **diagrams.alibabacloud.application.CloudCallCenter**
-- **diagrams.alibabacloud.application.CodePipeline**
-- **diagrams.alibabacloud.application.DirectMail**
-- **diagrams.alibabacloud.application.LogService**, **SLS** (alias)
-- **diagrams.alibabacloud.application.MessageNotificationService**, **MNS** (alias)
-- **diagrams.alibabacloud.application.NodeJsPerformancePlatform**
-- **diagrams.alibabacloud.application.OpenSearch**
-- **diagrams.alibabacloud.application.PerformanceTestingService**, **PTS** (alias)
-- **diagrams.alibabacloud.application.RdCloud**
-- **diagrams.alibabacloud.application.SmartConversationAnalysis**, **SCA** (alias)
-- **diagrams.alibabacloud.application.Yida**
-
-## alibabacloud.communication
-
-- **diagrams.alibabacloud.communication.DirectMail**
-- **diagrams.alibabacloud.communication.MobilePush**
-
-## alibabacloud.analytics
+## alibabacloud.web
 
-- **diagrams.alibabacloud.analytics.AnalyticDb**
-- **diagrams.alibabacloud.analytics.ClickHouse**
-- **diagrams.alibabacloud.analytics.DataLakeAnalytics**
-- **diagrams.alibabacloud.analytics.ElaticMapReduce**
-- **diagrams.alibabacloud.analytics.OpenSearch**
+- **diagrams.alibabacloud.web.Dns**
+- **diagrams.alibabacloud.web.Domain**
diff --git a/docs/nodes/aws.md b/docs/nodes/aws.md
index e5788ac6a..6971abd4d 100644
--- a/docs/nodes/aws.md
+++ b/docs/nodes/aws.md
@@ -5,6 +5,56 @@ title: AWS
 
 Node classes list of aws provider.
 
+## aws.analytics
+
+- **diagrams.aws.analytics.Analytics**
+- **diagrams.aws.analytics.Athena**
+- **diagrams.aws.analytics.CloudsearchSearchDocuments**
+- **diagrams.aws.analytics.Cloudsearch**
+- **diagrams.aws.analytics.DataPipeline**
+- **diagrams.aws.analytics.ElasticsearchService**, **ES** (alias)
+- **diagrams.aws.analytics.EMRCluster**
+- **diagrams.aws.analytics.EMRHdfsCluster**
+- **diagrams.aws.analytics.EMR**
+- **diagrams.aws.analytics.GlueCrawlers**
+- **diagrams.aws.analytics.GlueDataCatalog**
+- **diagrams.aws.analytics.Glue**
+- **diagrams.aws.analytics.KinesisDataAnalytics**
+- **diagrams.aws.analytics.KinesisDataFirehose**
+- **diagrams.aws.analytics.KinesisDataStreams**
+- **diagrams.aws.analytics.KinesisVideoStreams**
+- **diagrams.aws.analytics.Kinesis**
+- **diagrams.aws.analytics.LakeFormation**
+- **diagrams.aws.analytics.ManagedStreamingForKafka**
+- **diagrams.aws.analytics.Quicksight**
+- **diagrams.aws.analytics.RedshiftDenseComputeNode**
+- **diagrams.aws.analytics.RedshiftDenseStorageNode**
+- **diagrams.aws.analytics.Redshift**
+
+## aws.compute
+
+- **diagrams.aws.compute.ApplicationAutoScaling**, **AutoScaling** (alias)
+- **diagrams.aws.compute.Batch**
+- **diagrams.aws.compute.Compute**
+- **diagrams.aws.compute.EC2ContainerRegistry**, **ECR** (alias)
+- **diagrams.aws.compute.EC2**
+- **diagrams.aws.compute.ElasticBeanstalk**, **EB** (alias)
+- **diagrams.aws.compute.ElasticContainerService**, **ECS** (alias)
+- **diagrams.aws.compute.ElasticKubernetesService**, **EKS** (alias)
+- **diagrams.aws.compute.Fargate**
+- **diagrams.aws.compute.Lambda**
+- **diagrams.aws.compute.Lightsail**
+- **diagrams.aws.compute.Outposts**
+- **diagrams.aws.compute.ServerlessApplicationRepository**, **SAR** (alias)
+- **diagrams.aws.compute.ThinkboxDeadline**
+- **diagrams.aws.compute.ThinkboxDraft**
+- **diagrams.aws.compute.ThinkboxFrost**
+- **diagrams.aws.compute.ThinkboxKrakatoa**
+- **diagrams.aws.compute.ThinkboxSequoia**
+- **diagrams.aws.compute.ThinkboxStoke**
+- **diagrams.aws.compute.ThinkboxXmesh**
+- **diagrams.aws.compute.VmwareCloudOnAWS**
+
 ## aws.database
 
 - **diagrams.aws.database.Aurora**
@@ -20,27 +70,25 @@ Node classes list of aws provider.
 - **diagrams.aws.database.Redshift**
 - **diagrams.aws.database.Timestream**
 
-## aws.security
+## aws.devtools
 
-- **diagrams.aws.security.Artifact**
-- **diagrams.aws.security.CertificateManager**, **ACM** (alias)
-- **diagrams.aws.security.CloudDirectory**
-- **diagrams.aws.security.Cloudhsm**, **CloudHSM** (alias)
-- **diagrams.aws.security.Cognito**
-- **diagrams.aws.security.DirectoryService**, **DS** (alias)
-- **diagrams.aws.security.FirewallManager**, **FMS** (alias)
-- **diagrams.aws.security.Guardduty**
-- **diagrams.aws.security.IdentityAndAccessManagementIam**, **IAM** (alias)
-- **diagrams.aws.security.Inspector**
-- **diagrams.aws.security.KeyManagementService**, **KMS** (alias)
-- **diagrams.aws.security.Macie**
-- **diagrams.aws.security.ResourceAccessManager**, **RAM** (alias)
-- **diagrams.aws.security.SecretsManager**
-- **diagrams.aws.security.SecurityHub**
-- **diagrams.aws.security.SecurityIdentityAndCompliance**
-- **diagrams.aws.security.Shield**
-- **diagrams.aws.security.SingleSignOn**
-- **diagrams.aws.security.WAF**
+- **diagrams.aws.devtools.CloudDevelopmentKit**
+- **diagrams.aws.devtools.Cloud9**
+- **diagrams.aws.devtools.Codebuild**
+- **diagrams.aws.devtools.Codecommit**
+- **diagrams.aws.devtools.Codedeploy**
+- **diagrams.aws.devtools.Codepipeline**
+- **diagrams.aws.devtools.Codestar**
+- **diagrams.aws.devtools.CommandLineInterface**, **CLI** (alias)
+- **diagrams.aws.devtools.DeveloperTools**, **DevTools** (alias)
+- **diagrams.aws.devtools.ToolsAndSdks**
+- **diagrams.aws.devtools.XRay**
+
+## aws.engagement
+
+- **diagrams.aws.engagement.Connect**
+- **diagrams.aws.engagement.Pinpoint**
+- **diagrams.aws.engagement.SimpleEmailServiceSes**, **SES** (alias)
 
 ## aws.integration
 
@@ -53,31 +101,20 @@ Node classes list of aws provider.
 - **diagrams.aws.integration.SimpleQueueServiceSqs**, **SQS** (alias)
 - **diagrams.aws.integration.StepFunctions**, **SF** (alias)
 
-## aws.network
+## aws.iot
 
-- **diagrams.aws.network.APIGateway**
-- **diagrams.aws.network.AppMesh**
-- **diagrams.aws.network.ClientVpn**
-- **diagrams.aws.network.CloudMap**
-- **diagrams.aws.network.CloudFront**, **CF** (alias)
-- **diagrams.aws.network.DirectConnect**
-- **diagrams.aws.network.ElasticLoadBalancing**, **ELB** (alias)
-- **diagrams.aws.network.Endpoint**
-- **diagrams.aws.network.GlobalAccelerator**, **GAX** (alias)
-- **diagrams.aws.network.InternetGateway**
-- **diagrams.aws.network.Nacl**
-- **diagrams.aws.network.NATGateway**
-- **diagrams.aws.network.NetworkingAndContentDelivery**
-- **diagrams.aws.network.PrivateSubnet**
-- **diagrams.aws.network.Privatelink**
-- **diagrams.aws.network.PublicSubnet**
-- **diagrams.aws.network.Route53**
-- **diagrams.aws.network.RouteTable**
-- **diagrams.aws.network.SiteToSiteVpn**
-- **diagrams.aws.network.TransitGateway**
-- **diagrams.aws.network.VPCPeering**
-- **diagrams.aws.network.VPCRouter**
-- **diagrams.aws.network.VPC**
+- **diagrams.aws.iot.Freertos**, **FreeRTOS** (alias)
+- **diagrams.aws.iot.InternetOfThings**
+- **diagrams.aws.iot.Iot1Click**
+- **diagrams.aws.iot.IotAnalytics**
+- **diagrams.aws.iot.IotButton**
+- **diagrams.aws.iot.IotCore**
+- **diagrams.aws.iot.IotDeviceDefender**
+- **diagrams.aws.iot.IotDeviceManagement**
+- **diagrams.aws.iot.IotEvents**
+- **diagrams.aws.iot.IotGreengrass**
+- **diagrams.aws.iot.IotSitewise**
+- **diagrams.aws.iot.IotThingsGraph**
 
 ## aws.management
 
@@ -100,83 +137,33 @@ Node classes list of aws provider.
 - **diagrams.aws.management.TrustedAdvisor**
 - **diagrams.aws.management.WellArchitectedTool**
 
-## aws.storage
-
-- **diagrams.aws.storage.Backup**
-- **diagrams.aws.storage.CloudendureDisasterRecovery**, **CDR** (alias)
-- **diagrams.aws.storage.EFSInfrequentaccessPrimaryBg**
-- **diagrams.aws.storage.EFSStandardPrimaryBg**
-- **diagrams.aws.storage.ElasticBlockStoreEBS**, **EBS** (alias)
-- **diagrams.aws.storage.ElasticFileSystemEFS**, **EFS** (alias)
-- **diagrams.aws.storage.FsxForLustre**
-- **diagrams.aws.storage.FsxForWindowsFileServer**
-- **diagrams.aws.storage.Fsx**, **FSx** (alias)
-- **diagrams.aws.storage.S3Glacier**
-- **diagrams.aws.storage.SimpleStorageServiceS3**, **S3** (alias)
-- **diagrams.aws.storage.SnowballEdge**
-- **diagrams.aws.storage.Snowball**
-- **diagrams.aws.storage.Snowmobile**
-- **diagrams.aws.storage.StorageGateway**
-- **diagrams.aws.storage.Storage**
-
-## aws.iot
-
-- **diagrams.aws.iot.Freertos**, **FreeRTOS** (alias)
-- **diagrams.aws.iot.InternetOfThings**
-- **diagrams.aws.iot.Iot1Click**
-- **diagrams.aws.iot.IotAnalytics**
-- **diagrams.aws.iot.IotButton**
-- **diagrams.aws.iot.IotCore**
-- **diagrams.aws.iot.IotDeviceDefender**
-- **diagrams.aws.iot.IotDeviceManagement**
-- **diagrams.aws.iot.IotEvents**
-- **diagrams.aws.iot.IotGreengrass**
-- **diagrams.aws.iot.IotSitewise**
-- **diagrams.aws.iot.IotThingsGraph**
-
-## aws.engagement
-
-- **diagrams.aws.engagement.Connect**
-- **diagrams.aws.engagement.Pinpoint**
-- **diagrams.aws.engagement.SimpleEmailServiceSes**, **SES** (alias)
-
-## aws.compute
+## aws.media
 
-- **diagrams.aws.compute.ApplicationAutoScaling**, **AutoScaling** (alias)
-- **diagrams.aws.compute.Batch**
-- **diagrams.aws.compute.Compute**
-- **diagrams.aws.compute.EC2ContainerRegistry**, **ECR** (alias)
-- **diagrams.aws.compute.EC2**
-- **diagrams.aws.compute.ElasticBeanstalk**, **EB** (alias)
-- **diagrams.aws.compute.ElasticContainerService**, **ECS** (alias)
-- **diagrams.aws.compute.ElasticKubernetesService**, **EKS** (alias)
-- **diagrams.aws.compute.Fargate**
-- **diagrams.aws.compute.Lambda**
-- **diagrams.aws.compute.Lightsail**
-- **diagrams.aws.compute.Outposts**
-- **diagrams.aws.compute.ServerlessApplicationRepository**, **SAR** (alias)
-- **diagrams.aws.compute.ThinkboxDeadline**
-- **diagrams.aws.compute.ThinkboxDraft**
-- **diagrams.aws.compute.ThinkboxFrost**
-- **diagrams.aws.compute.ThinkboxKrakatoa**
-- **diagrams.aws.compute.ThinkboxSequoia**
-- **diagrams.aws.compute.ThinkboxStoke**
-- **diagrams.aws.compute.ThinkboxXmesh**
-- **diagrams.aws.compute.VmwareCloudOnAWS**
+- **diagrams.aws.media.ElasticTranscoder**
+- **diagrams.aws.media.ElementalConductor**
+- **diagrams.aws.media.ElementalDelta**
+- **diagrams.aws.media.ElementalLive**
+- **diagrams.aws.media.ElementalMediaconnect**
+- **diagrams.aws.media.ElementalMediaconvert**
+- **diagrams.aws.media.ElementalMedialive**
+- **diagrams.aws.media.ElementalMediapackage**
+- **diagrams.aws.media.ElementalMediastore**
+- **diagrams.aws.media.ElementalMediatailor**
+- **diagrams.aws.media.ElementalServer**
 
-## aws.devtools
+## aws.migration
 
-- **diagrams.aws.devtools.CloudDevelopmentKit**
-- **diagrams.aws.devtools.Cloud9**
-- **diagrams.aws.devtools.Codebuild**
-- **diagrams.aws.devtools.Codecommit**
-- **diagrams.aws.devtools.Codedeploy**
-- **diagrams.aws.devtools.Codepipeline**
-- **diagrams.aws.devtools.Codestar**
-- **diagrams.aws.devtools.CommandLineInterface**, **CLI** (alias)
-- **diagrams.aws.devtools.DeveloperTools**, **DevTools** (alias)
-- **diagrams.aws.devtools.ToolsAndSdks**
-- **diagrams.aws.devtools.XRay**
+- **diagrams.aws.migration.ApplicationDiscoveryService**, **ADS** (alias)
+- **diagrams.aws.migration.CloudendureMigration**, **CEM** (alias)
+- **diagrams.aws.migration.DatabaseMigrationService**, **DMS** (alias)
+- **diagrams.aws.migration.Datasync**
+- **diagrams.aws.migration.MigrationAndTransfer**, **MAT** (alias)
+- **diagrams.aws.migration.MigrationHub**
+- **diagrams.aws.migration.ServerMigrationService**, **SMS** (alias)
+- **diagrams.aws.migration.SnowballEdge**
+- **diagrams.aws.migration.Snowball**
+- **diagrams.aws.migration.Snowmobile**
+- **diagrams.aws.migration.TransferForSftp**
 
 ## aws.ml
 
@@ -200,56 +187,69 @@ Node classes list of aws provider.
 - **diagrams.aws.ml.Transcribe**
 - **diagrams.aws.ml.Translate**
 
-## aws.migration
+## aws.network
 
-- **diagrams.aws.migration.ApplicationDiscoveryService**, **ADS** (alias)
-- **diagrams.aws.migration.CloudendureMigration**, **CEM** (alias)
-- **diagrams.aws.migration.DatabaseMigrationService**, **DMS** (alias)
-- **diagrams.aws.migration.Datasync**
-- **diagrams.aws.migration.MigrationAndTransfer**, **MAT** (alias)
-- **diagrams.aws.migration.MigrationHub**
-- **diagrams.aws.migration.ServerMigrationService**, **SMS** (alias)
-- **diagrams.aws.migration.SnowballEdge**
-- **diagrams.aws.migration.Snowball**
-- **diagrams.aws.migration.Snowmobile**
-- **diagrams.aws.migration.TransferForSftp**
+- **diagrams.aws.network.APIGateway**
+- **diagrams.aws.network.AppMesh**
+- **diagrams.aws.network.ClientVpn**
+- **diagrams.aws.network.CloudMap**
+- **diagrams.aws.network.CloudFront**, **CF** (alias)
+- **diagrams.aws.network.DirectConnect**
+- **diagrams.aws.network.ElasticLoadBalancing**, **ELB** (alias)
+- **diagrams.aws.network.Endpoint**
+- **diagrams.aws.network.GlobalAccelerator**, **GAX** (alias)
+- **diagrams.aws.network.InternetGateway**
+- **diagrams.aws.network.Nacl**
+- **diagrams.aws.network.NATGateway**
+- **diagrams.aws.network.NetworkingAndContentDelivery**
+- **diagrams.aws.network.PrivateSubnet**
+- **diagrams.aws.network.Privatelink**
+- **diagrams.aws.network.PublicSubnet**
+- **diagrams.aws.network.Route53**
+- **diagrams.aws.network.RouteTable**
+- **diagrams.aws.network.SiteToSiteVpn**
+- **diagrams.aws.network.TransitGateway**
+- **diagrams.aws.network.VPCPeering**
+- **diagrams.aws.network.VPCRouter**
+- **diagrams.aws.network.VPC**
 
-## aws.analytics
+## aws.security
 
-- **diagrams.aws.analytics.Analytics**
-- **diagrams.aws.analytics.Athena**
-- **diagrams.aws.analytics.CloudsearchSearchDocuments**
-- **diagrams.aws.analytics.Cloudsearch**
-- **diagrams.aws.analytics.DataPipeline**
-- **diagrams.aws.analytics.ElasticsearchService**, **ES** (alias)
-- **diagrams.aws.analytics.EMRCluster**
-- **diagrams.aws.analytics.EMRHdfsCluster**
-- **diagrams.aws.analytics.EMR**
-- **diagrams.aws.analytics.GlueCrawlers**
-- **diagrams.aws.analytics.GlueDataCatalog**
-- **diagrams.aws.analytics.Glue**
-- **diagrams.aws.analytics.KinesisDataAnalytics**
-- **diagrams.aws.analytics.KinesisDataFirehose**
-- **diagrams.aws.analytics.KinesisDataStreams**
-- **diagrams.aws.analytics.KinesisVideoStreams**
-- **diagrams.aws.analytics.Kinesis**
-- **diagrams.aws.analytics.LakeFormation**
-- **diagrams.aws.analytics.ManagedStreamingForKafka**
-- **diagrams.aws.analytics.Quicksight**
-- **diagrams.aws.analytics.RedshiftDenseComputeNode**
-- **diagrams.aws.analytics.RedshiftDenseStorageNode**
-- **diagrams.aws.analytics.Redshift**
+- **diagrams.aws.security.Artifact**
+- **diagrams.aws.security.CertificateManager**, **ACM** (alias)
+- **diagrams.aws.security.CloudDirectory**
+- **diagrams.aws.security.Cloudhsm**, **CloudHSM** (alias)
+- **diagrams.aws.security.Cognito**
+- **diagrams.aws.security.DirectoryService**, **DS** (alias)
+- **diagrams.aws.security.FirewallManager**, **FMS** (alias)
+- **diagrams.aws.security.Guardduty**
+- **diagrams.aws.security.IdentityAndAccessManagementIam**, **IAM** (alias)
+- **diagrams.aws.security.Inspector**
+- **diagrams.aws.security.KeyManagementService**, **KMS** (alias)
+- **diagrams.aws.security.Macie**
+- **diagrams.aws.security.ResourceAccessManager**, **RAM** (alias)
+- **diagrams.aws.security.SecretsManager**
+- **diagrams.aws.security.SecurityHub**
+- **diagrams.aws.security.SecurityIdentityAndCompliance**
+- **diagrams.aws.security.Shield**
+- **diagrams.aws.security.SingleSignOn**
+- **diagrams.aws.security.WAF**
 
-## aws.media
+## aws.storage
 
-- **diagrams.aws.media.ElasticTranscoder**
-- **diagrams.aws.media.ElementalConductor**
-- **diagrams.aws.media.ElementalDelta**
-- **diagrams.aws.media.ElementalLive**
-- **diagrams.aws.media.ElementalMediaconnect**
-- **diagrams.aws.media.ElementalMediaconvert**
-- **diagrams.aws.media.ElementalMedialive**
-- **diagrams.aws.media.ElementalMediapackage**
-- **diagrams.aws.media.ElementalMediastore**
-- **diagrams.aws.media.ElementalMediatailor**
-- **diagrams.aws.media.ElementalServer**
+- **diagrams.aws.storage.Backup**
+- **diagrams.aws.storage.CloudendureDisasterRecovery**, **CDR** (alias)
+- **diagrams.aws.storage.EFSInfrequentaccessPrimaryBg**
+- **diagrams.aws.storage.EFSStandardPrimaryBg**
+- **diagrams.aws.storage.ElasticBlockStoreEBS**, **EBS** (alias)
+- **diagrams.aws.storage.ElasticFileSystemEFS**, **EFS** (alias)
+- **diagrams.aws.storage.FsxForLustre**
+- **diagrams.aws.storage.FsxForWindowsFileServer**
+- **diagrams.aws.storage.Fsx**, **FSx** (alias)
+- **diagrams.aws.storage.S3Glacier**
+- **diagrams.aws.storage.SimpleStorageServiceS3**, **S3** (alias)
+- **diagrams.aws.storage.SnowballEdge**
+- **diagrams.aws.storage.Snowball**
+- **diagrams.aws.storage.Snowmobile**
+- **diagrams.aws.storage.StorageGateway**
+- **diagrams.aws.storage.Storage**
diff --git a/docs/nodes/azure.md b/docs/nodes/azure.md
index 20a094385..7e8943751 100644
--- a/docs/nodes/azure.md
+++ b/docs/nodes/azure.md
@@ -5,6 +5,43 @@ title: Azure
 
 Node classes list of azure provider.
 
+## azure.analytics
+
+- **diagrams.azure.analytics.AnalysisServices**
+- **diagrams.azure.analytics.DataExplorerClusters**
+- **diagrams.azure.analytics.DataFactories**
+- **diagrams.azure.analytics.DataLakeAnalytics**
+- **diagrams.azure.analytics.DataLakeStoreGen1**
+- **diagrams.azure.analytics.Databricks**
+- **diagrams.azure.analytics.EventHubClusters**
+- **diagrams.azure.analytics.EventHubs**
+- **diagrams.azure.analytics.Hdinsightclusters**
+- **diagrams.azure.analytics.LogAnalyticsWorkspaces**
+- **diagrams.azure.analytics.StreamAnalyticsJobs**
+
+## azure.compute
+
+- **diagrams.azure.compute.AvailabilitySets**
+- **diagrams.azure.compute.BatchAccounts**
+- **diagrams.azure.compute.CitrixVirtualDesktopsEssentials**
+- **diagrams.azure.compute.CloudServicesClassic**
+- **diagrams.azure.compute.CloudServices**
+- **diagrams.azure.compute.CloudsimpleVirtualMachines**
+- **diagrams.azure.compute.ContainerInstances**
+- **diagrams.azure.compute.ContainerRegistries**, **ACR** (alias)
+- **diagrams.azure.compute.DiskSnapshots**
+- **diagrams.azure.compute.Disks**
+- **diagrams.azure.compute.FunctionApps**
+- **diagrams.azure.compute.KubernetesServices**, **AKS** (alias)
+- **diagrams.azure.compute.MeshApplications**
+- **diagrams.azure.compute.SAPHANAOnAzure**
+- **diagrams.azure.compute.ServiceFabricClusters**
+- **diagrams.azure.compute.VMClassic**
+- **diagrams.azure.compute.VMImages**
+- **diagrams.azure.compute.VMLinux**
+- **diagrams.azure.compute.VMWindows**
+- **diagrams.azure.compute.VM**
+
 ## azure.database
 
 - **diagrams.azure.database.BlobStorage**
@@ -52,24 +89,41 @@ Node classes list of azure provider.
 - **diagrams.azure.identity.InformationProtection**
 - **diagrams.azure.identity.ManagedIdentities**
 
-## azure.security
+## azure.iot
 
-- **diagrams.azure.security.KeyVaults**
-- **diagrams.azure.security.SecurityCenter**
-- **diagrams.azure.security.Sentinel**
+- **diagrams.azure.iot.DeviceProvisioningServices**
+- **diagrams.azure.iot.DigitalTwins**
+- **diagrams.azure.iot.IotCentralApplications**
+- **diagrams.azure.iot.IotHubSecurity**
+- **diagrams.azure.iot.IotHub**
+- **diagrams.azure.iot.Maps**
+- **diagrams.azure.iot.Sphere**
+- **diagrams.azure.iot.TimeSeriesInsightsEnvironments**
+- **diagrams.azure.iot.TimeSeriesInsightsEventsSources**
+- **diagrams.azure.iot.Windows10IotCoreServices**
 
-## azure.web
+## azure.migration
 
-- **diagrams.azure.web.APIConnections**
-- **diagrams.azure.web.AppServiceCertificates**
-- **diagrams.azure.web.AppServiceDomains**
-- **diagrams.azure.web.AppServiceEnvironments**
-- **diagrams.azure.web.AppServicePlans**
-- **diagrams.azure.web.AppServices**
-- **diagrams.azure.web.MediaServices**
-- **diagrams.azure.web.NotificationHubNamespaces**
-- **diagrams.azure.web.Search**
-- **diagrams.azure.web.Signalr**
+- **diagrams.azure.migration.DatabaseMigrationServices**
+- **diagrams.azure.migration.MigrationProjects**
+- **diagrams.azure.migration.RecoveryServicesVaults**
+
+## azure.ml
+
+- **diagrams.azure.ml.BatchAI**
+- **diagrams.azure.ml.BotServices**
+- **diagrams.azure.ml.CognitiveServices**
+- **diagrams.azure.ml.GenomicsAccounts**
+- **diagrams.azure.ml.MachineLearningServiceWorkspaces**
+- **diagrams.azure.ml.MachineLearningStudioWebServicePlans**
+- **diagrams.azure.ml.MachineLearningStudioWebServices**
+- **diagrams.azure.ml.MachineLearningStudioWorkspaces**
+
+## azure.mobile
+
+- **diagrams.azure.mobile.AppServiceMobile**
+- **diagrams.azure.mobile.MobileEngagement**
+- **diagrams.azure.mobile.NotificationHubs**
 
 ## azure.network
 
@@ -100,6 +154,12 @@ Node classes list of azure provider.
 - **diagrams.azure.network.VirtualNetworks**
 - **diagrams.azure.network.VirtualWans**
 
+## azure.security
+
+- **diagrams.azure.security.KeyVaults**
+- **diagrams.azure.security.SecurityCenter**
+- **diagrams.azure.security.Sentinel**
+
 ## azure.storage
 
 - **diagrams.azure.storage.ArchiveStorage**
@@ -119,78 +179,18 @@ Node classes list of azure provider.
 - **diagrams.azure.storage.StorsimpleDeviceManagers**
 - **diagrams.azure.storage.TableStorage**
 
-## azure.iot
-
-- **diagrams.azure.iot.DeviceProvisioningServices**
-- **diagrams.azure.iot.DigitalTwins**
-- **diagrams.azure.iot.IotCentralApplications**
-- **diagrams.azure.iot.IotHubSecurity**
-- **diagrams.azure.iot.IotHub**
-- **diagrams.azure.iot.Maps**
-- **diagrams.azure.iot.Sphere**
-- **diagrams.azure.iot.TimeSeriesInsightsEnvironments**
-- **diagrams.azure.iot.TimeSeriesInsightsEventsSources**
-- **diagrams.azure.iot.Windows10IotCoreServices**
-
-## azure.compute
-
-- **diagrams.azure.compute.AvailabilitySets**
-- **diagrams.azure.compute.BatchAccounts**
-- **diagrams.azure.compute.CitrixVirtualDesktopsEssentials**
-- **diagrams.azure.compute.CloudServicesClassic**
-- **diagrams.azure.compute.CloudServices**
-- **diagrams.azure.compute.CloudsimpleVirtualMachines**
-- **diagrams.azure.compute.ContainerInstances**
-- **diagrams.azure.compute.ContainerRegistries**, **ACR** (alias)
-- **diagrams.azure.compute.DiskSnapshots**
-- **diagrams.azure.compute.Disks**
-- **diagrams.azure.compute.FunctionApps**
-- **diagrams.azure.compute.KubernetesServices**, **AKS** (alias)
-- **diagrams.azure.compute.MeshApplications**
-- **diagrams.azure.compute.SAPHANAOnAzure**
-- **diagrams.azure.compute.ServiceFabricClusters**
-- **diagrams.azure.compute.VMClassic**
-- **diagrams.azure.compute.VMImages**
-- **diagrams.azure.compute.VMLinux**
-- **diagrams.azure.compute.VMWindows**
-- **diagrams.azure.compute.VM**
-
-## azure.ml
-
-- **diagrams.azure.ml.BatchAI**
-- **diagrams.azure.ml.BotServices**
-- **diagrams.azure.ml.CognitiveServices**
-- **diagrams.azure.ml.GenomicsAccounts**
-- **diagrams.azure.ml.MachineLearningServiceWorkspaces**
-- **diagrams.azure.ml.MachineLearningStudioWebServicePlans**
-- **diagrams.azure.ml.MachineLearningStudioWebServices**
-- **diagrams.azure.ml.MachineLearningStudioWorkspaces**
-
-## azure.mobile
-
-- **diagrams.azure.mobile.AppServiceMobile**
-- **diagrams.azure.mobile.MobileEngagement**
-- **diagrams.azure.mobile.NotificationHubs**
-
-## azure.migration
-
-- **diagrams.azure.migration.DatabaseMigrationServices**
-- **diagrams.azure.migration.MigrationProjects**
-- **diagrams.azure.migration.RecoveryServicesVaults**
-
-## azure.analytics
+## azure.web
 
-- **diagrams.azure.analytics.AnalysisServices**
-- **diagrams.azure.analytics.DataExplorerClusters**
-- **diagrams.azure.analytics.DataFactories**
-- **diagrams.azure.analytics.DataLakeAnalytics**
-- **diagrams.azure.analytics.DataLakeStoreGen1**
-- **diagrams.azure.analytics.Databricks**
-- **diagrams.azure.analytics.EventHubClusters**
-- **diagrams.azure.analytics.EventHubs**
-- **diagrams.azure.analytics.Hdinsightclusters**
-- **diagrams.azure.analytics.LogAnalyticsWorkspaces**
-- **diagrams.azure.analytics.StreamAnalyticsJobs**
+- **diagrams.azure.web.APIConnections**
+- **diagrams.azure.web.AppServiceCertificates**
+- **diagrams.azure.web.AppServiceDomains**
+- **diagrams.azure.web.AppServiceEnvironments**
+- **diagrams.azure.web.AppServicePlans**
+- **diagrams.azure.web.AppServices**
+- **diagrams.azure.web.MediaServices**
+- **diagrams.azure.web.NotificationHubNamespaces**
+- **diagrams.azure.web.Search**
+- **diagrams.azure.web.Signalr**
 
 ## azure.integration
 
diff --git a/docs/nodes/gcp.md b/docs/nodes/gcp.md
index 20c564535..91032ce32 100644
--- a/docs/nodes/gcp.md
+++ b/docs/nodes/gcp.md
@@ -5,53 +5,18 @@ title: GCP
 
 Node classes list of gcp provider.
 
-## gcp.database
-
-- **diagrams.gcp.database.Bigtable**, **BigTable** (alias)
-- **diagrams.gcp.database.Datastore**
-- **diagrams.gcp.database.Firestore**
-- **diagrams.gcp.database.Memorystore**
-- **diagrams.gcp.database.Spanner**
-- **diagrams.gcp.database.SQL**
-
-## gcp.security
-
-- **diagrams.gcp.security.Iam**
-- **diagrams.gcp.security.IAP**
-- **diagrams.gcp.security.KeyManagementService**, **KMS** (alias)
-- **diagrams.gcp.security.ResourceManager**
-- **diagrams.gcp.security.SecurityCommandCenter**, **SCC** (alias)
-- **diagrams.gcp.security.SecurityScanner**
-
-## gcp.network
-
-- **diagrams.gcp.network.Armor**
-- **diagrams.gcp.network.CDN**
-- **diagrams.gcp.network.DedicatedInterconnect**
-- **diagrams.gcp.network.DNS**
-- **diagrams.gcp.network.ExternalIpAddresses**
-- **diagrams.gcp.network.FirewallRules**
-- **diagrams.gcp.network.LoadBalancing**
-- **diagrams.gcp.network.NAT**
-- **diagrams.gcp.network.Network**
-- **diagrams.gcp.network.PartnerInterconnect**
-- **diagrams.gcp.network.PremiumNetworkTier**
-- **diagrams.gcp.network.Router**
-- **diagrams.gcp.network.Routes**
-- **diagrams.gcp.network.StandardNetworkTier**
-- **diagrams.gcp.network.TrafficDirector**
-- **diagrams.gcp.network.VirtualPrivateCloud**, **VPC** (alias)
-- **diagrams.gcp.network.VPN**
-
-## gcp.storage
-
-- **diagrams.gcp.storage.Filestore**
-- **diagrams.gcp.storage.PersistentDisk**
-- **diagrams.gcp.storage.Storage**, **GCS** (alias)
-
-## gcp.iot
+## gcp.analytics
 
-- **diagrams.gcp.iot.IotCore**
+- **diagrams.gcp.analytics.Bigquery**, **BigQuery** (alias)
+- **diagrams.gcp.analytics.Composer**
+- **diagrams.gcp.analytics.DataCatalog**
+- **diagrams.gcp.analytics.DataFusion**
+- **diagrams.gcp.analytics.Dataflow**
+- **diagrams.gcp.analytics.Datalab**
+- **diagrams.gcp.analytics.Dataprep**
+- **diagrams.gcp.analytics.Dataproc**
+- **diagrams.gcp.analytics.Genomics**
+- **diagrams.gcp.analytics.Pubsub**, **PubSub** (alias)
 
 ## gcp.compute
 
@@ -64,6 +29,15 @@ Node classes list of gcp provider.
 - **diagrams.gcp.compute.KubernetesEngine**, **GKE** (alias)
 - **diagrams.gcp.compute.Run**
 
+## gcp.database
+
+- **diagrams.gcp.database.Bigtable**, **BigTable** (alias)
+- **diagrams.gcp.database.Datastore**
+- **diagrams.gcp.database.Firestore**
+- **diagrams.gcp.database.Memorystore**
+- **diagrams.gcp.database.Spanner**
+- **diagrams.gcp.database.SQL**
+
 ## gcp.devtools
 
 - **diagrams.gcp.devtools.Build**
@@ -82,6 +56,14 @@ Node classes list of gcp provider.
 - **diagrams.gcp.devtools.ToolsForPowershell**
 - **diagrams.gcp.devtools.ToolsForVisualStudio**
 
+## gcp.iot
+
+- **diagrams.gcp.iot.IotCore**
+
+## gcp.migration
+
+- **diagrams.gcp.migration.TransferAppliance**
+
 ## gcp.ml
 
 - **diagrams.gcp.ml.AdvancedSolutionsLab**
@@ -106,19 +88,37 @@ Node classes list of gcp provider.
 - **diagrams.gcp.ml.VideoIntelligenceAPI**
 - **diagrams.gcp.ml.VisionAPI**
 
-## gcp.migration
+## gcp.network
 
-- **diagrams.gcp.migration.TransferAppliance**
+- **diagrams.gcp.network.Armor**
+- **diagrams.gcp.network.CDN**
+- **diagrams.gcp.network.DedicatedInterconnect**
+- **diagrams.gcp.network.DNS**
+- **diagrams.gcp.network.ExternalIpAddresses**
+- **diagrams.gcp.network.FirewallRules**
+- **diagrams.gcp.network.LoadBalancing**
+- **diagrams.gcp.network.NAT**
+- **diagrams.gcp.network.Network**
+- **diagrams.gcp.network.PartnerInterconnect**
+- **diagrams.gcp.network.PremiumNetworkTier**
+- **diagrams.gcp.network.Router**
+- **diagrams.gcp.network.Routes**
+- **diagrams.gcp.network.StandardNetworkTier**
+- **diagrams.gcp.network.TrafficDirector**
+- **diagrams.gcp.network.VirtualPrivateCloud**, **VPC** (alias)
+- **diagrams.gcp.network.VPN**
 
-## gcp.analytics
+## gcp.security
 
-- **diagrams.gcp.analytics.Bigquery**, **BigQuery** (alias)
-- **diagrams.gcp.analytics.Composer**
-- **diagrams.gcp.analytics.DataCatalog**
-- **diagrams.gcp.analytics.DataFusion**
-- **diagrams.gcp.analytics.Dataflow**
-- **diagrams.gcp.analytics.Datalab**
-- **diagrams.gcp.analytics.Dataprep**
-- **diagrams.gcp.analytics.Dataproc**
-- **diagrams.gcp.analytics.Genomics**
-- **diagrams.gcp.analytics.Pubsub**, **PubSub** (alias)
+- **diagrams.gcp.security.Iam**
+- **diagrams.gcp.security.IAP**
+- **diagrams.gcp.security.KeyManagementService**, **KMS** (alias)
+- **diagrams.gcp.security.ResourceManager**
+- **diagrams.gcp.security.SecurityCommandCenter**, **SCC** (alias)
+- **diagrams.gcp.security.SecurityScanner**
+
+## gcp.storage
+
+- **diagrams.gcp.storage.Filestore**
+- **diagrams.gcp.storage.PersistentDisk**
+- **diagrams.gcp.storage.Storage**, **GCS** (alias)
diff --git a/docs/nodes/k8s.md b/docs/nodes/k8s.md
index b0050cbc0..d52584d0a 100644
--- a/docs/nodes/k8s.md
+++ b/docs/nodes/k8s.md
@@ -5,31 +5,41 @@ title: K8S
 
 Node classes list of k8s provider.
 
-## k8s.rbac
+## k8s.clusterconfig
 
-- **diagrams.k8s.rbac.CRole**, **ClusterRole** (alias)
-- **diagrams.k8s.rbac.CRB**, **ClusterRoleBinding** (alias)
-- **diagrams.k8s.rbac.Group**
-- **diagrams.k8s.rbac.RB**, **RoleBinding** (alias)
-- **diagrams.k8s.rbac.Role**
-- **diagrams.k8s.rbac.SA**, **ServiceAccount** (alias)
-- **diagrams.k8s.rbac.User**
+- **diagrams.k8s.clusterconfig.HPA**, **HorizontalPodAutoscaler** (alias)
+- **diagrams.k8s.clusterconfig.Limits**, **LimitRange** (alias)
+- **diagrams.k8s.clusterconfig.Quota**
 
-## k8s.infra
+## k8s.compute
 
-- **diagrams.k8s.infra.ETCD**
-- **diagrams.k8s.infra.Master**
-- **diagrams.k8s.infra.Node**
+- **diagrams.k8s.compute.Cronjob**
+- **diagrams.k8s.compute.Deploy**, **Deployment** (alias)
+- **diagrams.k8s.compute.DS**, **DaemonSet** (alias)
+- **diagrams.k8s.compute.Job**
+- **diagrams.k8s.compute.Pod**
+- **diagrams.k8s.compute.RS**, **ReplicaSet** (alias)
+- **diagrams.k8s.compute.STS**, **StatefulSet** (alias)
 
-## k8s.podconfig
+## k8s.controlplane
 
-- **diagrams.k8s.podconfig.CM**, **ConfigMap** (alias)
-- **diagrams.k8s.podconfig.Secret**
+- **diagrams.k8s.controlplane.API**, **APIServer** (alias)
+- **diagrams.k8s.controlplane.CCM**
+- **diagrams.k8s.controlplane.CM**, **ControllerManager** (alias)
+- **diagrams.k8s.controlplane.KProxy**, **KubeProxy** (alias)
+- **diagrams.k8s.controlplane.Kubelet**
+- **diagrams.k8s.controlplane.Sched**, **Scheduler** (alias)
 
 ## k8s.group
 
 - **diagrams.k8s.group.NS**, **Namespace** (alias)
 
+## k8s.infra
+
+- **diagrams.k8s.infra.ETCD**
+- **diagrams.k8s.infra.Master**
+- **diagrams.k8s.infra.Node**
+
 ## k8s.network
 
 - **diagrams.k8s.network.Ep**, **Endpoint** (alias)
@@ -42,34 +52,24 @@ Node classes list of k8s provider.
 - **diagrams.k8s.others.CRD**
 - **diagrams.k8s.others.PSP**
 
+## k8s.podconfig
+
+- **diagrams.k8s.podconfig.CM**, **ConfigMap** (alias)
+- **diagrams.k8s.podconfig.Secret**
+
+## k8s.rbac
+
+- **diagrams.k8s.rbac.CRole**, **ClusterRole** (alias)
+- **diagrams.k8s.rbac.CRB**, **ClusterRoleBinding** (alias)
+- **diagrams.k8s.rbac.Group**
+- **diagrams.k8s.rbac.RB**, **RoleBinding** (alias)
+- **diagrams.k8s.rbac.Role**
+- **diagrams.k8s.rbac.SA**, **ServiceAccount** (alias)
+- **diagrams.k8s.rbac.User**
+
 ## k8s.storage
 
 - **diagrams.k8s.storage.PV**, **PersistnetVolume** (alias)
 - **diagrams.k8s.storage.PVC**, **PersistentVolumeClaim** (alias)
 - **diagrams.k8s.storage.SC**, **StorageClass** (alias)
 - **diagrams.k8s.storage.Vol**, **Volume** (alias)
-
-## k8s.clusterconfig
-
-- **diagrams.k8s.clusterconfig.HPA**, **HorizontalPodAutoscaler** (alias)
-- **diagrams.k8s.clusterconfig.Limits**, **LimitRange** (alias)
-- **diagrams.k8s.clusterconfig.Quota**
-
-## k8s.controlplane
-
-- **diagrams.k8s.controlplane.API**, **APIServer** (alias)
-- **diagrams.k8s.controlplane.CCM**
-- **diagrams.k8s.controlplane.CM**, **ControllerManager** (alias)
-- **diagrams.k8s.controlplane.KProxy**, **KubeProxy** (alias)
-- **diagrams.k8s.controlplane.Kubelet**
-- **diagrams.k8s.controlplane.Sched**, **Scheduler** (alias)
-
-## k8s.compute
-
-- **diagrams.k8s.compute.Cronjob**
-- **diagrams.k8s.compute.Deploy**, **Deployment** (alias)
-- **diagrams.k8s.compute.DS**, **DaemonSet** (alias)
-- **diagrams.k8s.compute.Job**
-- **diagrams.k8s.compute.Pod**
-- **diagrams.k8s.compute.RS**, **ReplicaSet** (alias)
-- **diagrams.k8s.compute.STS**, **StatefulSet** (alias)
diff --git a/docs/nodes/oci.md b/docs/nodes/oci.md
index 8f30f99f1..568fe9abe 100644
--- a/docs/nodes/oci.md
+++ b/docs/nodes/oci.md
@@ -5,17 +5,14 @@ title: OCI
 
 Node classes list of oci provider.
 
-## oci.database
-
-- **diagrams.oci.database.DatabaseserviceGrey**, **DBServiceGrey** (alias)
-- **diagrams.oci.database.Databaseservice**, **DBService** (alias)
-
-## oci.devops
+## oci.compute
 
-- **diagrams.oci.devops.ApiserviceGrey**
-- **diagrams.oci.devops.Apiservice**
-- **diagrams.oci.devops.ResourcemgmtGrey**
-- **diagrams.oci.devops.Resourcemgmt**
+- **diagrams.oci.compute.BmGrey**, **BareMetalGrey** (alias)
+- **diagrams.oci.compute.Bm**, **BareMetal** (alias)
+- **diagrams.oci.compute.ContainerGrey**
+- **diagrams.oci.compute.Container**
+- **diagrams.oci.compute.VmGrey**, **VirtualMachineGrey** (alias)
+- **diagrams.oci.compute.Vm**, **VirtualMachine** (alias)
 
 ## oci.connectivity
 
@@ -30,28 +27,51 @@ Node classes list of oci provider.
 - **diagrams.oci.connectivity.VpnGrey**
 - **diagrams.oci.connectivity.Vpn**
 
-## oci.security
+## oci.database
 
-- **diagrams.oci.security.AuditGrey**
-- **diagrams.oci.security.Audit**
-- **diagrams.oci.security.CompartmentsGrey**
-- **diagrams.oci.security.Compartments**
-- **diagrams.oci.security.DdosGrey**
-- **diagrams.oci.security.Ddos**
-- **diagrams.oci.security.EncryptionGrey**
-- **diagrams.oci.security.Encryption**
-- **diagrams.oci.security.GroupsGrey**
-- **diagrams.oci.security.Groups**
-- **diagrams.oci.security.IdAccessGrey**
-- **diagrams.oci.security.IdAccess**
-- **diagrams.oci.security.KeymgmtGrey**
-- **diagrams.oci.security.Keymgmt**
-- **diagrams.oci.security.OcidGrey**
-- **diagrams.oci.security.Ocid**
-- **diagrams.oci.security.PoliciesGrey**
-- **diagrams.oci.security.Policies**
-- **diagrams.oci.security.TaggingGrey**
-- **diagrams.oci.security.Tagging**
+- **diagrams.oci.database.DatabaseserviceGrey**, **DBServiceGrey** (alias)
+- **diagrams.oci.database.Databaseservice**, **DBService** (alias)
+
+## oci.devops
+
+- **diagrams.oci.devops.ApiserviceGrey**
+- **diagrams.oci.devops.Apiservice**
+- **diagrams.oci.devops.ResourcemgmtGrey**
+- **diagrams.oci.devops.Resourcemgmt**
+
+## oci.edge
+
+- **diagrams.oci.edge.CdnGrey**
+- **diagrams.oci.edge.Cdn**
+- **diagrams.oci.edge.DnsGrey**
+- **diagrams.oci.edge.Dns**
+- **diagrams.oci.edge.EmaildeliveryGrey**
+- **diagrams.oci.edge.Emaildelivery**
+- **diagrams.oci.edge.WafGrey**
+- **diagrams.oci.edge.Waf**
+
+## oci.monitoring
+
+- **diagrams.oci.monitoring.AlarmGrey**
+- **diagrams.oci.monitoring.Alarm**
+- **diagrams.oci.monitoring.EventGrey**
+- **diagrams.oci.monitoring.Event**
+- **diagrams.oci.monitoring.HealthcheckGrey**
+- **diagrams.oci.monitoring.Healthcheck**
+- **diagrams.oci.monitoring.LoggingGrey**
+- **diagrams.oci.monitoring.Logging**
+- **diagrams.oci.monitoring.NotificationsGrey**
+- **diagrams.oci.monitoring.Notifications**
+- **diagrams.oci.monitoring.QueuingGrey**
+- **diagrams.oci.monitoring.Queuing**
+- **diagrams.oci.monitoring.SearchGrey**
+- **diagrams.oci.monitoring.Search**
+- **diagrams.oci.monitoring.StreamingGrey**
+- **diagrams.oci.monitoring.Streaming**
+- **diagrams.oci.monitoring.TelemetryGrey**
+- **diagrams.oci.monitoring.Telemetry**
+- **diagrams.oci.monitoring.WorkflowGrey**
+- **diagrams.oci.monitoring.Workflow**
 
 ## oci.network
 
@@ -72,16 +92,28 @@ Node classes list of oci provider.
 - **diagrams.oci.network.VcloudnetworkGrey**
 - **diagrams.oci.network.Vcloudnetwork**
 
-## oci.edge
+## oci.security
 
-- **diagrams.oci.edge.CdnGrey**
-- **diagrams.oci.edge.Cdn**
-- **diagrams.oci.edge.DnsGrey**
-- **diagrams.oci.edge.Dns**
-- **diagrams.oci.edge.EmaildeliveryGrey**
-- **diagrams.oci.edge.Emaildelivery**
-- **diagrams.oci.edge.WafGrey**
-- **diagrams.oci.edge.Waf**
+- **diagrams.oci.security.AuditGrey**
+- **diagrams.oci.security.Audit**
+- **diagrams.oci.security.CompartmentsGrey**
+- **diagrams.oci.security.Compartments**
+- **diagrams.oci.security.DdosGrey**
+- **diagrams.oci.security.Ddos**
+- **diagrams.oci.security.EncryptionGrey**
+- **diagrams.oci.security.Encryption**
+- **diagrams.oci.security.GroupsGrey**
+- **diagrams.oci.security.Groups**
+- **diagrams.oci.security.IdAccessGrey**
+- **diagrams.oci.security.IdAccess**
+- **diagrams.oci.security.KeymgmtGrey**
+- **diagrams.oci.security.Keymgmt**
+- **diagrams.oci.security.OcidGrey**
+- **diagrams.oci.security.Ocid**
+- **diagrams.oci.security.PoliciesGrey**
+- **diagrams.oci.security.Policies**
+- **diagrams.oci.security.TaggingGrey**
+- **diagrams.oci.security.Tagging**
 
 ## oci.storage
 
@@ -99,35 +131,3 @@ Node classes list of oci provider.
 - **diagrams.oci.storage.Objectstorage**
 - **diagrams.oci.storage.StoragegatewayGrey**
 - **diagrams.oci.storage.Storagegateway**
-
-## oci.compute
-
-- **diagrams.oci.compute.BmGrey**, **BareMetalGrey** (alias)
-- **diagrams.oci.compute.Bm**, **BareMetal** (alias)
-- **diagrams.oci.compute.ContainerGrey**
-- **diagrams.oci.compute.Container**
-- **diagrams.oci.compute.VmGrey**, **VirtualMachineGrey** (alias)
-- **diagrams.oci.compute.Vm**, **VirtualMachine** (alias)
-
-## oci.monitoring
-
-- **diagrams.oci.monitoring.AlarmGrey**
-- **diagrams.oci.monitoring.Alarm**
-- **diagrams.oci.monitoring.EventGrey**
-- **diagrams.oci.monitoring.Event**
-- **diagrams.oci.monitoring.HealthcheckGrey**
-- **diagrams.oci.monitoring.Healthcheck**
-- **diagrams.oci.monitoring.LoggingGrey**
-- **diagrams.oci.monitoring.Logging**
-- **diagrams.oci.monitoring.NotificationsGrey**
-- **diagrams.oci.monitoring.Notifications**
-- **diagrams.oci.monitoring.QueuingGrey**
-- **diagrams.oci.monitoring.Queuing**
-- **diagrams.oci.monitoring.SearchGrey**
-- **diagrams.oci.monitoring.Search**
-- **diagrams.oci.monitoring.StreamingGrey**
-- **diagrams.oci.monitoring.Streaming**
-- **diagrams.oci.monitoring.TelemetryGrey**
-- **diagrams.oci.monitoring.Telemetry**
-- **diagrams.oci.monitoring.WorkflowGrey**
-- **diagrams.oci.monitoring.Workflow**
diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md
index 0a5987d3f..699164708 100644
--- a/docs/nodes/onprem.md
+++ b/docs/nodes/onprem.md
@@ -5,6 +5,45 @@ title: OnPrem
 
 Node classes list of onprem provider.
 
+## onprem.analytics
+
+- **diagrams.onprem.analytics.Beam**
+- **diagrams.onprem.analytics.Flink**
+- **diagrams.onprem.analytics.Hadoop**
+- **diagrams.onprem.analytics.Hive**
+- **diagrams.onprem.analytics.Metabase**
+- **diagrams.onprem.analytics.Norikra**
+- **diagrams.onprem.analytics.Spark**
+- **diagrams.onprem.analytics.Storm**
+- **diagrams.onprem.analytics.Tableau**
+
+## onprem.cd
+
+- **diagrams.onprem.cd.Spinnaker**
+
+## onprem.ci
+
+- **diagrams.onprem.ci.Circleci**, **CircleCI** (alias)
+- **diagrams.onprem.ci.Jenkins**
+- **diagrams.onprem.ci.Teamcity**, **TC** (alias)
+- **diagrams.onprem.ci.Travisci**, **TravisCI** (alias)
+
+## onprem.client
+
+- **diagrams.onprem.client.Client**
+- **diagrams.onprem.client.User**
+- **diagrams.onprem.client.Users**
+
+## onprem.compute
+
+- **diagrams.onprem.compute.Nomad**
+- **diagrams.onprem.compute.Server**
+
+## onprem.container
+
+- **diagrams.onprem.container.Docker**
+- **diagrams.onprem.container.Rkt**, **RKT** (alias)
+
 ## onprem.database
 
 - **diagrams.onprem.database.Cassandra**
@@ -24,26 +63,47 @@ Node classes list of onprem provider.
 - **diagrams.onprem.database.Postgresql**, **PostgreSQL** (alias)
 - **diagrams.onprem.database.Scylla**
 
-## onprem.security
+## onprem.etl
 
-- **diagrams.onprem.security.Trivy**
-- **diagrams.onprem.security.Vault**
+- **diagrams.onprem.etl.Embulk**
 
-## onprem.ci
+## onprem.gitops
 
-- **diagrams.onprem.ci.Circleci**, **CircleCI** (alias)
-- **diagrams.onprem.ci.Jenkins**
-- **diagrams.onprem.ci.Teamcity**, **TC** (alias)
-- **diagrams.onprem.ci.Travisci**, **TravisCI** (alias)
+- **diagrams.onprem.gitops.Argocd**, **ArgoCD** (alias)
 
-## onprem.etl
+## onprem.iac
 
-- **diagrams.onprem.etl.Embulk**
+- **diagrams.onprem.iac.Ansible**
+- **diagrams.onprem.iac.Awx**
+- **diagrams.onprem.iac.Terraform**
+
+## onprem.inmemory
+
+- **diagrams.onprem.inmemory.Aerospike**
+- **diagrams.onprem.inmemory.Hazelcast**
+- **diagrams.onprem.inmemory.Memcached**
+- **diagrams.onprem.inmemory.Redis**
+
+## onprem.logging
+
+- **diagrams.onprem.logging.Fluentbit**, **FluentBit** (alias)
+- **diagrams.onprem.logging.Fluentd**
+- **diagrams.onprem.logging.Logstash**, **LogStash** (alias)
+- **diagrams.onprem.logging.Loki**
 
 ## onprem.mlops
 
 - **diagrams.onprem.mlops.Polyaxon**
 
+## onprem.monitoring
+
+- **diagrams.onprem.monitoring.Datadog**
+- **diagrams.onprem.monitoring.Grafana**
+- **diagrams.onprem.monitoring.Kibana**
+- **diagrams.onprem.monitoring.Prometheus**
+- **diagrams.onprem.monitoring.Splunk**
+- **diagrams.onprem.monitoring.Thanos**
+
 ## onprem.network
 
 - **diagrams.onprem.network.Apache**
@@ -64,33 +124,23 @@ Node classes list of onprem provider.
 - **diagrams.onprem.network.Vyos**, **VyOS** (alias)
 - **diagrams.onprem.network.Zookeeper**
 
-## onprem.inmemory
+## onprem.queue
 
-- **diagrams.onprem.inmemory.Aerospike**
-- **diagrams.onprem.inmemory.Hazelcast**
-- **diagrams.onprem.inmemory.Memcached**
-- **diagrams.onprem.inmemory.Redis**
+- **diagrams.onprem.queue.Activemq**, **ActiveMQ** (alias)
+- **diagrams.onprem.queue.Celery**
+- **diagrams.onprem.queue.Kafka**
+- **diagrams.onprem.queue.Rabbitmq**, **RabbitMQ** (alias)
+- **diagrams.onprem.queue.Zeromq**, **ZeroMQ** (alias)
 
 ## onprem.search
 
 - **diagrams.onprem.search.Elasticsearch**
 - **diagrams.onprem.search.Solr**
 
-## onprem.container
-
-- **diagrams.onprem.container.Docker**
-- **diagrams.onprem.container.Rkt**, **RKT** (alias)
-
-## onprem.iac
-
-- **diagrams.onprem.iac.Ansible**
-- **diagrams.onprem.iac.Awx**
-- **diagrams.onprem.iac.Terraform**
-
-## onprem.compute
+## onprem.security
 
-- **diagrams.onprem.compute.Nomad**
-- **diagrams.onprem.compute.Server**
+- **diagrams.onprem.security.Trivy**
+- **diagrams.onprem.security.Vault**
 
 ## onprem.vcs
 
@@ -104,52 +154,3 @@ Node classes list of onprem provider.
 - **diagrams.onprem.workflow.Digdag**
 - **diagrams.onprem.workflow.Kubeflow**, **KubeFlow** (alias)
 - **diagrams.onprem.workflow.Nifi**, **NiFi** (alias)
-
-## onprem.queue
-
-- **diagrams.onprem.queue.Activemq**, **ActiveMQ** (alias)
-- **diagrams.onprem.queue.Celery**
-- **diagrams.onprem.queue.Kafka**
-- **diagrams.onprem.queue.Rabbitmq**, **RabbitMQ** (alias)
-- **diagrams.onprem.queue.Zeromq**, **ZeroMQ** (alias)
-
-## onprem.cd
-
-- **diagrams.onprem.cd.Spinnaker**
-
-## onprem.gitops
-
-- **diagrams.onprem.gitops.Argocd**, **ArgoCD** (alias)
-
-## onprem.monitoring
-
-- **diagrams.onprem.monitoring.Datadog**
-- **diagrams.onprem.monitoring.Grafana**
-- **diagrams.onprem.monitoring.Kibana**
-- **diagrams.onprem.monitoring.Prometheus**
-- **diagrams.onprem.monitoring.Splunk**
-- **diagrams.onprem.monitoring.Thanos**
-
-## onprem.client
-
-- **diagrams.onprem.client.Client**
-- **diagrams.onprem.client.User**
-- **diagrams.onprem.client.Users**
-
-## onprem.logging
-
-- **diagrams.onprem.logging.Fluentd**
-- **diagrams.onprem.logging.Logstash**, **LogStash** (alias)
-- **diagrams.onprem.logging.Loki**
-
-## onprem.analytics
-
-- **diagrams.onprem.analytics.Beam**
-- **diagrams.onprem.analytics.Flink**
-- **diagrams.onprem.analytics.Hadoop**
-- **diagrams.onprem.analytics.Hive**
-- **diagrams.onprem.analytics.Metabase**
-- **diagrams.onprem.analytics.Norikra**
-- **diagrams.onprem.analytics.Spark**
-- **diagrams.onprem.analytics.Storm**
-- **diagrams.onprem.analytics.Tableau**
diff --git a/resources/onprem/logging/fluentbit.png b/resources/onprem/logging/fluentbit.png
new file mode 100644
index 000000000..465e7fbcd
Binary files /dev/null and b/resources/onprem/logging/fluentbit.png differ