diff --git a/content/docs/rfcs/1/README.md b/content/docs/rfcs/1/README.md
index c3e6335c..e3d9ae8b 100644
--- a/content/docs/rfcs/1/README.md
+++ b/content/docs/rfcs/1/README.md
@@ -160,12 +160,12 @@ It is RECOMMENDED to use color coding to indicate specification's status. Color
 It is RECOMMENDED that specification metadata is specified as a YAML header (where possible) or a separate YAML file. This will enable programmatic access
 to specification metadata.
 
-| Key              | Value                | Type   | Example             |
-|------------------|----------------------|--------|---------------------|
-| **domain**       | specification domain | string | rfc.vac.dev |
-| **shortname**    | short name           | string | 1/COSS              |
-| **name**         | full name            | string | Consensus-Oriented Specification System |
-| **status**       | status               | string | draft               |
-| **tags**         | 0 or several tags    | list   | waku-application, waku-core |
-| **editor**       | editor name/email    | string | Oskar Thoren <oskar@status.im> |
+| Key              | Value                | Type   | Example                                                                                                                                                                                                                             |
+|------------------|----------------------|--------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **domain**       | specification domain | string | rfc.vac.dev                                                                                                                                                                                                                         |
+| **shortname**    | short name           | string | 1/COSS                                                                                                                                                                                                                              |
+| **name**         | full name            | string | Consensus-Oriented Specification System                                                                                                                                                                                             |
+| **status**       | status               | string | draft                                                                                                                                                                                                                               |
+| **tags**         | 0 or several tags    | list   | waku-application, waku-core-protocol                                                                                                                                                                                                |
+| **editor**       | editor name/email    | string | Oskar Thoren <oskar@status.im>                                                                                                                                                                                                      |
 | **contributors** | contributors         | list   | - Pieter Hintjens <ph@imatix.com><br> - André Rebentisch <andre@openstandards.de><br> - Alberto Barrionuevo <abarrio@opentia.es><br> - Chris Puttick <chris.puttick@thehumanjourney.net><br> - Yurii Rashkovskii <yrashk@gmail.com> |
diff --git a/content/docs/rfcs/22/README.md b/content/docs/rfcs/22/README.md
index 7dda0d2b..1526ebb1 100644
--- a/content/docs/rfcs/22/README.md
+++ b/content/docs/rfcs/22/README.md
@@ -3,7 +3,7 @@ slug: 22
 title: 22/TOY-CHAT
 name: Waku v2 Toy Chat
 status: draft
-category: application
+tags: waku-application
 editor: Franck Royer <franck@status.im>
 contributors:
    - Hanno Cornelius <hanno@status.im>
diff --git a/content/docs/rfcs/31/README.md b/content/docs/rfcs/31/README.md
index 293890d9..221b4dc7 100644
--- a/content/docs/rfcs/31/README.md
+++ b/content/docs/rfcs/31/README.md
@@ -3,6 +3,7 @@ slug: 31
 title: 31/WAKU2-ENR
 name: Waku v2 usage of ENR
 status: raw
+tags: waku-core-protocol
 editor: Franck Royer <franck@status.im>
 contributors:
 ---