diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3ea3b1f6ee0..b858b0c59cf 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -693,8 +693,8 @@ peps/pep-0813.rst  @warsaw @ericvsmith
 peps/pep-0814.rst  @vstinner @corona10
 peps/pep-0815.rst  @emmatyping
 peps/pep-0816.rst  @brettcannon
-peps/pep-0817.rst  @warsaw @dstufft
-peps/pep-0817/     @warsaw @dstufft
+peps/pep-0817.rst  @warsaw @dstufft @rgommers
+peps/pep-0817/     @warsaw @dstufft @rgommers
 peps/pep-0818.rst  @hoodmane @ambv
 peps/pep-0819.rst  @emmatyping
 peps/pep-0820.rst  @encukou
@@ -702,7 +702,8 @@ peps/pep-0821.rst  @JelleZijlstra
 peps/pep-0822.rst  @methane
 peps/pep-0823.rst  @gvanrossum
 peps/pep-0824.rst  @gvanrossum
-peps/pep-0825.rst  @warsaw @dstufft
+peps/pep-0825/     @warsaw @dstufft @rgommers
+peps/pep-0825.rst  @warsaw @dstufft @rgommers
 peps/pep-0826.rst  @savannahostrowski
 peps/pep-0827.rst  @1st1
 peps/pep-0828.rst  @ZeroIntensity