diff --git a/.github/code-owners.yml b/.github/code-owners.yml
index a3799b6733..b49b0d5df4 100644
--- a/.github/code-owners.yml
+++ b/.github/code-owners.yml
@@ -1,123 +1,124 @@
 "component: api [C++]":
-  - "narendasan"
+    - "narendasan"
 
 "component: api [Python]":
-  - "gs-olive"
-  - "peri044"
+    - "narendasan"
+    - "zewenli98"
 
 "component: api":
-  - "narendasan"
+    - "narendasan"
 
 "component: build system":
-  - "narendasan"
+    - "narendasan"
+    - "lanluo-nvidia"
 
 "component: conversion":
-  - "apbose"
-  - "peri044"
+    - "apbose"
+    - "peri044"
 
 "component: converters":
-  - "apbose"
-  - "zewenli98"
+    - "apbose"
+    - "zewenli98"
 
 "component: core":
-  - "narendasan"
-  - "peri044"
-  - "bowang007"
+    - "narendasan"
+    - "zewenli98"
+    - "cehongwang"
 
 "component: dynamo":
-  - "narendasan"
-  - "gs-olive"
-  - "peri044"
+    - "narendasan"
+    - "zewenli98"
+    - "cehongwang"
 
 "component: evaluators":
-  - "narendasan"
-  - "peri044"
+    - "zewenli98"
+    - "apbose"
 
 "component: execution":
-  - "narendasan"
+    - "narendasan"
 
 "component: lowering":
-  - "peri044"
-  - "gs-olive"
+    - "zewenli98"
+    - "cehongwang"
 
 "component: partitioning":
-  - "bowang007"
-  - "peri044"
+    - "bowang007"
+    - "cehongwang"
 
 "component: plugins":
-  - "peri044"
+    - "narendasan"
+    - "bowang007"
 
 "component: quantization":
-  - "peri044"
-  - "bowang007"
+    - "zewenli98"
+    - "lanluo-nvidia"
 
 "component: runtime":
-  - "narendasan"
+    - "narendasan"
+    - "cehongwang"
 
 "component: tests":
-  - "narendasan"
+    - "lanluo-nvidia"
 
 "component: torch_compile":
-  - "gs-olive"
-  - "narendasan"
+    - "zewenli98"
+    - "narendasan"
 
 "component: torchtrtc":
-  - "narendasan"
+    - "narendasan"
 
 "component: dependencies":
-  # Work RE: upgrading dependencies in the compiler / testing new versions
-  - "peri044"
-  - "bowang007"
-  - "narendasan"
+    # Work RE: upgrading dependencies in the compiler / testing new versions
+    - "lanluo-nvidia"
+    - "narendasan"
 
 "documentation":
-  - "narendasan"
+    - "narendasan"
 
 "examples":
-  # Sample applications and notebooks on how to use TorchTRT features
-  - "peri044"
-  - "tanayvarshney"
+    # Sample applications and notebooks on how to use TorchTRT features
+    - "narendasan"
 
 "infrastructre":
-  - "narendasan"
+    - "narendasan"
+    - "lanluo-nvidia"
 
 "component: packaging":
-  - "narendasan"
-  - "peri044"
+    - "narendasan"
+    - "lanluo-nvidia"
 
 "channel: NGC":
-  - "peri044"
+    - "apbose"
+    - "lanluo-nvidia"
 
 "channel: linux-x86":
-  - "narendasan"
-  - "peri044"
+    - "narendasan"
+    - "lanluo-nvidia"
 
 "channel: linux-sbsa":
-  - "bowang007"
+    - "narendasan"
+    - "lanluo-nvidia"
 
 "channel: windows":
-  - "narendasan"
+    - "lanluo-nvidia"
 
 "channel: linux-jetpack":
-  - "narendasan"
-  - "bowang007"
+    - "narendasan"
+    - "lanluo-nvidia"
 
 "component: tooling":
-  - "narendasan"
+    - "narendasan"
 
 "performance":
-  - "peri044"
-  - "bowang007"
+    - "cehongwang"
+    - "bowang007"
 
 "channel: docker":
-  - "narendasan"
+    - "narendasan"
 
 "ux":
-  # Issues related to the user experience including debugging and installation
-  - "narendasan"
-  - "peri044"
+    # Issues related to the user experience including debugging and installation
+    - "narendasan"
 
 "component: fx":
-  - "frank-wei"
-  - "yinghai"
-  - "wushirong"
+    - "narendasan"
diff --git a/.github/pr-labels.yml b/.github/pr-labels.yml
index e07cb3f500..c54442f00d 100644
--- a/.github/pr-labels.yml
+++ b/.github/pr-labels.yml
@@ -1,55 +1,57 @@
 "component: torchtrtc":
-  - cpp/torchtrtc/**/*
+    - cpp/torchtrtc/**/*
 
 "component: api [C++]":
-  - cpp/**/*
+    - cpp/**/*
 
 "component: api [Python]":
-  - py/**/*
+    - py/**/*
 
 "component: core":
-  - core/**/*
+    - core/**/*
+    - py/torch_tensorrt/dynamo/**/*
 
 "component: conversion":
-  - core/conversion/**/*
-  - py/torch_tensorrt/dynamo/conversion/**/*
-  
+    - core/conversion/**/*
+    - py/torch_tensorrt/dynamo/conversion/**/*
+
 "component: converters":
-  - core/conversion/converters/**/*
-  - py/torch_tensorrt/dynamo/conversion/impl/**/*
+    - core/conversion/converters/**/*
+    - py/torch_tensorrt/dynamo/conversion/impl/**/*
 
 "component: evaluators":
-  - core/conversion/evaluators/**/*
+    - core/conversion/evaluators/**/*
 
 "component: fx":
-  - py/torch_tensorrt/fx/**/*
+    - py/torch_tensorrt/fx/**/*
 
 "component: dynamo":
-  - py/torch_tensorrt/dynamo/**/*
+    - py/torch_tensorrt/dynamo/**/*
 
 "component: torch_compile":
-  - py/torch_tensorrt/dynamo/backend/*
+    - py/torch_tensorrt/dynamo/backend/*
 
 "component: partitioning":
-  - core/partitioning/**/*
+    - core/partitioning/**/*
 
 "component: runtime":
-  - core/runtime/**/*
-  - py/torch_tensorrt/dynamo/runtime/**/*
+    - core/runtime/**/*
+    - py/torch_tensorrt/dynamo/runtime/**/*
 
 "component: lowering":
-  - core/lowering/**/*
-  - py/torch_tensorrt/dynamo/lowering/**/*
+    - core/lowering/**/*
+    - py/torch_tensorrt/dynamo/lowering/**/*
 
 "component: tests":
-  - tests/**/*
+    - tests/**/*
 
 "component: build system":
-  - WORKSPACE
-  - BUILD
-  - pyproject.toml
-  - setup.py
+    - MODULE.bazel
+    - BUILD
+    - pyproject.toml
+    - setup.py
+    - toolchain/**/*
 
 "documentation":
-  - docs/**/*
-  - docsrc/**/*
+    - docs/**/*
+    - docsrc/**/*