diff --git a/deconz.html b/deconz.html
index 6472a37f8..b1e27f54a 100644
--- a/deconz.html
+++ b/deconz.html
@@ -7,7 +7,7 @@ <h2>{{ page.title }}</h2>
 <!-- ######################################################################  -->
 {% assign compatibility = site.zigbee | where: "compatible", "deconz" %}
 {% assign gateway = site.zigbee | where: "category", "light" | concat: compatibility | uniq %}
-{% assign types = gateway | group_by: 'category' | sort: "name"  %} 
+{% assign types = gateway | group_by: 'category' | sort_natural: "name"  %} 
     {% for type in types %}
     <h3> {{ type.name | capitalize }} </h3>
     <table>
diff --git a/iobroker.html b/iobroker.html
index e9d67bfa1..f6b13ffaf 100644
--- a/iobroker.html
+++ b/iobroker.html
@@ -6,7 +6,7 @@ <h2>{{ page.title }}</h2>
 How to set up <a href="https://github.com/ioBroker/ioBroker.zigbee" target="_blank">ioBroker.zigbee</a>.
 <!-- ######################################################################  -->
 {% assign gateway = site.zigbee | where: "compatible", "iob" %}
-{% assign types = gateway | group_by: 'category' | sort: "name" %} 
+{% assign types = gateway | group_by: 'category' | sort_natural: "name" %} 
     {% for type in types %}
     <h3> {{ type.name | capitalize }} </h3>
     <table>
diff --git a/vendors.html b/vendors.html
index 1c486b392..56b201e2e 100644
--- a/vendors.html
+++ b/vendors.html
@@ -5,13 +5,13 @@
 <h2>{{ page.title }}</h2>
 <!-- ######################################################################  -->
 {% assign gateway = site.zigbee %}
-{% assign types = gateway | group_by: 'vendor' | sort: "name"  %} 
+{% assign types = gateway | group_by: 'vendor' | sort_natural: "name"  %} 
     {% for type in types %}
     <h3> {{ type.name }} </h3>
     <table>
         <tbody>
         {% assign vendor = type.items | group_by: 'vendor' %} 
-        {% assign vendors = vendor | sort: 'name' %} 
+        {% assign vendors = vendor | sort_natural: 'name' %} 
         {% for type in vendors %}
         {% assign type_sorted = type.items | sort_natural: 'title' %}     
         {% for template in type_sorted %}
diff --git a/zha.html b/zha.html
index ecea85c6b..9123ef8c2 100644
--- a/zha.html
+++ b/zha.html
@@ -7,7 +7,7 @@ <h2>{{ page.title }}</h2>
 <!-- ######################################################################  -->
 {% assign compatibility = site.zigbee | where: "compatible", "zha" %}
 {% assign gateway = site.zigbee | where: "category", "light" | concat: compatibility | uniq %}
-{% assign types = gateway | group_by: 'category' | sort: "name"  %} 
+{% assign types = gateway | group_by: 'category' | sort_natural: "name"  %} 
     {% for type in types %}
     <h3> {{ type.name | capitalize }} </h3>
     <table>
diff --git a/zigate.html b/zigate.html
index e44194ddd..ce07a3adf 100644
--- a/zigate.html
+++ b/zigate.html
@@ -6,7 +6,7 @@ <h2>{{ page.title }}</h2>
 How to set up <a href="https://zigate.fr/" target="_blank">ZiGate</a>.
 <!-- ######################################################################  -->
 {% assign gateway = site.zigbee | where: "compatible", "zigate" %}
-{% assign types = gateway | group_by: 'category' | sort: "name" %} 
+{% assign types = gateway | group_by: 'category' | sort_natural: "name" %} 
     {% for type in types %}
     <h3> {{ type.name | capitalize }} </h3>
     <table>
diff --git a/zigbee2mqtt.html b/zigbee2mqtt.html
index 1ef48d0ea..1f7f884fa 100644
--- a/zigbee2mqtt.html
+++ b/zigbee2mqtt.html
@@ -6,7 +6,7 @@ <h2>{{ page.title }}</h2>
 How to set up <a href="https://www.zigbee2mqtt.io/" target="_blank">Zigbee2MQTT</a>.
 <!-- ######################################################################  -->
 {% assign gateway = site.zigbee | where: "compatible", "z2m" %}
-{% assign types = gateway | group_by: 'category' | sort: "name" %} 
+{% assign types = gateway | group_by: 'category' | sort_natural: "name" %} 
     {% for type in types %}
     <h3> {{ type.name | capitalize }} </h3>
     <table>
diff --git a/zigbee2tasmota.html b/zigbee2tasmota.html
index 748894de8..59d0b8a1b 100644
--- a/zigbee2tasmota.html
+++ b/zigbee2tasmota.html
@@ -7,7 +7,7 @@ <h2>{{ page.title }}</h2>
 <!-- ######################################################################  -->
 {% assign compatibility = site.zigbee | where: "compatible", "tasmota" %}
 {% assign gateway = site.zigbee | where: "category", "light" | concat: compatibility | uniq %}
-{% assign types = gateway | group_by: 'category' | sort: "name"  %} 
+{% assign types = gateway | group_by: 'category' | sort_natural: "name"  %} 
     {% for type in types %}
     <h3> {{ type.name | capitalize }} </h3>
     <table>