diff --git a/content/moderation/form-mcbe-wtf.md b/content/moderation/form-mcbe-wtf.md
index c818a54..f89a325 100644
--- a/content/moderation/form-mcbe-wtf.md
+++ b/content/moderation/form-mcbe-wtf.md
@@ -1,7 +1,7 @@
 +++
 title = 'game-requests-serverless'
 summary = 'Handling incoming game requests'
-tags = ["form"]
+tags = ["service"]
 +++
 
 While not a part of Minecraft Bedrock Speedrunning, many of the bedrock
diff --git a/content/moderation/getting-started.md b/content/moderation/getting-started.md
index 722112a..b10c038 100644
--- a/content/moderation/getting-started.md
+++ b/content/moderation/getting-started.md
@@ -1,7 +1,7 @@
 +++
 title = 'Getting started'
 summary = 'Welcome to the moderator team'
-tags = ["start"]
+tags = ["moderation"]
 +++
 
 Welcome to the moderator team, glad to have you. If you made it this far
diff --git a/content/moderation/google-forms.md b/content/moderation/google-forms.md
index de19c32..9ee6c1b 100644
--- a/content/moderation/google-forms.md
+++ b/content/moderation/google-forms.md
@@ -1,7 +1,7 @@
 +++
 title = 'Google Forms'
 summary = 'How we use google forms'
-tags = ["form"]
+tags = ["service"]
 +++
 
 Over the years we have needed to make google forms for various reasons,
diff --git a/content/moderation/investigations.md b/content/moderation/investigations.md
index 72b8048..cb29061 100644
--- a/content/moderation/investigations.md
+++ b/content/moderation/investigations.md
@@ -1,7 +1,7 @@
 +++
 title = 'Moderation Guidelines for Sensitive Investigations'
 summary = 'How to get into a proper dialog with a potential rule breaker'
-tags = ["rules"]
+tags = ["moderation"]
 +++
 
 This document aims to provide guidelines for what to do in the case of a
diff --git a/content/moderation/rules.md b/content/moderation/rules.md
index 9a633a4..48a2642 100644
--- a/content/moderation/rules.md
+++ b/content/moderation/rules.md
@@ -1,7 +1,7 @@
 +++
 title = 'Rules'
 summary = 'How to edit the rules'
-tags = ["git"]
+tags = ["moderation", "service"]
 +++
 
 Minecraft Bedrock Speedrunning moderation team keeps the rules in a git
diff --git a/content/moderation/steve-bot.md b/content/moderation/steve-bot.md
index 8c686c8..0e56f37 100644
--- a/content/moderation/steve-bot.md
+++ b/content/moderation/steve-bot.md
@@ -1,7 +1,7 @@
 +++
 title = 'Steve'
 summary = 'In-house Discord Bot'
-tags = ["discord"]
+tags = ["service"]
 +++
 
 Steve is a discord bot developed by various members of the community
diff --git a/content/moderation/timing.md b/content/moderation/timing.md
index 9d0980f..f514d0c 100644
--- a/content/moderation/timing.md
+++ b/content/moderation/timing.md
@@ -1,7 +1,7 @@
 +++
 title = 'Timing'
 summary = 'How to time a run'
-tags = ["retime"]
+tags = ["moderation", "service"]
 +++
 
 The most common task for every moderator is examining runs. Aside from
diff --git a/content/resources/end-practice.md b/content/resources/end-practice.md
index d1a7cf6..2af511c 100644
--- a/content/resources/end-practice.md
+++ b/content/resources/end-practice.md
@@ -1,6 +1,7 @@
 +++
 title = 'Co-op End Practice'
 summary = 'Practice the end'
+tags = ["practice", "map"]
 +++
 
 [Download v2.0](<../End Practice 2.0.mcworld>)
diff --git a/content/resources/mcbeuce.md b/content/resources/mcbeuce.md
index 107ccb8..c805984 100644
--- a/content/resources/mcbeuce.md
+++ b/content/resources/mcbeuce.md
@@ -1,7 +1,7 @@
 +++
 title = 'Minecraft: Bedrock Edition Unofficial Category Extensions'
 summary = 'Extra categories'
-tags = []
+tags = ["leaderboard"]
 +++
 
 Minecraft: Bedrock Edition Unofficial Category Extensions (MCBEUCE for
diff --git a/content/resources/rs-calculator.md b/content/resources/rs-calculator.md
index 7064a68..fed8552 100644
--- a/content/resources/rs-calculator.md
+++ b/content/resources/rs-calculator.md
@@ -1,6 +1,7 @@
 +++
 title = 'Random Seed Calculator'
 summary = 'Know where to place sand, and also to know when to load the sand'
+tags = ["practice", "service"]
 +++
 
 <script defer src="../../rs-calc.js"></script>
diff --git a/content/resources/rsg-meta.md b/content/resources/rsg-meta.md
index 97d7d0c..3409acf 100644
--- a/content/resources/rsg-meta.md
+++ b/content/resources/rsg-meta.md
@@ -1,6 +1,7 @@
 +++
 title = 'MCBE RSG Strats and Meta for 1.16'
 summary = 'Strategies for running 1.16 Random Seed Glitchless'
+tags = ["practice", "strat"]
 +++
 
 [The article has been written by Danny15](https://www.speedrun.com/users/Danny15).