diff --git a/_layouts/templates.html b/_layouts/templates.html
index b20823adf..4a97554e3 100644
--- a/_layouts/templates.html
+++ b/_layouts/templates.html
@@ -21,6 +21,7 @@
       {% elsif page.templates2 != nil %}ESP32-S2
       {% elsif page.templates3 != nil %}ESP32-S3
       {% elsif page.templatec3 != nil %}ESP32-C3
+      {% elsif page.templatec6 != nil %}ESP32-C6
       {% else %}ESP8266
       {% endif %}
     </id>
@@ -122,6 +123,18 @@
 </div>
 {% endif %}
 
+{% if page.templatec6 != nil %}
+<div class="row">
+  <div class="column"><strong>Configuration for ESP32-C6</strong></div>
+  <div class="column-10"><a class="button button-outline button-small menu" href="{{ site.github.repository_url }}/tree/master/{{ page.relative_path }}">Edit on GitHub</a></div>
+</div>
+<div class="row">
+  <div class="column column-100">
+    <pre><code class="language-json" style="white-space: nowrap">{{ page.templatec6 }}</code></pre>
+</div>
+</div>
+{% endif %}
+
 {% if page.templates2 != nil %}
 <div class="row">
   <div class="column"><strong>Configuration for ESP32-S2</strong></div>
@@ -226,8 +239,12 @@ <h2>This device now comes with a Wi-Fi module incompatible with Tasmota</h2>
       {% assign template = page.template32 | split: ':' %}
     {% elsif page.templatec3 != nil %}
       {% assign template = page.templatec3 | split: ':' %}
+    {% elsif page.templatec6 != nil %}
+      {% assign template = page.templatec6 | split: ':' %}
     {% elsif page.templates2 != nil %}
       {% assign template = page.templates2 | split: ':' %}
+    {% elsif page.templates3 != nil %}
+      {% assign template = page.templates3 | split: ':' %}
     {% endif %}
     {% assign gpios = template[2] | remove: '[' | remove: '],"FLAG"' | split: ',' %}
       {% if gpios contains '2624' or gpios contains '2656' or gpios contains '2688' or gpios contains '2720' or gpios contains '2752' or gpios contains '2784' or gpios contains '2816' or gpios contains '3072' or gpios contains '3104' or gpios contains '3456' or gpios contains '7296' or gpios contains '7328' or gpios contains '8128'%}
diff --git a/_templates/weact_ESP32-C6_A b/_templates/weact_ESP32-C6_A
new file mode 100644
index 000000000..0422f126e
--- /dev/null
+++ b/_templates/weact_ESP32-C6_A
@@ -0,0 +1,16 @@
+---
+date_added: 2023-08-30
+title: WeAct Studio ESP32-C6-A
+model: ESP32-C6-A
+category: diy
+type: Development Board
+standard: global
+image: /assets/device_images/weact_ESP32-C6-A.webp
+templatec6: ' {"NAME":"WeAct ESP32-C6-A","GPIO":[1,1,1,1,1,1,1,1,1376,32,1,1,1,1,0,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0],"FLAG":0,"BASE":1}' 
+mlink:
+link: https://www.aliexpress.com/item/1005005569520224.html
+---
+
+To flash an ESP32-C6 device you need to compile your own binary using `tasmota32c6-arduino30` environment.
+
+![Pinout](/assets/device_images/weact_ESP32-C6_A_pinout.webp)
\ No newline at end of file
diff --git a/assets/device_images/weact_ESP32-C6_A.webp b/assets/device_images/weact_ESP32-C6_A.webp
new file mode 100644
index 000000000..8dacf10e9
Binary files /dev/null and b/assets/device_images/weact_ESP32-C6_A.webp differ
diff --git a/assets/device_images/weact_ESP32-C6_A_pinout.webp b/assets/device_images/weact_ESP32-C6_A_pinout.webp
new file mode 100644
index 000000000..e855d751f
Binary files /dev/null and b/assets/device_images/weact_ESP32-C6_A_pinout.webp differ