diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b37a1054..dcb089f7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,7 +3,7 @@
 * @edwarddavidbaker
 
 # TMA and Atom TMA.
-TMA_Metrics* @ayasini @vdaneti
+TMA_Metrics* @anton-hanna @vdaneti
 Atom_TMA* @claudiaromo @rpmclaug
 E-core_TMA* @claudiaromo @rpmclaug
 
@@ -14,10 +14,10 @@ E-core_TMA* @claudiaromo @rpmclaug
 **/events @edwarddavidbaker @kshiprab
 
 # Create Perf JSON scripting. 
-scripts/create_perf_json.py @captain5050 @kliang2
-scripts/metric.py @captain5050 @kliang2
-scripts/config/perf*.csv @captain5050 @kliang2
-scripts/unittesting/metric_test.py @captain5050 @kliang2
+scripts/create_perf_json.py @captain5050 @tlfalcon @dapeng-mi
+scripts/metric.py @captain5050 @tlfalcon @dapeng-mi
+scripts/config/perf*.csv @captain5050 @tlfalcon @dapeng-mi
+scripts/unittesting/metric_test.py @captain5050 @tlfalcon @dapeng-mi
 
 # Perf converter scripting.
 scripts/perf_format_converter.py @1perrytaylor @calebbiggers