diff --git a/diagrams/onprem/analytics.py b/diagrams/onprem/analytics.py
index 7a9554eb..ff553089 100644
--- a/diagrams/onprem/analytics.py
+++ b/diagrams/onprem/analytics.py
@@ -24,6 +24,10 @@ class Hive(_Analytics):
     _icon = "hive.png"
 
 
+class Metabase(_Analytics):
+    _icon = "metabase.png"
+
+
 class Norikra(_Analytics):
     _icon = "norikra.png"
 
@@ -36,4 +40,8 @@ class Storm(_Analytics):
     _icon = "storm.png"
 
 
+class Tableau(_Analytics):
+    _icon = "tableau.png"
+
+
 # Aliases
diff --git a/docs/nodes/aws.md b/docs/nodes/aws.md
index 7a20e6a4..505c4809 100644
--- a/docs/nodes/aws.md
+++ b/docs/nodes/aws.md
@@ -5,56 +5,6 @@ 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**
@@ -70,25 +20,27 @@ Node classes list of aws provider.
 - **diagrams.aws.database.Redshift**
 - **diagrams.aws.database.Timestream**
 
-## aws.devtools
-
-- **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
+## aws.security
 
-- **diagrams.aws.engagement.Connect**
-- **diagrams.aws.engagement.Pinpoint**
-- **diagrams.aws.engagement.SimpleEmailServiceSes**, **SES** (alias)
+- **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.integration
 
@@ -101,20 +53,31 @@ Node classes list of aws provider.
 - **diagrams.aws.integration.SimpleQueueServiceSqs**, **SQS** (alias)
 - **diagrams.aws.integration.StepFunctions**, **SF** (alias)
 
-## aws.iot
+## aws.network
 
-- **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**
+- **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.management
 
@@ -137,19 +100,83 @@ Node classes list of aws provider.
 - **diagrams.aws.management.TrustedAdvisor**
 - **diagrams.aws.management.WellArchitectedTool**
 
-## aws.migration
+## aws.storage
 
-- **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.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
+
+- **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.devtools
+
+- **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.ml
 
@@ -173,69 +200,42 @@ Node classes list of aws provider.
 - **diagrams.aws.ml.Transcribe**
 - **diagrams.aws.ml.Translate**
 
-## aws.network
-
-- **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.security
+## aws.migration
 
-- **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.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.storage
+## aws.analytics
 
-- **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**
+- **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**
diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md
index 729b3cfe..d49f1557 100644
--- a/docs/nodes/onprem.md
+++ b/docs/nodes/onprem.md
@@ -147,6 +147,8 @@ Node classes list of onprem provider.
 - **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/analytics/metabase.png b/resources/onprem/analytics/metabase.png
new file mode 100644
index 00000000..37ee8cf8
Binary files /dev/null and b/resources/onprem/analytics/metabase.png differ
diff --git a/resources/onprem/analytics/tableau.png b/resources/onprem/analytics/tableau.png
new file mode 100644
index 00000000..65ab0d91
Binary files /dev/null and b/resources/onprem/analytics/tableau.png differ