diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7d26f8b526c3a0..0928f051d5148a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -80,9 +80,10 @@ Tools/patchcheck/             @AA-Turner
 # ----------------------------------------------------------------------------
 
 # Autotools
-configure*                       @erlend-aasland @corona10 @AA-Turner
-Makefile.pre.in                  @erlend-aasland @AA-Turner
-Modules/Setup*                   @erlend-aasland @AA-Turner
+configure*                       @erlend-aasland @corona10 @AA-Turner @emmatyping
+Makefile.pre.in                  @erlend-aasland @AA-Turner @emmatyping
+Modules/Setup*                   @erlend-aasland @AA-Turner @emmatyping
+Modules/makesetup                @emmatyping
 Tools/build/regen-configure.sh   @AA-Turner
 
 
@@ -157,16 +158,16 @@ Lib/_osx_support.py           @python/macos-team
 Lib/test/test__osx_support.py @python/macos-team
 
 # WebAssembly
-Tools/wasm/README.md          @brettcannon @freakboy3742
+Tools/wasm/README.md          @brettcannon @freakboy3742 @emmatyping
 
 # WebAssembly (Emscripten)
-Tools/wasm/config.site-wasm32-emscripten  @freakboy3742
-Tools/wasm/emscripten                     @freakboy3742
+Tools/wasm/config.site-wasm32-emscripten  @freakboy3742 @emmatyping
+Tools/wasm/emscripten                     @freakboy3742 @emmatyping
 
 # WebAssembly (WASI)
-Tools/wasm/wasi-env           @brettcannon
-Tools/wasm/wasi.py            @brettcannon
-Tools/wasm/wasi               @brettcannon
+Tools/wasm/wasi-env           @brettcannon @emmatyping
+Tools/wasm/wasi.py            @brettcannon @emmatyping
+Tools/wasm/wasi               @brettcannon @emmatyping
 
 # Windows
 PC/                           @python/windows-team
@@ -603,9 +604,9 @@ Lib/test/test_zipfile/_path/  @jaraco
 Lib/zipfile/_path/            @jaraco
 
 # Zstandard
-Lib/compression/zstd/         @AA-Turner
-Lib/test/test_zstd.py         @AA-Turner
-Modules/_zstd/                @AA-Turner
+Lib/compression/zstd/         @AA-Turner @emmatyping
+Lib/test/test_zstd.py         @AA-Turner @emmatyping
+Modules/_zstd/                @AA-Turner @emmatyping
 
 # ----------------------------------------------------------------------------