diff --git a/rfcs/0032-run-phase-changes-for-better-nix-shell-use.md b/rfcs/0032-run-phase-changes-for-better-nix-shell-use.md
index a5f8213..4b6de0e 100644
--- a/rfcs/0032-run-phase-changes-for-better-nix-shell-use.md
+++ b/rfcs/0032-run-phase-changes-for-better-nix-shell-use.md
@@ -1,8 +1,8 @@
 ---
 feature: run-phase-changes-for-better-nix-shell-use
 start-date: 2018-08-26
-author: @globin
-co-authors: @dezgeg
+author: "@globin"
+co-authors: "@dezgeg"
 related-issues: https://github.com/dezgeg/nixpkgs/tree/better-run-phases
 shepherd-team: Samuel Dionne-Reil, John Ericson, Linus Heckemann
 shepherd-leader: Linus Heckemann
diff --git a/rfcs/0051-mark-stale-issues.md b/rfcs/0051-mark-stale-issues.md
index 6c3973c..9f70a65 100644
--- a/rfcs/0051-mark-stale-issues.md
+++ b/rfcs/0051-mark-stale-issues.md
@@ -3,8 +3,8 @@ feature: mark-stale-issues
 start-date: 2019-08-24
 author: Ryan Mulligan
 co-authors: (find a buddy later to help our with the RFC)
-shepherd-team: @globin, @grahamc, and @peti
-shepherd-leader: @peti
+shepherd-team: "@globin, @grahamc, and @peti"
+shepherd-leader: "@peti"
 related-issues: (will contain links to implementation PRs)
 ---
 
diff --git a/rfcs/0071-retired-committers-amendment.md b/rfcs/0071-retired-committers-amendment.md
index c903465..b8bb59c 100644
--- a/rfcs/0071-retired-committers-amendment.md
+++ b/rfcs/0071-retired-committers-amendment.md
@@ -3,8 +3,8 @@ feature: retired-committers-amendment
 start-date: 2020-07-09
 author: worldofpeace
 co-authors: Graham Christensen (@grahamc), Jan Tojnar (@jtojnar)
-shepherd-team: @lheckemann, @tilpner, @alyssais
-shepherd-leader: @tilpner
+shepherd-team: "@lheckemann, @tilpner, @alyssais"
+shepherd-leader: "@tilpner"
 related-issues: 0055
 ---
 
diff --git a/rfcs/0080-nixos-release-schedule.md b/rfcs/0080-nixos-release-schedule.md
index fd541d4..e78472b 100644
--- a/rfcs/0080-nixos-release-schedule.md
+++ b/rfcs/0080-nixos-release-schedule.md
@@ -3,7 +3,7 @@ feature: nixos-release-schedule
 start-date: 2020-11-28
 author: Jonathan Ringer (@jonringer)
 co-authors: Frederik Rietdijk (@FRidh)
-shepherd-team: @ryantm, @domenkozar and @garbas
+shepherd-team: "@ryantm, @domenkozar and @garbas"
 related-issues:
 ---
 
diff --git a/rfcs/0085-nixos-release-stablization.md b/rfcs/0085-nixos-release-stablization.md
index 9b7d921..d075284 100644
--- a/rfcs/0085-nixos-release-stablization.md
+++ b/rfcs/0085-nixos-release-stablization.md
@@ -3,9 +3,9 @@ feature: nixos-release-stablization
 start-date: 2021-01-17
 author: Jonathan Ringer (@jonringer)
 co-authors:
-shepherd-team: @ryantm, @garbas, @Mic92
-shepherd-leader: @ryantm
-related-issues: [NixOS release schedule](https://github.com/NixOS/rfcs/pull/80)
+shepherd-team: "@ryantm, @garbas, @Mic92"
+shepherd-leader: "@ryantm"
+related-issues: "[NixOS release schedule](https://github.com/NixOS/rfcs/pull/80)"
 ---
 
 # Summary
diff --git a/rfcs/0088-nixpkgs-breaking-change-policy.md b/rfcs/0088-nixpkgs-breaking-change-policy.md
index 61ddc63..99c18eb 100644
--- a/rfcs/0088-nixpkgs-breaking-change-policy.md
+++ b/rfcs/0088-nixpkgs-breaking-change-policy.md
@@ -3,8 +3,8 @@ feature: nixpkgs-breaking-change-policy
 start-date: 2020-09-24
 author: Kevin Cox
 co-authors: (TBD)
-shepherd-team: @blaggacao, @jonringer, @nrdxp
-shepherd-leader: @blaggacao
+shepherd-team: "@blaggacao, @jonringer, @nrdxp"
+shepherd-leader: "@blaggacao"
 related-issues: (TBD)
 ---
 
diff --git a/rfcs/0089-collect-non-source-package-meta.md b/rfcs/0089-collect-non-source-package-meta.md
index 952ad58..e7805e3 100644
--- a/rfcs/0089-collect-non-source-package-meta.md
+++ b/rfcs/0089-collect-non-source-package-meta.md
@@ -3,8 +3,8 @@ feature: collect-non-source-package-meta
 start-date: 2021-03-14
 author: Robert Scott
 co-authors: (find a buddy later to help out with the RFC)
-shepherd-team: @asymmetric, @aforemny, @alyssais
-shepherd-leader: @asymmetric
+shepherd-team: "@asymmetric, @aforemny, @alyssais"
+shepherd-leader: "@asymmetric"
 related-issues: (will contain links to implementation PRs)
 ---
 
diff --git a/rfcs/0092-plan-dynamism.md b/rfcs/0092-plan-dynamism.md
index 5df788e..6197e11 100644
--- a/rfcs/0092-plan-dynamism.md
+++ b/rfcs/0092-plan-dynamism.md
@@ -3,8 +3,8 @@ feature: plan-dynamism-experiment
 start-date: 2019-02-01
 author: John Ericson (@Ericson2314)
 co-authors: Las Safin (@L-as)
-shepherd-team: @tomberek, @ldesgoui, @gytis-ivaskevicius, @edolstra 
-shepherd-leader: @tomberek
+shepherd-team: "@tomberek, @ldesgoui, @gytis-ivaskevicius, @edolstra" 
+shepherd-leader: "@tomberek"
 related-issues: https://github.com/NixOS/nix/pull/4628 https://github.com/NixOS/nix/pull/5364 https://github.com/NixOS/nix/pull/4543 https://github.com/NixOS/nix/pull/3959
 ---
 
diff --git a/rfcs/0094-use-matrix-for-official-chat.md b/rfcs/0094-use-matrix-for-official-chat.md
index edccb0c..940ce43 100644
--- a/rfcs/0094-use-matrix-for-official-chat.md
+++ b/rfcs/0094-use-matrix-for-official-chat.md
@@ -1,9 +1,9 @@
 ---
 feature: use-matrix-for-official-chat
 start-date: 2020-05-19
-author: @ryantm and others
-shepherd-team: @grahamc, @joepie91, @andir, @mweinelt
-shepherd-leader: @grahamc
+author: "@ryantm and others"
+shepherd-team: "@grahamc, @joepie91, @andir, @mweinelt"
+shepherd-leader: "@grahamc"
 ---
 
 # Summary
diff --git a/rfcs/0097-no-read-store-dir.md b/rfcs/0097-no-read-store-dir.md
index e099af6..9222fd1 100644
--- a/rfcs/0097-no-read-store-dir.md
+++ b/rfcs/0097-no-read-store-dir.md
@@ -3,8 +3,8 @@ feature: nix-store-perms
 start-date: 2021-07-04
 author: Las Safin
 co-authors:
-shepherd-team: @kevincox @7c6f434c @edolstra
-shepherd-leader: @edolstra
+shepherd-team: "@kevincox @7c6f434c @edolstra"
+shepherd-leader: "@edolstra"
 related-issues:
 ---
 
diff --git a/rfcs/0102-moderation-team.md b/rfcs/0102-moderation-team.md
index b698a78..65e1baa 100644
--- a/rfcs/0102-moderation-team.md
+++ b/rfcs/0102-moderation-team.md
@@ -3,8 +3,8 @@ feature: moderation team
 start-date: 2021-08-18
 author: tomberek
 co-authors: blaggacao
-shepherd-team: @ryantm, @7c6f434c, @IreneKnapp
-shepherd-leader: @zimbatm
+shepherd-team: "@ryantm, @7c6f434c, @IreneKnapp"
+shepherd-leader: "@zimbatm"
 related-issues: https://github.com/NixOS/rfcs/pull/98
 ---
 
diff --git a/rfcs/0106-nix-release-schedule.md b/rfcs/0106-nix-release-schedule.md
index d34c17c..cb08500 100644
--- a/rfcs/0106-nix-release-schedule.md
+++ b/rfcs/0106-nix-release-schedule.md
@@ -3,8 +3,8 @@ feature: Nix release schedule
 start-date: 2021-09-23
 author: Eelco Dolstra
 co-authors: (find a buddy later to help out with the RFC)
-shepherd-team: @Ericson2314, @regnat, @Ma27, @tomberek
-shepherd-leader: @tomberek
+shepherd-team: "@Ericson2314, @regnat, @Ma27, @tomberek"
+shepherd-leader: "@tomberek"
 related-issues: N/A
 ---
 
diff --git a/rfcs/0108-nixos-containers.md b/rfcs/0108-nixos-containers.md
index 8d626d5..b4534f3 100644
--- a/rfcs/0108-nixos-containers.md
+++ b/rfcs/0108-nixos-containers.md
@@ -3,8 +3,8 @@ feature: NixOS Container rewrite
 start-date: 2021-02-14
 author: Maximilian Bosch <maximilian@mbosch.me>
 co-authors: n/a
-shepherd-team: @Mic92, @lheckemann, @SuperSandro2000, @arianvp, @Lassulus 
-shepherd-leader: @Lassulus 
+shepherd-team: "@Mic92, @lheckemann, @SuperSandro2000, @arianvp, @Lassulus" 
+shepherd-leader: "@Lassulus" 
 related-issues:
   - https://github.com/NixOS/nixpkgs/issues/69414
   - https://github.com/NixOS/nixpkgs/issues/67265
diff --git a/rfcs/0119-testing-conventions.md b/rfcs/0119-testing-conventions.md
index a8fa95d..3236f9a 100644
--- a/rfcs/0119-testing-conventions.md
+++ b/rfcs/0119-testing-conventions.md
@@ -3,10 +3,10 @@ feature: Defined conventions around testing of official Nixpkgs packages.
 start-date: 2021-12-29
 author: Jonathan Ringer
 co-authors:
-shepherd-team: @Mic92 @Artturin @kevincox
-shepherd-leader: @Mic92
+shepherd-team: "@Mic92 @Artturin @kevincox"
+shepherd-leader: "@Mic92"
 related-issues:
-  - [RFC 0088 - Nixpkgs Breaking Change Policy](https://github.com/NixOS/rfcs/pull/88)
+  - "[RFC 0088 - Nixpkgs Breaking Change Policy](https://github.com/NixOS/rfcs/pull/88)"
 ---
 
 # Summary
diff --git a/rfcs/0124-nix-mark-stale-issues.md b/rfcs/0124-nix-mark-stale-issues.md
index 05dfe7a..04baf76 100644
--- a/rfcs/0124-nix-mark-stale-issues.md
+++ b/rfcs/0124-nix-mark-stale-issues.md
@@ -3,8 +3,8 @@ feature: nix-mark-stale-issues
 start-date: 2022-04-18
 author: John Ericson (@Ericson2314)
 co-authors: (find a buddy later to help out with the RFC)
-shepherd-team: @ryantm, @nh2, @infinisil
-shepherd-leader: @ryantm
+shepherd-team: "@ryantm, @nh2, @infinisil"
+shepherd-leader: "@ryantm"
 related-issues: (will contain links to implementation PRs)
 ---
 
diff --git a/rfcs/0125-bootspec.md b/rfcs/0125-bootspec.md
index 43ffd82..c1197a1 100644
--- a/rfcs/0125-bootspec.md
+++ b/rfcs/0125-bootspec.md
@@ -3,8 +3,8 @@ feature: bootspec
 start-date: 2022-05-09
 author: Graham Christensen
 co-authors: Cole Helbling
-shepherd-team: @lheckemann, @06kellyjac, @GovanifY, @RaitoBezarius
-shepherd-leader: @lheckemann
+shepherd-team: "@lheckemann, @06kellyjac, @GovanifY, @RaitoBezarius"
+shepherd-leader: "@lheckemann"
 related-issues: https://github.com/NixOS/nixpkgs/pull/172237
 ---
 
diff --git a/rfcs/0127-issues-warnings.md b/rfcs/0127-issues-warnings.md
index a577b73..18e365e 100644
--- a/rfcs/0127-issues-warnings.md
+++ b/rfcs/0127-issues-warnings.md
@@ -3,8 +3,8 @@ feature: issues-warnings
 start-date: 2022-06-11
 author: piegames
 co-authors: —
-shepherd-team: @RaitoBezarius, @mweinelt, @infinisil
-shepherd-leader: @mweinelt
+shepherd-team: "@RaitoBezarius, @mweinelt, @infinisil"
+shepherd-leader: "@mweinelt"
 related-issues: https://github.com/NixOS/nixpkgs/pull/177272
 ---
 
diff --git a/rfcs/0130-stalled-rfcs.md b/rfcs/0130-stalled-rfcs.md
index 057ea36..9c0e901 100644
--- a/rfcs/0130-stalled-rfcs.md
+++ b/rfcs/0130-stalled-rfcs.md
@@ -3,8 +3,8 @@ feature: stalled-rfcs
 start-date: 2022-06-01
 author: kevincox
 co-authors: spacekookie
-shepherd-team: @ryantm, @tomberek, @7c6f434c 
-shepherd-leader: @ryantm
+shepherd-team: "@ryantm, @tomberek, @7c6f434c" 
+shepherd-leader: "@ryantm"
 related-issues: (will contain links to implementation PRs)
 ---
 
diff --git a/rfcs/0132-meson-builds-nix.md b/rfcs/0132-meson-builds-nix.md
index c7eac0c..247186b 100644
--- a/rfcs/0132-meson-builds-nix.md
+++ b/rfcs/0132-meson-builds-nix.md
@@ -2,9 +2,9 @@
 feature: meson_builds_nix
 start-date: 2022-08-25
 author: Anderson Torres
-co-authors: @p01arst0rm
-shepherd-team: @Ericson2314 @edolstra @thufschmitt
-shepherd-leader: @Ericson2314
+co-authors: "@p01arst0rm"
+shepherd-team: "@Ericson2314 @edolstra @thufschmitt"
+shepherd-leader: "@Ericson2314"
 related-issues:
 ---
 
diff --git a/rfcs/0136-stabilize-incrementally.md b/rfcs/0136-stabilize-incrementally.md
index 058cbea..948b4ea 100644
--- a/rfcs/0136-stabilize-incrementally.md
+++ b/rfcs/0136-stabilize-incrementally.md
@@ -3,8 +3,8 @@ feature: stabilize-incrementally
 start-date: 2022-09-15
 author: John Ericson
 co-authors: (find a buddy later to help out with the RFC)
-shepherd-team: @thufschmitt @tomberek @infinisil
-shepherd-leader: @tomberek
+shepherd-team: "@thufschmitt @tomberek @infinisil"
+shepherd-leader: "@tomberek"
 related-issues: (will contain links to implementation PRs)
 ---
 
diff --git a/rfcs/0145-doc-strings.md b/rfcs/0145-doc-strings.md
index 1b7e0a7..cb89254 100644
--- a/rfcs/0145-doc-strings.md
+++ b/rfcs/0145-doc-strings.md
@@ -3,8 +3,8 @@ feature: doc-comment-standard
 start-date: 2023-03-27
 author: hsjobeki
 co-authors: --
-shepherd-team: @DavHau; @sternenseemann; @asymmetric
-shepherd-leader: @lassulus
+shepherd-team: "@DavHau; @sternenseemann; @asymmetric"
+shepherd-leader: "@lassulus"
 related-issues: (will contain links to implementation PRs)
 ---
 
diff --git a/rfcs/0146-meta-categories.md b/rfcs/0146-meta-categories.md
index 589ce72..2ab3179 100644
--- a/rfcs/0146-meta-categories.md
+++ b/rfcs/0146-meta-categories.md
@@ -3,8 +3,8 @@ feature: Decouple filesystem from categorization
 start-date: 2023-04-23
 author: Anderson Torres (@AndersonTorres)
 co-authors:
-shepherd-team: @7c6f434c @natsukium @fgaz
-shepherd-leader: @7c6f434c
+shepherd-team: "@7c6f434c @natsukium @fgaz"
+shepherd-leader: "@7c6f434c"
 related-issues: (will contain links to implementation PRs)
 ---