diff --git a/templates/compose/embystat.yaml b/templates/compose/embystat.yaml
index 957f67dfb..84e25d4a8 100644
--- a/templates/compose/embystat.yaml
+++ b/templates/compose/embystat.yaml
@@ -1,7 +1,7 @@
 # documentation: https://github.com/mregni/EmbyStat
 # slogan: EmbyStat is a web analytics tool, designed to provide insight into website traffic and user behavior.
-# category: media
-# tags: media, server, movies, tv, music
+# category: analytics
+# tags: analytics, insights, statistics, web, traffic
 # port: 6555
 
 services:
diff --git a/templates/compose/rybbit.yaml b/templates/compose/rybbit.yaml
index 3c8f7564c..fe214bf16 100644
--- a/templates/compose/rybbit.yaml
+++ b/templates/compose/rybbit.yaml
@@ -1,6 +1,7 @@
 # documentation: https://rybbit.io/docs
 # slogan: Open-source, privacy-first web analytics.
-# tags: analytics,web,privacy,self-hosted,clickhouse,postgres
+# category: analytics
+# tags: analytics, web, privacy, self-hosted, clickhouse, postgres
 # logo: svgs/rybbit.svg
 # port: 3002
 
@@ -130,4 +131,4 @@ services:
                       <log_processors_profiles>0</log_processors_profiles>
                   </default>
               </profiles>
-          </clickhouse>
\ No newline at end of file
+          </clickhouse>