diff --git a/autogen.sh b/autogen.sh
index 6af32ce4..9c9ba013 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" "firebase" "k8s" "alibabacloud" "oci" "programming" "saas" "elastic" "generic" "openstack" "outscale")
+providers=("onprem" "aws" "azure" "gcp" "firebase" "k8s", "kubernetes", "alibabacloud" "oci" "programming" "saas" "elastic" "generic" "openstack" "outscale")
 
 if ! [ -x "$(command -v round)" ]; then
   echo 'round is not installed'
diff --git a/config.py b/config.py
index 57c98307..677fc8b7 100644
--- a/config.py
+++ b/config.py
@@ -12,7 +12,8 @@ DIR_RESOURCE = "resources"
 DIR_TEMPLATE = "templates"
 
 PROVIDERS = (
-    "base", "onprem", "aws", "azure", "gcp", "firebase", "k8s", "alibabacloud", "oci", "programming", "saas", "elastic",
+    "base", "onprem", "aws", "azure", "gcp", "firebase", "k8s", "kubernetes",
+    "alibabacloud", "oci", "programming", "saas", "elastic",
     "generic", "openstack", "outscale")
 
 #########################
@@ -322,6 +323,7 @@ ALIASES = {
             "Vol": "Volume",
         },
     },
+    "kubernetes": {},
     "alibabacloud": {
         "application": {
             "LogService": "SLS",
diff --git a/diagrams/k8s/ecosystem.py b/diagrams/k8s/ecosystem.py
deleted file mode 100644
index 41c84734..00000000
--- a/diagrams/k8s/ecosystem.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# This module is automatically generated by autogen.sh. DO NOT EDIT.
-
-from . import _K8S
-
-
-class _Ecosystem(_K8S):
-    _type = "ecosystem"
-    _icon_dir = "resources/k8s/ecosystem"
-
-
-class ExternalDns(_Ecosystem):
-    _icon = "external-dns.png"
-
-
-class Helm(_Ecosystem):
-    _icon = "helm.png"
-
-
-class Krew(_Ecosystem):
-    _icon = "krew.png"
-
-
-class Kustomize(_Ecosystem):
-    _icon = "kustomize.png"
-
-
-# Aliases
diff --git a/diagrams/k8s/chaos.py b/diagrams/kubernetes/chaos.py
similarity index 69%
rename from diagrams/k8s/chaos.py
rename to diagrams/kubernetes/chaos.py
index 9f596772..91d20107 100644
--- a/diagrams/k8s/chaos.py
+++ b/diagrams/kubernetes/chaos.py
@@ -1,11 +1,11 @@
 # This module is automatically generated by autogen.sh. DO NOT EDIT.
 
-from . import _K8S
+from . import _Kubernetes
 
 
-class _Chaos(_K8S):
+class _Chaos(_Kubernetes):
     _type = "chaos"
-    _icon_dir = "resources/k8s/chaos"
+    _icon_dir = "resources/kubernetes/chaos"
 
 
 class ChaosMesh(_Chaos):
diff --git a/diagrams/kubernetes/dns.py b/diagrams/kubernetes/dns.py
new file mode 100644
index 00000000..79f5f713
--- /dev/null
+++ b/diagrams/kubernetes/dns.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Kubernetes
+
+
+class _Dns(_Kubernetes):
+    _type = "dns"
+    _icon_dir = "resources/kubernetes/dns"
+
+
+class ExternalDns(_Dns):
+    _icon = "external-dns.png"
+
+
+# Aliases
diff --git a/diagrams/kubernetes/packaging.py b/diagrams/kubernetes/packaging.py
new file mode 100644
index 00000000..274cf970
--- /dev/null
+++ b/diagrams/kubernetes/packaging.py
@@ -0,0 +1,23 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Kubernetes
+
+
+class _Packaging(_Kubernetes):
+    _type = "packaging"
+    _icon_dir = "resources/kubernetes/packaging"
+
+
+class Helm(_Packaging):
+    _icon = "helm.png"
+
+
+class Krew(_Packaging):
+    _icon = "krew.png"
+
+
+class Kustomize(_Packaging):
+    _icon = "kustomize.png"
+
+
+# Aliases
diff --git a/diagrams/kubernetes/storage.py b/diagrams/kubernetes/storage.py
new file mode 100644
index 00000000..4bf67864
--- /dev/null
+++ b/diagrams/kubernetes/storage.py
@@ -0,0 +1,19 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Kubernetes
+
+
+class _Storage(_Kubernetes):
+    _type = "storage"
+    _icon_dir = "resources/kubernetes/storage"
+
+
+class Openebs(_Storage):
+    _icon = "openebs.png"
+
+
+class Rook(_Storage):
+    _icon = "rook.png"
+
+
+# Aliases
diff --git a/diagrams/onprem/storage.py b/diagrams/onprem/storage.py
index 37e0a370..d5fab485 100644
--- a/diagrams/onprem/storage.py
+++ b/diagrams/onprem/storage.py
@@ -18,6 +18,8 @@ class Ceph(_Storage):
 
 class Glusterfs(_Storage):
     _icon = "glusterfs.png"
+class Minio(_Storage):
+    _icon = "minio.png"
 
 
 # Aliases
diff --git a/docs/nodes/k8s.md b/docs/nodes/k8s.md
index 6fe66cbd..f20f6d42 100644
--- a/docs/nodes/k8s.md
+++ b/docs/nodes/k8s.md
@@ -5,11 +5,6 @@ title: K8S
 
 Node classes list of k8s provider.
 
-## k8s.chaos
-
-- **diagrams.k8s.chaos.ChaosMesh**
-- **diagrams.k8s.chaos.LitmusChaos**
-
 ## k8s.clusterconfig
 
 - **diagrams.k8s.clusterconfig.HPA**, **HorizontalPodAutoscaler** (alias)
@@ -35,13 +30,6 @@ Node classes list of k8s provider.
 - **diagrams.k8s.controlplane.Kubelet**
 - **diagrams.k8s.controlplane.Sched**, **Scheduler** (alias)
 
-## k8s.ecosystem
-
-- **diagrams.k8s.ecosystem.ExternalDns**
-- **diagrams.k8s.ecosystem.Helm**
-- **diagrams.k8s.ecosystem.Krew**
-- **diagrams.k8s.ecosystem.Kustomize**
-
 ## k8s.group
 
 - **diagrams.k8s.group.NS**, **Namespace** (alias)
diff --git a/docs/nodes/kubernetes.md b/docs/nodes/kubernetes.md
new file mode 100644
index 00000000..3469dbe1
--- /dev/null
+++ b/docs/nodes/kubernetes.md
@@ -0,0 +1,26 @@
+---
+id: kubernetes
+title: Kubernetes
+---
+
+Node classes list of kubernetes provider.
+
+## kubernetes.chaos
+
+- **diagrams.kubernetes.chaos.ChaosMesh**
+- **diagrams.kubernetes.chaos.LitmusChaos**
+
+## kubernetes.dns
+
+- **diagrams.kubernetes.dns.ExternalDns**
+
+## kubernetes.packaging
+
+- **diagrams.kubernetes.packaging.Helm**
+- **diagrams.kubernetes.packaging.Krew**
+- **diagrams.kubernetes.packaging.Kustomize**
+
+## kubernetes.storage
+
+- **diagrams.kubernetes.storage.Openebs**
+- **diagrams.kubernetes.storage.Rook**
diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md
index 08551d2f..717133a0 100644
--- a/docs/nodes/onprem.md
+++ b/docs/nodes/onprem.md
@@ -219,6 +219,7 @@ Node classes list of onprem provider.
 - **diagrams.onprem.storage.CephOsd**, **CEPH_OSD** (alias)
 - **diagrams.onprem.storage.Ceph**, **CEPH** (alias)
 - **diagrams.onprem.storage.Glusterfs**
+- **diagrams.onprem.storage.Minio**
 
 ## onprem.tracing
 
diff --git a/resources/k8s/chaos/chaos-mesh.png b/resources/kubernetes/chaos/chaos-mesh.png
similarity index 100%
rename from resources/k8s/chaos/chaos-mesh.png
rename to resources/kubernetes/chaos/chaos-mesh.png
diff --git a/resources/k8s/chaos/litmus-chaos.png b/resources/kubernetes/chaos/litmus-chaos.png
similarity index 100%
rename from resources/k8s/chaos/litmus-chaos.png
rename to resources/kubernetes/chaos/litmus-chaos.png
diff --git a/resources/k8s/ecosystem/external-dns.png b/resources/kubernetes/dns/external-dns.png
similarity index 100%
rename from resources/k8s/ecosystem/external-dns.png
rename to resources/kubernetes/dns/external-dns.png
diff --git a/resources/k8s/ecosystem/helm.png b/resources/kubernetes/packaging/helm.png
similarity index 100%
rename from resources/k8s/ecosystem/helm.png
rename to resources/kubernetes/packaging/helm.png
diff --git a/resources/k8s/ecosystem/krew.png b/resources/kubernetes/packaging/krew.png
similarity index 100%
rename from resources/k8s/ecosystem/krew.png
rename to resources/kubernetes/packaging/krew.png
diff --git a/resources/k8s/ecosystem/kustomize.png b/resources/kubernetes/packaging/kustomize.png
similarity index 100%
rename from resources/k8s/ecosystem/kustomize.png
rename to resources/kubernetes/packaging/kustomize.png
diff --git a/resources/kubernetes/storage/openebs.png b/resources/kubernetes/storage/openebs.png
new file mode 100644
index 00000000..a8cb6e97
Binary files /dev/null and b/resources/kubernetes/storage/openebs.png differ
diff --git a/resources/kubernetes/storage/rook.png b/resources/kubernetes/storage/rook.png
new file mode 100644
index 00000000..191ef2e7
Binary files /dev/null and b/resources/kubernetes/storage/rook.png differ
diff --git a/resources/onprem/storage/minio.png b/resources/onprem/storage/minio.png
new file mode 100644
index 00000000..a30cdc40
Binary files /dev/null and b/resources/onprem/storage/minio.png differ