diff --git a/.github/labeler.yml b/.github/labeler.yml
index 891379443a..14e414d90c 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -66,7 +66,7 @@ area/docs:
               - "*.md"
               - "**/*.md"
               - "**/*.mdx"
-              - diagrams/**
+              - docs/diagrams/**
 
 # -----------------collectors----------------------
 
diff --git a/.gitignore b/.gitignore
index c386506945..10f2c5f917 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,10 +119,10 @@ compile_commands.json
 webcopylocal*
 
 # converted diagrams
-diagrams/*.png
-diagrams/*.svg
-diagrams/*.atxt
-diagrams/plantuml.jar
+docs/diagrams/*.png
+docs/diagrams/*.svg
+docs/diagrams/*.atxt
+docs/diagrams/plantuml.jar
 
 # python virtual environment
 venv/
diff --git a/diagrams/build.sh b/docs/diagrams/build.sh
similarity index 100%
rename from diagrams/build.sh
rename to docs/diagrams/build.sh
diff --git a/diagrams/config.puml b/docs/diagrams/config.puml
similarity index 100%
rename from diagrams/config.puml
rename to docs/diagrams/config.puml
diff --git a/diagrams/data_structures/netdata_config.svg b/docs/diagrams/data_structures/netdata_config.svg
similarity index 100%
rename from diagrams/data_structures/netdata_config.svg
rename to docs/diagrams/data_structures/netdata_config.svg
diff --git a/diagrams/data_structures/registry.svg b/docs/diagrams/data_structures/registry.svg
similarity index 100%
rename from diagrams/data_structures/registry.svg
rename to docs/diagrams/data_structures/registry.svg
diff --git a/diagrams/data_structures/rrd.svg b/docs/diagrams/data_structures/rrd.svg
similarity index 100%
rename from diagrams/data_structures/rrd.svg
rename to docs/diagrams/data_structures/rrd.svg
diff --git a/diagrams/data_structures/src/netdata_config.xml b/docs/diagrams/data_structures/src/netdata_config.xml
similarity index 100%
rename from diagrams/data_structures/src/netdata_config.xml
rename to docs/diagrams/data_structures/src/netdata_config.xml
diff --git a/diagrams/data_structures/src/registry.xml b/docs/diagrams/data_structures/src/registry.xml
similarity index 100%
rename from diagrams/data_structures/src/registry.xml
rename to docs/diagrams/data_structures/src/registry.xml
diff --git a/diagrams/data_structures/src/rrd.xml b/docs/diagrams/data_structures/src/rrd.xml
similarity index 100%
rename from diagrams/data_structures/src/rrd.xml
rename to docs/diagrams/data_structures/src/rrd.xml
diff --git a/diagrams/data_structures/src/web.xml b/docs/diagrams/data_structures/src/web.xml
similarity index 100%
rename from diagrams/data_structures/src/web.xml
rename to docs/diagrams/data_structures/src/web.xml
diff --git a/diagrams/data_structures/web.svg b/docs/diagrams/data_structures/web.svg
similarity index 100%
rename from diagrams/data_structures/web.svg
rename to docs/diagrams/data_structures/web.svg
diff --git a/diagrams/docs/Makefile b/docs/diagrams/docs/Makefile
similarity index 100%
rename from diagrams/docs/Makefile
rename to docs/diagrams/docs/Makefile
diff --git a/diagrams/docs/deployment-parent.drawio b/docs/diagrams/docs/deployment-parent.drawio
similarity index 100%
rename from diagrams/docs/deployment-parent.drawio
rename to docs/diagrams/docs/deployment-parent.drawio
diff --git a/diagrams/docs/deployment-parents.drawio b/docs/diagrams/docs/deployment-parents.drawio
similarity index 100%
rename from diagrams/docs/deployment-parents.drawio
rename to docs/diagrams/docs/deployment-parents.drawio
diff --git a/diagrams/docs/deployment-standalone.drawio b/docs/diagrams/docs/deployment-standalone.drawio
similarity index 100%
rename from diagrams/docs/deployment-standalone.drawio
rename to docs/diagrams/docs/deployment-standalone.drawio
diff --git a/diagrams/ephemeral-nodes-two-parents.xml b/docs/diagrams/ephemeral-nodes-two-parents.xml
similarity index 100%
rename from diagrams/ephemeral-nodes-two-parents.xml
rename to docs/diagrams/ephemeral-nodes-two-parents.xml
diff --git a/diagrams/netdata-for-ephemeral-nodes.xml b/docs/diagrams/netdata-for-ephemeral-nodes.xml
similarity index 100%
rename from diagrams/netdata-for-ephemeral-nodes.xml
rename to docs/diagrams/netdata-for-ephemeral-nodes.xml
diff --git a/diagrams/netdata-overview.xml b/docs/diagrams/netdata-overview.xml
similarity index 100%
rename from diagrams/netdata-overview.xml
rename to docs/diagrams/netdata-overview.xml
diff --git a/diagrams/netdata-proxies-example.xml b/docs/diagrams/netdata-proxies-example.xml
similarity index 100%
rename from diagrams/netdata-proxies-example.xml
rename to docs/diagrams/netdata-proxies-example.xml
diff --git a/diagrams/registry.puml b/docs/diagrams/registry.puml
similarity index 100%
rename from diagrams/registry.puml
rename to docs/diagrams/registry.puml
diff --git a/diagrams/simple-parent-child-no-cloud.xml b/docs/diagrams/simple-parent-child-no-cloud.xml
similarity index 100%
rename from diagrams/simple-parent-child-no-cloud.xml
rename to docs/diagrams/simple-parent-child-no-cloud.xml
diff --git a/diagrams/simple-parent-child.xml b/docs/diagrams/simple-parent-child.xml
similarity index 100%
rename from diagrams/simple-parent-child.xml
rename to docs/diagrams/simple-parent-child.xml
diff --git a/diagrams/windows.xml b/docs/diagrams/windows.xml
similarity index 100%
rename from diagrams/windows.xml
rename to docs/diagrams/windows.xml
diff --git a/src/web/gui/v1/infographic.html b/src/web/gui/v1/infographic.html
index 0d3f563754..18d608c6cb 100644
--- a/src/web/gui/v1/infographic.html
+++ b/src/web/gui/v1/infographic.html
@@ -91,8 +91,8 @@
 		"toolbar":"",
 		"auto-fit":true,
 		"check-visible-state":false,
-		"edit":"https://raw.githubusercontent.com/netdata/netdata/master/diagrams/netdata-overview.xml",
-		"url":"https://raw.githubusercontent.com/netdata/netdata/master/diagrams/netdata-overview.xml"
+		"edit":"https://raw.githubusercontent.com/netdata/netdata/master/docs/diagrams/netdata-overview.xml",
+		"url":"https://raw.githubusercontent.com/netdata/netdata/master/docs/diagrams/netdata-overview.xml"
 	};
 	document.getElementById("drawing").dataset.mxgraph = JSON.stringify(opts);
 </script>