diff --git a/rfc8999.md b/rfc8999.md
index c714525199..cf39a684ab 100644
--- a/rfc8999.md
+++ b/rfc8999.md
@@ -9,6 +9,13 @@ consensus: true
 ipr: trust200902
 area: Transport
 workgroup: QUIC
+keyword:
+  - crypto
+  - next generation
+  - protocol
+  - secure
+  - transport
+  - UDP
 
 stand_alone: yes
 pi: [toc, sortrefs, symrefs, docmapping]
@@ -24,7 +31,7 @@ informative:
 
   QUIC-TRANSPORT:
     title: "QUIC: A UDP-Based Multiplexed and Secure Transport"
-    date: {DATE}
+    date: 2021-05
     seriesinfo:
       RFC: 9000
       DOI: 10.17487/RFC9000
@@ -42,7 +49,7 @@ informative:
 
   QUIC-TLS:
     title: "Using Transport Layer Security (TLS) to Secure QUIC"
-    date: {DATE}
+    date: 2021-05
     seriesinfo:
       RFC: 9001
       DOI: 10.17487/RFC9001
diff --git a/rfc9000.md b/rfc9000.md
index 9bbda987a5..40b5efda69 100644
--- a/rfc9000.md
+++ b/rfc9000.md
@@ -9,6 +9,17 @@ consensus: true
 ipr: trust200902
 area: Transport
 workgroup: QUIC
+keyword:
+  - multipath
+  - next generations
+  - protocol
+  - "sctp++"
+  - secure
+  - smart
+  - "tcp/2"
+  - tcpng
+  - transport
+  - transport-ng
 
 stand_alone: yes
 pi: [toc, sortrefs, symrefs, docmapping]
@@ -31,7 +42,7 @@ normative:
 
   QUIC-INVARIANTS:
     title: "Version-Independent Properties of QUIC"
-    date: {DATE}
+    date: 2021-05
     seriesinfo:
       RFC: 8999
       DOI: 10.17487/RFC8999
@@ -43,7 +54,7 @@ normative:
 
   QUIC-RECOVERY:
     title: "QUIC Loss Detection and Congestion Control"
-    date: {DATE}
+    date: 2021-05
     seriesinfo:
       RFC: 9002
       DOI: 10.17487/RFC9002
@@ -61,7 +72,7 @@ normative:
 
   QUIC-TLS:
     title: "Using Transport Layer Security (TLS) to Secure QUIC"
-    date: {DATE}
+    date: 2021-05
     seriesinfo:
       RFC: 9001
       DOI: 10.17487/RFC9001
diff --git a/rfc9001.md b/rfc9001.md
index e2cc680eec..73df1388c7 100644
--- a/rfc9001.md
+++ b/rfc9001.md
@@ -8,6 +8,10 @@ consensus: true
 ipr: trust200902
 area: Transport
 workgroup: QUIC
+keyword:
+  - crypto
+  - opportunistic encryption
+  - plaintext quic
 
 stand_alone: yes
 pi: [toc, sortrefs, symrefs, docmapping]
@@ -30,7 +34,7 @@ normative:
 
   QUIC-TRANSPORT:
     title: "QUIC: A UDP-Based Multiplexed and Secure Transport"
-    date: {DATE}
+    date: 2021-05
     seriesinfo:
       RFC: 9000
       DOI: 10.17487/RFC9000
@@ -48,7 +52,7 @@ normative:
 
   QUIC-RECOVERY:
     title: "QUIC Loss Detection and Congestion Control"
-    date: {DATE}
+    date: 2021-05
     seriesinfo:
       RFC: 9002
       DOI: 10.17487/RFC9002
diff --git a/rfc9002.md b/rfc9002.md
index d0e645e290..c18310c45f 100644
--- a/rfc9002.md
+++ b/rfc9002.md
@@ -9,7 +9,12 @@ consensus: true
 ipr: trust200902
 area: Transport
 workgroup: QUIC
-keyword: [fec, bbr, next generation, delay-sensitive congestion control]
+keyword:
+  - bbr
+  - delay-sensitive congestion control
+  - fec
+  - loss-tolerant congestion control
+  - next generation
 
 stand_alone: yes
 pi: [toc, sortrefs, symrefs, docmapping]
@@ -32,7 +37,7 @@ normative:
 
   QUIC-TRANSPORT:
     title: "QUIC: A UDP-Based Multiplexed and Secure Transport"
-    date: {DATE}
+    date: 2021-05
     seriesinfo:
       RFC: 9000
       DOI: 10.17487/RFC9000
@@ -50,7 +55,7 @@ normative:
 
   QUIC-TLS:
     title: "Using TLS to Secure QUIC"
-    date: {DATE}
+    date: 2021-05
     seriesinfo:
       RFC: 9001
       DOI: 10.17487/RFC9001