diff --git a/software/fluidd.yml b/software/fluidd.yml
new file mode 100644
index 0000000000..55462db7cb
--- /dev/null
+++ b/software/fluidd.yml
@@ -0,0 +1,11 @@
+name: Fluidd
+website_url: https://docs.fluidd.xyz/
+description: Lightweight & responsive user interface for Klipper, the 3D printer firmware.
+licenses:
+  - GPL-3.0
+platforms:
+  - Docker
+  - Nodejs
+tags:
+  - Manufacturing
+source_code_url: https://github.com/fluidd-core/fluidd
diff --git a/software/mainsail.yml b/software/mainsail.yml
new file mode 100644
index 0000000000..7395dfd1f4
--- /dev/null
+++ b/software/mainsail.yml
@@ -0,0 +1,11 @@
+name: Mainsail
+website_url: https://docs.mainsail.xyz/
+description: A modern and responsive user interface for the Klipper 3D printer firmware. Control and monitor your printer from everywhere, from any device.
+licenses:
+  - GPL-3.0
+platforms:
+  - Docker
+  - Python
+tags:
+  - Manufacturing
+source_code_url: https://github.com/mainsail-crew/mainsail
diff --git a/software/octoprint.yml b/software/octoprint.yml
new file mode 100644
index 0000000000..4ec4dca619
--- /dev/null
+++ b/software/octoprint.yml
@@ -0,0 +1,11 @@
+name: Octoprint
+website_url: https://octoprint.org/
+description: A snappy web interface for controlling consumer 3D printers.
+licenses:
+  - AGPL-3.0
+platforms:
+  - Docker
+  - Python
+tags:
+  - Manufacturing
+source_code_url: https://github.com/OctoPrint/OctoPrint
diff --git a/software/vandam.yml b/software/vandam.yml
index 139bfbf95d..3d9d89af7d 100644
--- a/software/vandam.yml
+++ b/software/vandam.yml
@@ -4,10 +4,9 @@ description: Digital asset manager for 3d print files; STL, OBJ, 3MF and more.
 licenses:
   - MIT
 platforms:
-  - Ruby
   - Docker
 tags:
-  - Miscellaneous
+  - Manufacturing
 source_code_url: https://github.com/Floppy/van_dam
 stargazers_count: 291
 updated_at: '2023-10-10'
diff --git a/tags/manufacturing.yml b/tags/manufacturing.yml
new file mode 100644
index 0000000000..91f2135432
--- /dev/null
+++ b/tags/manufacturing.yml
@@ -0,0 +1,2 @@
+name: Manufacturing
+description: "Software to manage [3D printers](https://en.wikipedia.org/wiki/3D_printing), [CNC machines](https://en.wikipedia.org/wiki/Numerical_control) and other physical manufacturing tools."