diff --git a/autogen.sh b/autogen.sh
index 766881bc..3b105ada 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" "k8s" "alibabacloud" "oci" "programming")
+providers=("onprem" "aws" "azure" "gcp" "firebase" "k8s" "alibabacloud" "oci" "programming")
 
 if ! [ -x "$(command -v round)" ]; then
   echo 'round is not installed'
diff --git a/config.py b/config.py
index ce56ade5..8809a266 100644
--- a/config.py
+++ b/config.py
@@ -11,7 +11,7 @@ DIR_APP_ROOT = "diagrams"
 DIR_RESOURCE = "resources"
 DIR_TEMPLATE = "templates"
 
-PROVIDERS = ("base", "onprem", "aws", "azure", "gcp", "k8s", "alibabacloud", "oci", "programming")
+PROVIDERS = ("base", "onprem", "aws", "azure", "gcp", "firebase", "k8s", "alibabacloud", "oci", "programming")
 
 #########################
 #  Resource Processing  #
@@ -29,6 +29,7 @@ FILE_PREFIXES = {
     "aws": ("Amazon-", "AWS-"),
     "azure": ("Azure-",),
     "gcp": ("Cloud-",),
+    "firebase": ("Cloud-",),
     "k8s": (),
     "alibabacloud": (),
     "oci": ("OCI-",),
@@ -51,6 +52,7 @@ UPPER_WORDS = {
     "aws": ("aws", "api", "ebs", "ec2", "efs", "emr", "rds", "ml", "mq", "nat", "vpc", "waf", "sdk"),
     "azure": ("ad", "b2c", "ai", "api", "cdn", "ddos", "dns", "fxt", "hana", "hd", "id", "sap", "sql", "vm"),
     "gcp": ("gcp", "ai", "api", "cdn", "dns", "gke", "gpu", "iap", "ml", "nat", "os", "sdk", "sql", "tpu", "vpn"),
+    "firebase": ("ab", "fcm", "ml"),
     "k8s": (
         "api", "cm", "ccm", "crb", "crd", "ds", "etcd", "hpa", "k8s", "ns", "psp", "pv", "pvc", "rb", "rs",
         "sa", "sc", "sts", "svc",
@@ -75,8 +77,10 @@ ALIASES = {
     "onprem": {
         "ci": {
             "Circleci": "CircleCI",
+            "Gitlabci": "GitlabCI",
             "Travisci": "TravisCI",
             "Teamcity": "TC",
+            "Zuulci": "ZuulCI",
         },
         "container": {
             "Rkt": "RKT",
@@ -232,6 +236,11 @@ ALIASES = {
             "Storage": "GCS",
         },
     },
+    "firebase": {
+        "grow": {
+            "Messaging": "FCM"
+        }
+    },
     "k8s": {
         "clusterconfig": {
             "Limits": "LimitRange",
diff --git a/diagrams/azure/general.py b/diagrams/azure/general.py
new file mode 100644
index 00000000..8958e975
--- /dev/null
+++ b/diagrams/azure/general.py
@@ -0,0 +1,115 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _General(_Azure):
+    _type = "general"
+    _icon_dir = "resources/azure/general"
+
+
+class Allresources(_General):
+    _icon = "allresources.png"
+
+
+class Azurehome(_General):
+    _icon = "azurehome.png"
+
+
+class Developertools(_General):
+    _icon = "developertools.png"
+
+
+class Helpsupport(_General):
+    _icon = "helpsupport.png"
+
+
+class Information(_General):
+    _icon = "information.png"
+
+
+class Managementgroups(_General):
+    _icon = "managementgroups.png"
+
+
+class Marketplace(_General):
+    _icon = "marketplace.png"
+
+
+class Quickstartcenter(_General):
+    _icon = "quickstartcenter.png"
+
+
+class Recent(_General):
+    _icon = "recent.png"
+
+
+class Reservations(_General):
+    _icon = "reservations.png"
+
+
+class Resource(_General):
+    _icon = "resource.png"
+
+
+class Resourcegroups(_General):
+    _icon = "resourcegroups.png"
+
+
+class Servicehealth(_General):
+    _icon = "servicehealth.png"
+
+
+class Shareddashboard(_General):
+    _icon = "shareddashboard.png"
+
+
+class Subscriptions(_General):
+    _icon = "subscriptions.png"
+
+
+class Support(_General):
+    _icon = "support.png"
+
+
+class Supportrequests(_General):
+    _icon = "supportrequests.png"
+
+
+class Tag(_General):
+    _icon = "tag.png"
+
+
+class Tags(_General):
+    _icon = "tags.png"
+
+
+class Templates(_General):
+    _icon = "templates.png"
+
+
+class Twousericon(_General):
+    _icon = "twousericon.png"
+
+
+class Userhealthicon(_General):
+    _icon = "userhealthicon.png"
+
+
+class Usericon(_General):
+    _icon = "usericon.png"
+
+
+class Userprivacy(_General):
+    _icon = "userprivacy.png"
+
+
+class Userresource(_General):
+    _icon = "userresource.png"
+
+
+class Whatsnew(_General):
+    _icon = "whatsnew.png"
+
+
+# Aliases
diff --git a/diagrams/firebase/base.py b/diagrams/firebase/base.py
new file mode 100644
index 00000000..a7c9531c
--- /dev/null
+++ b/diagrams/firebase/base.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Firebase
+
+
+class _Base(_Firebase):
+    _type = "base"
+    _icon_dir = "resources/firebase/base"
+
+
+class Firebase(_Base):
+    _icon = "firebase.png"
+
+
+# Aliases
diff --git a/diagrams/firebase/develop.py b/diagrams/firebase/develop.py
new file mode 100644
index 00000000..27426e51
--- /dev/null
+++ b/diagrams/firebase/develop.py
@@ -0,0 +1,39 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Firebase
+
+
+class _Develop(_Firebase):
+    _type = "develop"
+    _icon_dir = "resources/firebase/develop"
+
+
+class Authentication(_Develop):
+    _icon = "authentication.png"
+
+
+class Firestore(_Develop):
+    _icon = "firestore.png"
+
+
+class Functions(_Develop):
+    _icon = "functions.png"
+
+
+class Hosting(_Develop):
+    _icon = "hosting.png"
+
+
+class MLKit(_Develop):
+    _icon = "ml-kit.png"
+
+
+class RealtimeDatabase(_Develop):
+    _icon = "realtime-database.png"
+
+
+class Storage(_Develop):
+    _icon = "storage.png"
+
+
+# Aliases
diff --git a/diagrams/firebase/extentions.py b/diagrams/firebase/extentions.py
new file mode 100644
index 00000000..9d5926c2
--- /dev/null
+++ b/diagrams/firebase/extentions.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Firebase
+
+
+class _Extentions(_Firebase):
+    _type = "extentions"
+    _icon_dir = "resources/firebase/extentions"
+
+
+class Extensions(_Extentions):
+    _icon = "extensions.png"
+
+
+# Aliases
diff --git a/diagrams/firebase/grow.py b/diagrams/firebase/grow.py
new file mode 100644
index 00000000..b015dd3f
--- /dev/null
+++ b/diagrams/firebase/grow.py
@@ -0,0 +1,45 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Firebase
+
+
+class _Grow(_Firebase):
+    _type = "grow"
+    _icon_dir = "resources/firebase/grow"
+
+
+class ABTesting(_Grow):
+    _icon = "ab-testing.png"
+
+
+class AppIndexing(_Grow):
+    _icon = "app-indexing.png"
+
+
+class DynamicLinks(_Grow):
+    _icon = "dynamic-links.png"
+
+
+class InAppMessaging(_Grow):
+    _icon = "in-app-messaging.png"
+
+
+class Invites(_Grow):
+    _icon = "invites.png"
+
+
+class Messaging(_Grow):
+    _icon = "messaging.png"
+
+
+class Predictions(_Grow):
+    _icon = "predictions.png"
+
+
+class RemoteConfig(_Grow):
+    _icon = "remote-config.png"
+
+
+# Aliases
+
+FCM = Messaging
diff --git a/diagrams/firebase/quality.py b/diagrams/firebase/quality.py
new file mode 100644
index 00000000..227a4c35
--- /dev/null
+++ b/diagrams/firebase/quality.py
@@ -0,0 +1,31 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Firebase
+
+
+class _Quality(_Firebase):
+    _type = "quality"
+    _icon_dir = "resources/firebase/quality"
+
+
+class AppDistribution(_Quality):
+    _icon = "app-distribution.png"
+
+
+class CrashReporting(_Quality):
+    _icon = "crash-reporting.png"
+
+
+class Crashlytics(_Quality):
+    _icon = "crashlytics.png"
+
+
+class PerformanceMonitoring(_Quality):
+    _icon = "performance-monitoring.png"
+
+
+class TestLab(_Quality):
+    _icon = "test-lab.png"
+
+
+# Aliases
diff --git a/diagrams/onprem/ci.py b/diagrams/onprem/ci.py
index f6302b05..896e5de6 100644
--- a/diagrams/onprem/ci.py
+++ b/diagrams/onprem/ci.py
@@ -12,6 +12,10 @@ class Circleci(_Ci):
     _icon = "circleci.png"
 
 
+class Gitlabci(_Ci):
+    _icon = "gitlabci.png"
+
+
 class Jenkins(_Ci):
     _icon = "jenkins.png"
 
@@ -24,8 +28,14 @@ class Travisci(_Ci):
     _icon = "travisci.png"
 
 
+class Zuulci(_Ci):
+    _icon = "zuulci.png"
+
+
 # Aliases
 
 CircleCI = Circleci
+GitlabCI = Gitlabci
 TravisCI = Travisci
 TC = Teamcity
+ZuulCI = Zuulci
diff --git a/diagrams/onprem/database.py b/diagrams/onprem/database.py
index 0d5d7ee8..9551d938 100644
--- a/diagrams/onprem/database.py
+++ b/diagrams/onprem/database.py
@@ -20,6 +20,10 @@ class Cockroachdb(_Database):
     _icon = "cockroachdb.png"
 
 
+class Couchbase(_Database):
+    _icon = "couchbase.png"
+
+
 class Couchdb(_Database):
     _icon = "couchdb.png"
 
diff --git a/diagrams/onprem/monitoring.py b/diagrams/onprem/monitoring.py
index 3013d05d..cbabfce7 100644
--- a/diagrams/onprem/monitoring.py
+++ b/diagrams/onprem/monitoring.py
@@ -24,6 +24,10 @@ class Prometheus(_Monitoring):
     _icon = "prometheus.png"
 
 
+class Sentry(_Monitoring):
+    _icon = "sentry.png"
+
+
 class Splunk(_Monitoring):
     _icon = "splunk.png"
 
diff --git a/docs/nodes/azure.md b/docs/nodes/azure.md
index 7e894375..076b18d8 100644
--- a/docs/nodes/azure.md
+++ b/docs/nodes/azure.md
@@ -73,6 +73,35 @@ Node classes list of azure provider.
 - **diagrams.azure.devops.Repos**
 - **diagrams.azure.devops.TestPlans**
 
+## azure.general
+
+- **diagrams.azure.general.Allresources**
+- **diagrams.azure.general.Azurehome**
+- **diagrams.azure.general.Developertools**
+- **diagrams.azure.general.Helpsupport**
+- **diagrams.azure.general.Information**
+- **diagrams.azure.general.Managementgroups**
+- **diagrams.azure.general.Marketplace**
+- **diagrams.azure.general.Quickstartcenter**
+- **diagrams.azure.general.Recent**
+- **diagrams.azure.general.Reservations**
+- **diagrams.azure.general.Resource**
+- **diagrams.azure.general.Resourcegroups**
+- **diagrams.azure.general.Servicehealth**
+- **diagrams.azure.general.Shareddashboard**
+- **diagrams.azure.general.Subscriptions**
+- **diagrams.azure.general.Support**
+- **diagrams.azure.general.Supportrequests**
+- **diagrams.azure.general.Tag**
+- **diagrams.azure.general.Tags**
+- **diagrams.azure.general.Templates**
+- **diagrams.azure.general.Twousericon**
+- **diagrams.azure.general.Userhealthicon**
+- **diagrams.azure.general.Usericon**
+- **diagrams.azure.general.Userprivacy**
+- **diagrams.azure.general.Userresource**
+- **diagrams.azure.general.Whatsnew**
+
 ## azure.identity
 
 - **diagrams.azure.identity.AccessReview**
@@ -89,6 +118,26 @@ Node classes list of azure provider.
 - **diagrams.azure.identity.InformationProtection**
 - **diagrams.azure.identity.ManagedIdentities**
 
+## azure.integration
+
+- **diagrams.azure.integration.APIForFhir**
+- **diagrams.azure.integration.APIManagement**
+- **diagrams.azure.integration.AppConfiguration**
+- **diagrams.azure.integration.DataCatalog**
+- **diagrams.azure.integration.EventGridDomains**
+- **diagrams.azure.integration.EventGridSubscriptions**
+- **diagrams.azure.integration.EventGridTopics**
+- **diagrams.azure.integration.IntegrationAccounts**
+- **diagrams.azure.integration.IntegrationServiceEnvironments**
+- **diagrams.azure.integration.LogicAppsCustomConnector**
+- **diagrams.azure.integration.LogicApps**
+- **diagrams.azure.integration.SendgridAccounts**
+- **diagrams.azure.integration.ServiceBusRelays**
+- **diagrams.azure.integration.ServiceBus**
+- **diagrams.azure.integration.ServiceCatalogManagedApplicationDefinitions**
+- **diagrams.azure.integration.SoftwareAsAService**
+- **diagrams.azure.integration.StorsimpleDeviceManagers**
+
 ## azure.iot
 
 - **diagrams.azure.iot.DeviceProvisioningServices**
@@ -191,23 +240,3 @@ Node classes list of azure provider.
 - **diagrams.azure.web.NotificationHubNamespaces**
 - **diagrams.azure.web.Search**
 - **diagrams.azure.web.Signalr**
-
-## azure.integration
-
-- **diagrams.azure.integration.APIForFhir**
-- **diagrams.azure.integration.APIManagement**
-- **diagrams.azure.integration.AppConfiguration**
-- **diagrams.azure.integration.DataCatalog**
-- **diagrams.azure.integration.EventGridDomains**
-- **diagrams.azure.integration.EventGridSubscriptions**
-- **diagrams.azure.integration.EventGridTopics**
-- **diagrams.azure.integration.IntegrationAccounts**
-- **diagrams.azure.integration.IntegrationServiceEnvironments**
-- **diagrams.azure.integration.LogicAppsCustomConnector**
-- **diagrams.azure.integration.LogicApps**
-- **diagrams.azure.integration.SendgridAccounts**
-- **diagrams.azure.integration.ServiceBusRelays**
-- **diagrams.azure.integration.ServiceBus**
-- **diagrams.azure.integration.ServiceCatalogManagedApplicationDefinitions**
-- **diagrams.azure.integration.SoftwareAsAService**
-- **diagrams.azure.integration.StorsimpleDeviceManagers**
diff --git a/docs/nodes/firebase.md b/docs/nodes/firebase.md
new file mode 100644
index 00000000..f49a5c9c
--- /dev/null
+++ b/docs/nodes/firebase.md
@@ -0,0 +1,43 @@
+---
+id: firebase
+title: Firebase
+---
+
+Node classes list of firebase provider.
+
+## firebase.base
+
+- **diagrams.firebase.base.Firebase**
+
+## firebase.develop
+
+- **diagrams.firebase.develop.Authentication**
+- **diagrams.firebase.develop.Firestore**
+- **diagrams.firebase.develop.Functions**
+- **diagrams.firebase.develop.Hosting**
+- **diagrams.firebase.develop.MLKit**
+- **diagrams.firebase.develop.RealtimeDatabase**
+- **diagrams.firebase.develop.Storage**
+
+## firebase.extentions
+
+- **diagrams.firebase.extentions.Extensions**
+
+## firebase.grow
+
+- **diagrams.firebase.grow.ABTesting**
+- **diagrams.firebase.grow.AppIndexing**
+- **diagrams.firebase.grow.DynamicLinks**
+- **diagrams.firebase.grow.InAppMessaging**
+- **diagrams.firebase.grow.Invites**
+- **diagrams.firebase.grow.Messaging**, **FCM** (alias)
+- **diagrams.firebase.grow.Predictions**
+- **diagrams.firebase.grow.RemoteConfig**
+
+## firebase.quality
+
+- **diagrams.firebase.quality.AppDistribution**
+- **diagrams.firebase.quality.CrashReporting**
+- **diagrams.firebase.quality.Crashlytics**
+- **diagrams.firebase.quality.PerformanceMonitoring**
+- **diagrams.firebase.quality.TestLab**
diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md
index 69916470..aedecdf3 100644
--- a/docs/nodes/onprem.md
+++ b/docs/nodes/onprem.md
@@ -24,9 +24,11 @@ Node classes list of onprem provider.
 ## onprem.ci
 
 - **diagrams.onprem.ci.Circleci**, **CircleCI** (alias)
+- **diagrams.onprem.ci.Gitlabci**, **GitlabCI** (alias)
 - **diagrams.onprem.ci.Jenkins**
 - **diagrams.onprem.ci.Teamcity**, **TC** (alias)
 - **diagrams.onprem.ci.Travisci**, **TravisCI** (alias)
+- **diagrams.onprem.ci.Zuulci**, **ZuulCI** (alias)
 
 ## onprem.client
 
@@ -49,6 +51,7 @@ Node classes list of onprem provider.
 - **diagrams.onprem.database.Cassandra**
 - **diagrams.onprem.database.Clickhouse**, **ClickHouse** (alias)
 - **diagrams.onprem.database.Cockroachdb**, **CockroachDB** (alias)
+- **diagrams.onprem.database.Couchbase**
 - **diagrams.onprem.database.Couchdb**, **CouchDB** (alias)
 - **diagrams.onprem.database.Dgraph**
 - **diagrams.onprem.database.Hbase**, **HBase** (alias)
@@ -101,6 +104,7 @@ Node classes list of onprem provider.
 - **diagrams.onprem.monitoring.Grafana**
 - **diagrams.onprem.monitoring.Kibana**
 - **diagrams.onprem.monitoring.Prometheus**
+- **diagrams.onprem.monitoring.Sentry**
 - **diagrams.onprem.monitoring.Splunk**
 - **diagrams.onprem.monitoring.Thanos**
 
diff --git a/pyproject.toml b/pyproject.toml
index 3ac7e7d2..9d2a2e75 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "diagrams"
-version = "0.11.0"
+version = "0.12.0"
 description = "Diagram as Code"
 license = "MIT"
 authors = ["mingrammer <mingrammer@gmail.com>"]
diff --git a/resources/azure/general/allresources.png b/resources/azure/general/allresources.png
new file mode 100644
index 00000000..f2d94553
Binary files /dev/null and b/resources/azure/general/allresources.png differ
diff --git a/resources/azure/general/azurehome.png b/resources/azure/general/azurehome.png
new file mode 100644
index 00000000..e86046d6
Binary files /dev/null and b/resources/azure/general/azurehome.png differ
diff --git a/resources/azure/general/developertools.png b/resources/azure/general/developertools.png
new file mode 100644
index 00000000..882de89e
Binary files /dev/null and b/resources/azure/general/developertools.png differ
diff --git a/resources/azure/general/helpsupport.png b/resources/azure/general/helpsupport.png
new file mode 100644
index 00000000..d975d146
Binary files /dev/null and b/resources/azure/general/helpsupport.png differ
diff --git a/resources/azure/general/information.png b/resources/azure/general/information.png
new file mode 100644
index 00000000..3d0e8aca
Binary files /dev/null and b/resources/azure/general/information.png differ
diff --git a/resources/azure/general/managementgroups.png b/resources/azure/general/managementgroups.png
new file mode 100644
index 00000000..1322348d
Binary files /dev/null and b/resources/azure/general/managementgroups.png differ
diff --git a/resources/azure/general/marketplace.png b/resources/azure/general/marketplace.png
new file mode 100644
index 00000000..1217b9d4
Binary files /dev/null and b/resources/azure/general/marketplace.png differ
diff --git a/resources/azure/general/quickstartcenter.png b/resources/azure/general/quickstartcenter.png
new file mode 100644
index 00000000..c3aaa53c
Binary files /dev/null and b/resources/azure/general/quickstartcenter.png differ
diff --git a/resources/azure/general/recent.png b/resources/azure/general/recent.png
new file mode 100644
index 00000000..c4389d18
Binary files /dev/null and b/resources/azure/general/recent.png differ
diff --git a/resources/azure/general/reservations.png b/resources/azure/general/reservations.png
new file mode 100644
index 00000000..2f4ba07e
Binary files /dev/null and b/resources/azure/general/reservations.png differ
diff --git a/resources/azure/general/resource.png b/resources/azure/general/resource.png
new file mode 100644
index 00000000..8dfdc432
Binary files /dev/null and b/resources/azure/general/resource.png differ
diff --git a/resources/azure/general/resourcegroups.png b/resources/azure/general/resourcegroups.png
new file mode 100644
index 00000000..eff189d9
Binary files /dev/null and b/resources/azure/general/resourcegroups.png differ
diff --git a/resources/azure/general/servicehealth.png b/resources/azure/general/servicehealth.png
new file mode 100644
index 00000000..308f7062
Binary files /dev/null and b/resources/azure/general/servicehealth.png differ
diff --git a/resources/azure/general/shareddashboard.png b/resources/azure/general/shareddashboard.png
new file mode 100644
index 00000000..97caf721
Binary files /dev/null and b/resources/azure/general/shareddashboard.png differ
diff --git a/resources/azure/general/subscriptions.png b/resources/azure/general/subscriptions.png
new file mode 100644
index 00000000..72eed905
Binary files /dev/null and b/resources/azure/general/subscriptions.png differ
diff --git a/resources/azure/general/support.png b/resources/azure/general/support.png
new file mode 100644
index 00000000..6590fc9a
Binary files /dev/null and b/resources/azure/general/support.png differ
diff --git a/resources/azure/general/supportrequests.png b/resources/azure/general/supportrequests.png
new file mode 100644
index 00000000..582ee94e
Binary files /dev/null and b/resources/azure/general/supportrequests.png differ
diff --git a/resources/azure/general/tag.png b/resources/azure/general/tag.png
new file mode 100644
index 00000000..92b7d10d
Binary files /dev/null and b/resources/azure/general/tag.png differ
diff --git a/resources/azure/general/tags.png b/resources/azure/general/tags.png
new file mode 100644
index 00000000..58f2b4d5
Binary files /dev/null and b/resources/azure/general/tags.png differ
diff --git a/resources/azure/general/templates.png b/resources/azure/general/templates.png
new file mode 100644
index 00000000..263cebb9
Binary files /dev/null and b/resources/azure/general/templates.png differ
diff --git a/resources/azure/general/twousericon.png b/resources/azure/general/twousericon.png
new file mode 100644
index 00000000..9d6d8c1a
Binary files /dev/null and b/resources/azure/general/twousericon.png differ
diff --git a/resources/azure/general/userhealthicon.png b/resources/azure/general/userhealthicon.png
new file mode 100644
index 00000000..b2e7e0cd
Binary files /dev/null and b/resources/azure/general/userhealthicon.png differ
diff --git a/resources/azure/general/usericon.png b/resources/azure/general/usericon.png
new file mode 100644
index 00000000..773ccd09
Binary files /dev/null and b/resources/azure/general/usericon.png differ
diff --git a/resources/azure/general/userprivacy.png b/resources/azure/general/userprivacy.png
new file mode 100644
index 00000000..09d22ce3
Binary files /dev/null and b/resources/azure/general/userprivacy.png differ
diff --git a/resources/azure/general/userresource.png b/resources/azure/general/userresource.png
new file mode 100644
index 00000000..1418179a
Binary files /dev/null and b/resources/azure/general/userresource.png differ
diff --git a/resources/azure/general/whatsnew.png b/resources/azure/general/whatsnew.png
new file mode 100644
index 00000000..2142d2b3
Binary files /dev/null and b/resources/azure/general/whatsnew.png differ
diff --git a/resources/baas/firebase/firebase.png b/resources/firebase/base/firebase.png
similarity index 100%
rename from resources/baas/firebase/firebase.png
rename to resources/firebase/base/firebase.png
diff --git a/resources/baas/firebase/authentication.png b/resources/firebase/develop/authentication.png
similarity index 100%
rename from resources/baas/firebase/authentication.png
rename to resources/firebase/develop/authentication.png
diff --git a/resources/baas/firebase/cloud-firestore.png b/resources/firebase/develop/firestore.png
similarity index 100%
rename from resources/baas/firebase/cloud-firestore.png
rename to resources/firebase/develop/firestore.png
diff --git a/resources/baas/firebase/cloud-functions.png b/resources/firebase/develop/functions.png
similarity index 100%
rename from resources/baas/firebase/cloud-functions.png
rename to resources/firebase/develop/functions.png
diff --git a/resources/baas/firebase/hosting.png b/resources/firebase/develop/hosting.png
similarity index 100%
rename from resources/baas/firebase/hosting.png
rename to resources/firebase/develop/hosting.png
diff --git a/resources/baas/firebase/ml-kit.png b/resources/firebase/develop/ml-kit.png
similarity index 100%
rename from resources/baas/firebase/ml-kit.png
rename to resources/firebase/develop/ml-kit.png
diff --git a/resources/baas/firebase/realtime-database.png b/resources/firebase/develop/realtime-database.png
similarity index 100%
rename from resources/baas/firebase/realtime-database.png
rename to resources/firebase/develop/realtime-database.png
diff --git a/resources/baas/firebase/cloud-storage.png b/resources/firebase/develop/storage.png
similarity index 100%
rename from resources/baas/firebase/cloud-storage.png
rename to resources/firebase/develop/storage.png
diff --git a/resources/baas/firebase/extensions.png b/resources/firebase/extentions/extensions.png
similarity index 100%
rename from resources/baas/firebase/extensions.png
rename to resources/firebase/extentions/extensions.png
diff --git a/resources/baas/firebase/ab-testing.png b/resources/firebase/grow/ab-testing.png
similarity index 100%
rename from resources/baas/firebase/ab-testing.png
rename to resources/firebase/grow/ab-testing.png
diff --git a/resources/baas/firebase/app-indexing.png b/resources/firebase/grow/app-indexing.png
similarity index 100%
rename from resources/baas/firebase/app-indexing.png
rename to resources/firebase/grow/app-indexing.png
diff --git a/resources/baas/firebase/dynamic-links.png b/resources/firebase/grow/dynamic-links.png
similarity index 100%
rename from resources/baas/firebase/dynamic-links.png
rename to resources/firebase/grow/dynamic-links.png
diff --git a/resources/baas/firebase/in-app-messaging.png b/resources/firebase/grow/in-app-messaging.png
similarity index 100%
rename from resources/baas/firebase/in-app-messaging.png
rename to resources/firebase/grow/in-app-messaging.png
diff --git a/resources/baas/firebase/invites.png b/resources/firebase/grow/invites.png
similarity index 100%
rename from resources/baas/firebase/invites.png
rename to resources/firebase/grow/invites.png
diff --git a/resources/baas/firebase/cloud-messaging.png b/resources/firebase/grow/messaging.png
similarity index 100%
rename from resources/baas/firebase/cloud-messaging.png
rename to resources/firebase/grow/messaging.png
diff --git a/resources/baas/firebase/predictions.png b/resources/firebase/grow/predictions.png
similarity index 100%
rename from resources/baas/firebase/predictions.png
rename to resources/firebase/grow/predictions.png
diff --git a/resources/baas/firebase/remote-config.png b/resources/firebase/grow/remote-config.png
similarity index 100%
rename from resources/baas/firebase/remote-config.png
rename to resources/firebase/grow/remote-config.png
diff --git a/resources/baas/firebase/app-distribution.png b/resources/firebase/quality/app-distribution.png
similarity index 100%
rename from resources/baas/firebase/app-distribution.png
rename to resources/firebase/quality/app-distribution.png
diff --git a/resources/baas/firebase/crash-reporting.png b/resources/firebase/quality/crash-reporting.png
similarity index 100%
rename from resources/baas/firebase/crash-reporting.png
rename to resources/firebase/quality/crash-reporting.png
diff --git a/resources/baas/firebase/crashlytics.png b/resources/firebase/quality/crashlytics.png
similarity index 100%
rename from resources/baas/firebase/crashlytics.png
rename to resources/firebase/quality/crashlytics.png
diff --git a/resources/baas/firebase/performance-monitoring.png b/resources/firebase/quality/performance-monitoring.png
similarity index 100%
rename from resources/baas/firebase/performance-monitoring.png
rename to resources/firebase/quality/performance-monitoring.png
diff --git a/resources/baas/firebase/test-lab.png b/resources/firebase/quality/test-lab.png
similarity index 100%
rename from resources/baas/firebase/test-lab.png
rename to resources/firebase/quality/test-lab.png
diff --git a/resources/onprem/ci/gitlabci.png b/resources/onprem/ci/gitlabci.png
new file mode 100644
index 00000000..5cc42cda
Binary files /dev/null and b/resources/onprem/ci/gitlabci.png differ
diff --git a/resources/onprem/ci/zuulci.png b/resources/onprem/ci/zuulci.png
new file mode 100644
index 00000000..40c0f2fa
Binary files /dev/null and b/resources/onprem/ci/zuulci.png differ
diff --git a/resources/onprem/database/couchbase.png b/resources/onprem/database/couchbase.png
new file mode 100644
index 00000000..6144f54b
Binary files /dev/null and b/resources/onprem/database/couchbase.png differ
diff --git a/resources/onprem/monitoring/sentry.png b/resources/onprem/monitoring/sentry.png
new file mode 100644
index 00000000..b30290da
Binary files /dev/null and b/resources/onprem/monitoring/sentry.png differ
diff --git a/scripts/generate.py b/scripts/generate.py
index 7ec0a879..412def77 100644
--- a/scripts/generate.py
+++ b/scripts/generate.py
@@ -50,7 +50,7 @@ def gen_apidoc(pvd: str, typ_paths: dict) -> str:
         return name
 
     typ_classes = {}
-    for typ, paths in typ_paths.items():
+    for typ, paths in sorted(typ_paths.items()):
         typ_classes[typ] = []
         for name in map(_gen_class_name, paths):
             alias = cfg.ALIASES[pvd].get(typ, {}).get(name)
diff --git a/scripts/resource.py b/scripts/resource.py
index 10575af1..138533a8 100644
--- a/scripts/resource.py
+++ b/scripts/resource.py
@@ -53,6 +53,16 @@ def cleaner_gcp(f):
     return f.lower()
 
 
+def cleaner_firebase(f):
+    f = f.replace("_", "-")
+    f = "-".join(f.split())
+    for p in cfg.FILE_PREFIXES["firebase"]:
+        if f.startswith(p):
+            f = f[len(p) :]
+            break
+    return f.lower()
+
+
 def cleaner_k8s(f):
     f = f.replace("-256", "")
     for p in cfg.FILE_PREFIXES["k8s"]:
@@ -89,6 +99,7 @@ cleaners = {
     "aws": cleaner_aws,
     "azure": cleaner_azure,
     "gcp": cleaner_gcp,
+    "firebase": cleaner_firebase,
     "k8s": cleaner_k8s,
     "alibabacloud": cleaner_alibabacloud,
     "oci": cleaner_oci,