diff --git a/content/docs/rfcs/10/README.md b/content/docs/rfcs/10/README.md
index 07405143..9bacbcb8 100644
--- a/content/docs/rfcs/10/README.md
+++ b/content/docs/rfcs/10/README.md
@@ -56,10 +56,9 @@ The current [protocol identifiers](https://docs.libp2p.io/concepts/protocols/) a
 1. `/vac/waku/relay/2.0.0-beta2`
 2. `/vac/waku/store/2.0.0-beta3`
 3. `/vac/waku/filter/2.0.0-beta1`
-4. `/vac/waku/swap/2.0.0-alpha1`
+4. `/vac/waku/swap/2.0.0-beta1`
 5. `/vac/waku/lightpush/2.0.0-alpha1`
 
-
 These protocols and their semantics are elaborated on in their own specs.
 
 For the actual content being passed around, see the [7/WAKU-DATA](/spec/7) spec.
@@ -109,7 +108,7 @@ such as low bandwidth or being mostly offline.
 
 ### Historical message support
 
-**Protocol identifier***: `/vac/waku/store/2.0.0-beta1`
+**Protocol identifier***: `/vac/waku/store/2.0.0-beta3`
 
 See [13/WAKU2-STORE](/spec/13) spec for more details.
 
diff --git a/content/docs/rfcs/18/README.md b/content/docs/rfcs/18/README.md
index bea0db2a..e59e469e 100644
--- a/content/docs/rfcs/18/README.md
+++ b/content/docs/rfcs/18/README.md
@@ -2,7 +2,7 @@
 slug: 18
 title: 18/WAKU2-SWAP
 name: Waku SWAP Accounting
-status: raw
+status: draft
 editor: Oskar Thorén <oskar@status.im>
 contributor: Ebube Ud <ebube@status.im>
 ---