diff --git a/README.md b/README.md
index 06d4039..619d351 100644
--- a/README.md
+++ b/README.md
@@ -11,28 +11,28 @@ This repository contains specifications for the Waku suite of protocols.
 
 | Waku Specifications | Description |
 | ---- | -------------- |
-|[10/WAKU2](https://rfc.vac.dev/spec/10/)| Core |
-|[11/WAKU2-RELAY](https://rfc.vac.dev/spec/11)| Core |
-|[12/WAKU2-FILTER](https://rfc.vac.dev/spec/12)| Core|
-|[13/WAKU2-STORE](https://rfc.vac.dev/spec/13/)| Core |
-|[14/WAKU2-MESSAGE](https://rfc.vac.dev/spec/14/)| Core |
-|[15/WAKU2-BRIDGE](https://rfc.vac.dev/spec/15)| Core |
-|[16/WAKU2-RPC](https://rfc.vac.dev/spec/16)| Core |
-|[17/WAKU2-RLN-RELAY](https://rfc.vac.dev/spec/17/)| Core |
-|[18/WAKU2-SWAP](https://rfc.vac.dev/spec/18/)| Application |
-|[19/WAKU2-LIGHTPUSH](https://rfc.vac.dev/spec/19/)| Core |
-|[20/TOY-ETH-PM](https://rfc.vac.dev/spec/20/)| Application |
-|[21/WAKU2-FAULT-TOLERANT-STORE](https://rfc.vac.dev/spec/21/)| Application |
-|[22/TOY-CHAT](https://rfc.vac.dev/spec/22/)| Informational |
-|[23/WAKU2-TOPICS](https://rfc.vac.dev/spec/23/)| Informational |
-|[26/WAKU2-PAYLOAD](https://rfc.vac.dev/spec/26/)| Application |
-|[27/WAKU2-PEERS](https://rfc.vac.dev/spec/27/)| Informational |
-|[29/WAKU2-CONFIG](https://rfc.vac.dev/spec/29/)| Informational |
-|[30/ADAPTIVE-NODES](https://rfc.vac.dev/spec/30/)| Informational |
-|[33/WAKU2-DISCV5](https://rfc.vac.dev/spec/33/)| Core |
-|[36/WAKU2-BINDINGS-API](https://rfc.vac.dev/spec/36/)| Core |
-|[53/WAKU2-X3DH](https://rfc.vac.dev/spec/53/)| Application |
-|[54/WAKU2-X3DH-SESSIONS](https://rfc.vac.dev/spec/54/)| Application |
+|[10/WAKU2](https://github.com/vacp2p/rfc-index/blob/main/waku/standards/core/10/waku2.md)| Core |
+|[11/WAKU2-RELAY](https://github.com/vacp2p/rfc-index/blob/main/waku/standards/core/11/relay.md)| Core |
+|[12/WAKU2-FILTER](https://github.com/vacp2p/rfc-index/blob/main/waku/standards/core/12/filter.md)| Core|
+|[13/WAKU2-STORE](https://github.com/vacp2p/rfc-index/blob/main/waku/standards/core/13/store.md)| Core |
+|[14/WAKU2-MESSAGE](https://github.com/vacp2p/rfc-index/blob/main/waku/standards/core/14/message.md)| Core |
+|[15/WAKU2-BRIDGE](https://github.com/vacp2p/rfc-index/blob/main/waku/standards/core/15/bridge.md)| Core |
+|[16/WAKU2-RPC](https://github.com/vacp2p/rfc-index/blob/main/waku/standards/core/16/rpc.md)| Core |
+|[17/WAKU2-RLN-RELAY](https://github.com/vacp2p/rfc-index/blob/main/waku/standards/core/17/rln-relay.md)| Core |
+|[18/WAKU2-SWAP](https://github.com/vacp2p/rfc-index/blob/main/waku/standards/application/18/swap.md)| Application |
+|[19/WAKU2-LIGHTPUSH](https://github.com/vacp2p/rfc-index/blob/main/waku/standards/core/19/lightpush.md)| Core |
+|[20/TOY-ETH-PM](https://github.com/vacp2p/rfc-index/blob/main/waku/standards/application/20/toy-eth-pm.md)| Application |
+|[21/WAKU2-FAULT-TOLERANT-STORE](https://github.com/vacp2p/rfc-index/blob/main/waku/standards/application/21/fault-tolerant-store.md)| Application |
+|[22/TOY-CHAT](https://github.com/vacp2p/rfc-index/blob/main/waku/informational/22/toy-chat.md)| Informational |
+|[23/WAKU2-TOPICS](https://github.com/vacp2p/rfc-index/blob/main/waku/informational/23/topics.md)| Informational |
+|[26/WAKU2-PAYLOAD](https://github.com/vacp2p/rfc-index/blob/main/waku/standards/application/26/payload.md)| Application |
+|[27/WAKU2-PEERS](https://github.com/vacp2p/rfc-index/blob/main/waku/informational/27/peers.md)| Informational |
+|[29/WAKU2-CONFIG](https://github.com/vacp2p/rfc-index/blob/main/waku/informational/29/config.md)| Informational |
+|[30/ADAPTIVE-NODES](https://github.com/vacp2p/rfc-index/blob/main/waku/informational/30/adaptive-nodes.md)| Informational |
+|[33/WAKU2-DISCV5](https://github.com/vacp2p/rfc-index/blob/main/waku/standards/core/33/discv5.md)| Core |
+|[36/WAKU2-BINDINGS-API](https://github.com/vacp2p/rfc-index/blob/main/waku/standards/core/36/bindings-api.md)| Core |
+|[53/WAKU2-X3DH](https://github.com/vacp2p/rfc-index/blob/main/waku/standards/application/53/x3dh.md)| Application |
+|[54/WAKU2-X3DH-SESSIONS](https://github.com/vacp2p/rfc-index/blob/main/waku/standards/application/54/x3dh-sessions.md)| Application |
 |[ADVERSARIAL-MODELS](informational/adversarial-models.md)| Informational |
 |[RELAY-STATIC-SHARD-ALLOC](informational/relay-static-shard-alloc.md)| Informational |
 |[DANDELION](standards/application/dandelion.md)| Application |