diff --git a/software/channeltube.yml b/software/channeltube.yml
index d9413e5866..dceff95592 100644
--- a/software/channeltube.yml
+++ b/software/channeltube.yml
@@ -7,7 +7,7 @@ licenses:
 platforms:
   - Docker
 tags:
-  - Automation
+  - Media Management
 depends_3rdparty: true
 stargazers_count: 196
 updated_at: '2025-03-31'
diff --git a/software/dagu.yml b/software/dagu.yml
index 7a0fc05a93..3b85be30c0 100644
--- a/software/dagu.yml
+++ b/software/dagu.yml
@@ -8,7 +8,7 @@ platforms:
   - Go
   - Docker
 tags:
-  - Automation
+  - Media Management
 stargazers_count: 1949
 updated_at: '2025-04-06'
 archived: false
diff --git a/software/headphones.yml b/software/headphones.yml
index cd77492a49..7601d97e7e 100644
--- a/software/headphones.yml
+++ b/software/headphones.yml
@@ -6,7 +6,7 @@ licenses:
 platforms:
   - Python
 tags:
-  - Automation
+  - Media Management
 source_code_url: https://github.com/rembo10/headphones
 stargazers_count: 3466
 updated_at: '2024-12-07'
diff --git a/software/jellyseerr.yml b/software/jellyseerr.yml
index a427372fd0..bcd416d0a4 100644
--- a/software/jellyseerr.yml
+++ b/software/jellyseerr.yml
@@ -7,7 +7,7 @@ platforms:
   - Docker
   - Nodejs
 tags:
-  - Miscellaneous
+  - Media Management
 source_code_url: https://github.com/Fallenbagel/jellyseerr
 stargazers_count: 5036
 updated_at: '2025-04-11'
diff --git a/software/lidarr.yml b/software/lidarr.yml
index 78bc337688..07a6011387 100644
--- a/software/lidarr.yml
+++ b/software/lidarr.yml
@@ -7,7 +7,7 @@ platforms:
   - C#
   - Docker
 tags:
-  - Automation
+  - Media Management
 source_code_url: https://github.com/Lidarr/Lidarr
 stargazers_count: 4014
 updated_at: '2025-04-08'
diff --git a/software/lidatube.yml b/software/lidatube.yml
index 22b17854ac..efe7ec1143 100644
--- a/software/lidatube.yml
+++ b/software/lidatube.yml
@@ -7,7 +7,7 @@ licenses:
 platforms:
   - Docker
 tags:
-  - Automation
+  - Media Management
 depends_3rdparty: true
 stargazers_count: 228
 updated_at: '2025-03-31'
diff --git a/software/lidify.yml b/software/lidify.yml
index d759163877..b4396281bd 100644
--- a/software/lidify.yml
+++ b/software/lidify.yml
@@ -7,7 +7,7 @@ licenses:
 platforms:
   - Docker
 tags:
-  - Automation
+  - Media Management
 depends_3rdparty: true
 stargazers_count: 277
 updated_at: '2025-02-17'
diff --git a/software/medusa.yml b/software/medusa.yml
index ca99107d86..110b69ecca 100644
--- a/software/medusa.yml
+++ b/software/medusa.yml
@@ -1,12 +1,12 @@
 name: Medusa
 website_url: https://github.com/pymedusa/Medusa
-description: Automatic Video Library Manager for TV Shows. It watches for new episodes of your favorite shows, and when they are posted it does its magic.
+description: Automatic Video library manager for TV Shows. It watches for new episodes of your favorite shows, and when they are posted it does its magic.
 licenses:
   - GPL-3.0
 platforms:
   - Python
 tags:
-  - Automation
+  - Media Management
 source_code_url: https://github.com/pymedusa/Medusa
 related_software_url: https://github.com/medusajs/nextjs-starter-medusa
 stargazers_count: 1861
diff --git a/software/metatube.yml b/software/metatube.yml
index a483f86c00..ee9913a9e6 100644
--- a/software/metatube.yml
+++ b/software/metatube.yml
@@ -1,12 +1,12 @@
 name: MetaTube
 website_url: https://github.com/JVT038/MetaTube
-description: A Web GUI to automatically download music from YouTube add metadata from Spotify, Deezer or Musicbrainz.
+description: Automatically download music from YouTube add metadata from Spotify, Deezer or Musicbrainz.
 licenses:
   - GPL-3.0
 platforms:
   - Python
 tags:
-  - Automation
+  - Media Management
 source_code_url: https://github.com/JVT038/MetaTube
 depends_3rdparty: true
 stargazers_count: 351
diff --git a/software/metube.yml b/software/metube.yml
index 4768773dfa..e4e0683dbd 100644
--- a/software/metube.yml
+++ b/software/metube.yml
@@ -8,7 +8,7 @@ platforms:
   - Nodejs
   - Docker
 tags:
-  - Automation
+  - Media Management
 source_code_url: https://github.com/alexta69/metube
 stargazers_count: 8501
 updated_at: '2025-04-11'
diff --git a/software/nefarious.yml b/software/nefarious.yml
index 5cff984e9c..fbac7879a7 100644
--- a/software/nefarious.yml
+++ b/software/nefarious.yml
@@ -1,12 +1,12 @@
 name: nefarious
 website_url: https://github.com/lardbit/nefarious
-description: Web application that automates downloading Movies and TV Shows.
+description: Automate downloading Movies and TV Shows.
 licenses:
   - GPL-3.0
 platforms:
   - Python
 tags:
-  - Automation
+  - Media Management
 source_code_url: https://github.com/lardbit/nefarious
 stargazers_count: 1119
 updated_at: '2025-03-07'
diff --git a/software/ombi.yml b/software/ombi.yml
index edb7b6a4d4..6b7a503532 100644
--- a/software/ombi.yml
+++ b/software/ombi.yml
@@ -7,7 +7,7 @@ platforms:
   - C#
   - deb
 tags:
-  - Miscellaneous
+  - Media Management
 source_code_url: https://github.com/Ombi-app/Ombi
 demo_url: https://app.ombi.io/
 stargazers_count: 3859
diff --git a/software/overseerr.yml b/software/overseerr.yml
index c7e9a99cc2..1aca4e089d 100644
--- a/software/overseerr.yml
+++ b/software/overseerr.yml
@@ -6,7 +6,7 @@ licenses:
 platforms:
   - Docker
 tags:
-  - Miscellaneous
+  - Media Management
 source_code_url: https://github.com/sct/overseerr
 depends_3rdparty: true
 stargazers_count: 4384
diff --git a/software/pinchflat.yml b/software/pinchflat.yml
index c87ac00cef..4d4ce6c3fb 100644
--- a/software/pinchflat.yml
+++ b/software/pinchflat.yml
@@ -1,13 +1,13 @@
 name: Pinchflat
 website_url: https://github.com/kieraneglin/pinchflat
 source_code_url: https://github.com/kieraneglin/pinchflat
-description: An app for downloading YouTube content built using yt-dlp.
+description: Download YouTube content built using yt-dlp.
 licenses:
   - AGPL-3.0
 platforms:
   - Docker
 tags:
-  - Automation
+  - Media Management
 depends_3rdparty: true
 stargazers_count: 2912
 updated_at: '2025-04-10'
diff --git a/software/plexripper.yml b/software/plexripper.yml
index 15c6f21a8c..48f0d5aff2 100644
--- a/software/plexripper.yml
+++ b/software/plexripper.yml
@@ -1,13 +1,13 @@
 name: PlexRipper
 website_url: https://www.plexripper.rocks/
 source_code_url: https://github.com/PlexRipper/PlexRipper
-description: A cross-platform Plex media downloader that seamlessly adds media from other Plex servers to your own.
+description: Cross-platform Plex media downloader that seamlessly adds media from other Plex servers to your own.
 licenses:
   - GPL-3.0
 platforms:
   - Docker
 tags:
-  - Automation
+  - Media Management
 depends_3rdparty: true
 stargazers_count: 396
 updated_at: '2025-04-06'
diff --git a/software/podfetch.yml b/software/podfetch.yml
index 4f4a3ca7e5..395c4dedd2 100644
--- a/software/podfetch.yml
+++ b/software/podfetch.yml
@@ -1,15 +1,14 @@
 name: PodFetch
 website_url: https://samtv12345.github.io/PodFetch
 source_code_url: https://github.com/SamTV12345/PodFetch
-description: A sleek and efficient podcast downloader.
+description: Sleek and efficient podcast downloader.
 licenses:
   - Apache-2.0
 platforms:
   - Docker
   - Rust
 tags:
-  - Media Streaming - Audio Streaming
-  - Automation
+  - Media Management
 stargazers_count: 404
 updated_at: '2025-04-05'
 archived: false
diff --git a/software/radarr.yml b/software/radarr.yml
index 6b2af57e09..3d850ccdc1 100644
--- a/software/radarr.yml
+++ b/software/radarr.yml
@@ -7,7 +7,7 @@ platforms:
   - C#
   - Docker
 tags:
-  - Automation
+  - Media Management
 source_code_url: https://github.com/Radarr/Radarr
 stargazers_count: 11318
 updated_at: '2025-04-12'
diff --git a/software/reiverr.yml b/software/reiverr.yml
index d9861e9783..1b63b18fcb 100644
--- a/software/reiverr.yml
+++ b/software/reiverr.yml
@@ -7,7 +7,7 @@ licenses:
 platforms:
   - Docker
 tags:
-  - Media Streaming - Multimedia Streaming
+  - Media Management
 depends_3rdparty: true
 stargazers_count: 1638
 updated_at: '2025-02-22'
diff --git a/software/sickchill.yml b/software/sickchill.yml
index 8e6c3bf307..cd8adf9ce7 100644
--- a/software/sickchill.yml
+++ b/software/sickchill.yml
@@ -1,13 +1,13 @@
 name: SickChill
 website_url: https://sickchill.github.io/
-description: SickChill is an automatic video library manager for TV shows. It watches for new episodes of your favorite shows, and when they are posted it does its magic.
+description: Automatic video library manager for TV shows. It watches for new episodes of your favorite shows, and when they are posted it does its magic.
 licenses:
   - GPL-3.0
 platforms:
   - Python
   - Docker
 tags:
-  - Automation
+  - Media Management
 source_code_url: https://github.com/SickChill/SickChill
 stargazers_count: 2422
 updated_at: '2024-09-10'
diff --git a/software/sonarr.yml b/software/sonarr.yml
index b3499fc41c..7a44a308b4 100644
--- a/software/sonarr.yml
+++ b/software/sonarr.yml
@@ -7,7 +7,7 @@ platforms:
   - C#
   - Docker
 tags:
-  - Automation
+  - Media Management
 source_code_url: https://github.com/Sonarr/Sonarr
 stargazers_count: 11626
 updated_at: '2025-04-08'
diff --git a/software/tubesync.yml b/software/tubesync.yml
index 91ba0a8805..3a1aadff4b 100644
--- a/software/tubesync.yml
+++ b/software/tubesync.yml
@@ -7,7 +7,7 @@ platforms:
   - Docker
   - Python
 tags:
-  - Automation
+  - Media Management
 source_code_url: https://github.com/meeb/tubesync
 depends_3rdparty: true
 stargazers_count: 2220
diff --git a/software/watcharr.yml b/software/watcharr.yml
index f1474aa15f..b9f7e967f5 100644
--- a/software/watcharr.yml
+++ b/software/watcharr.yml
@@ -1,12 +1,12 @@
 name: Watcharr
 website_url: https://github.com/sbondCo/Watcharr
-description: A free and open source content watch list. Add and track all the shows and movies you are watching. Comes with user authentication, modern and clean UI and a very simple setup.
+description: Add and track all the shows and movies you are watching. Comes with user authentication, modern and clean UI and a very simple setup.
 licenses:
   - MIT
 platforms:
   - Docker
 tags:
-  - Miscellaneous
+  - Media Management
 source_code_url: https://github.com/sbondCo/Watcharr
 demo_url: https://beta.watcharr.app/
 stargazers_count: 726
diff --git a/software/ydl_api_ng.yml b/software/ydl_api_ng.yml
index 5abd6f1cce..f14d409b9c 100644
--- a/software/ydl_api_ng.yml
+++ b/software/ydl_api_ng.yml
@@ -6,7 +6,7 @@ licenses:
 platforms:
   - Python
 tags:
-  - Automation
+  - Media Management
 source_code_url: https://github.com/Totonyus/ydl_api_ng
 stargazers_count: 182
 updated_at: '2025-02-01'
diff --git a/software/youtubedl-server.yml b/software/youtubedl-server.yml
index d4c5439b31..e2fb4d50bc 100644
--- a/software/youtubedl-server.yml
+++ b/software/youtubedl-server.yml
@@ -1,13 +1,13 @@
 name: YoutubeDL-Server
 website_url: https://github.com/nbr23/youtube-dl-server
-description: Web and REST interface for downloading videos onto a server.
+description: Web and REST interface to Youtube-DL for downloading videos onto a server.
 licenses:
   - MIT
 platforms:
   - Python
   - Docker
 tags:
-  - Automation
+  - Media Management
 source_code_url: https://github.com/nbr23/youtube-dl-server
 stargazers_count: 265
 updated_at: '2025-04-03'
diff --git a/software/yt-dlp-web-ui.yml b/software/yt-dlp-web-ui.yml
index e03c7d6792..3a55074df2 100644
--- a/software/yt-dlp-web-ui.yml
+++ b/software/yt-dlp-web-ui.yml
@@ -8,7 +8,7 @@ platforms:
   - Go
   - Nodejs
 tags:
-  - Automation
+  - Media Management
 source_code_url: https://github.com/marcopeocchi/yt-dlp-web-ui
 stargazers_count: 1426
 updated_at: '2025-03-30'
diff --git a/tags/automation.yml b/tags/automation.yml
index ee49cb253d..a33a3e4c00 100644
--- a/tags/automation.yml
+++ b/tags/automation.yml
@@ -3,3 +3,4 @@ description: '[Automation](https://en.wikipedia.org/wiki/Automation) software de
 related_tags:
   - Internet of Things (IoT)
   - Software Development - Continuous Integration & Deployment
+  - Media Management
diff --git a/tags/media-management.yml b/tags/media-management.yml
new file mode 100644
index 0000000000..f6b3b1d73c
--- /dev/null
+++ b/tags/media-management.yml
@@ -0,0 +1,8 @@
+name: Media Management
+description: '[Digital media](https://en.wikipedia.org/wiki/Digital_media) management tools and software.'
+related_tags:
+  - Automation
+  - Media Streaming
+  - Media Streaming - Audio Streaming
+  - Media Streaming - Multimedia Streaming
+  - Media Streaming - Video Streaming
\ No newline at end of file
diff --git a/tags/media-streaming---audio-streaming.yml b/tags/media-streaming---audio-streaming.yml
index b9ff0ef905..b7ac6d8984 100644
--- a/tags/media-streaming---audio-streaming.yml
+++ b/tags/media-streaming---audio-streaming.yml
@@ -1,2 +1,4 @@
 name: Media Streaming - Audio Streaming
 description: '[Audio](https://en.wikipedia.org/wiki/Audio) streaming tools and software.'
+related_tags:
+  - Media Management
\ No newline at end of file
diff --git a/tags/media-streaming---multimedia-streaming.yml b/tags/media-streaming---multimedia-streaming.yml
index 8499456d0d..35ecdd8a9c 100644
--- a/tags/media-streaming---multimedia-streaming.yml
+++ b/tags/media-streaming---multimedia-streaming.yml
@@ -3,3 +3,4 @@ description: '[Multimedia](https://en.wikipedia.org/wiki/Multimedia) streaming t
 related_tags:
   - Media Streaming - Video Streaming
   - Media Streaming - Audio Streaming
+  - Media Management
diff --git a/tags/media-streaming---video-streaming.yml b/tags/media-streaming---video-streaming.yml
index 0d2fdc6636..725bd0acde 100644
--- a/tags/media-streaming---video-streaming.yml
+++ b/tags/media-streaming---video-streaming.yml
@@ -4,3 +4,4 @@ related_tags:
   - Video Surveillance
   - Media Streaming - Multimedia Streaming
   - Photo Galleries
+  - Media Management
diff --git a/tags/media-streaming.yml b/tags/media-streaming.yml
index 243b873680..54eec2b016 100644
--- a/tags/media-streaming.yml
+++ b/tags/media-streaming.yml
@@ -12,3 +12,5 @@ redirect:
     url: '#media-streaming---multimedia-streaming'
   - title: Media streaming - Video Streaming
     url: '#media-streaming---video-streaming'
+  related_tags:
+  - Media Management