diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f66ee75a06f4..895d8622c6ae 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,14 +1,14 @@
 # See https://help.github.com/articles/about-codeowners/
 # for more info about CODEOWNERS file
 
-* @shajrawi @gshtras @maleksan85
+* @shajrawi @gshtras @maleksan85 @sunway513
 
-/csrc/ @charlifu @mawong-amd @shajrawi @gshtras @maleksan85
-/vllm/ @charlifu @mawong-amd @shajrawi @gshtras @maleksan85
+/csrc/ @charlifu @mawong-amd @shajrawi @gshtras @maleksan85 @sunway513
+/vllm/ @charlifu @mawong-amd @shajrawi @gshtras @maleksan85 @sunway513
 
-fused_moe @divakar-amd @shajrawi @gshtras @maleksan85
+fused_moe @divakar-amd @shajrawi @gshtras @maleksan85 @sunway513
 
-/tests/ @Alexei-V-Ivanov-AMD @shajrawi @gshtras @maleksan85
-/.buildkite/ @Alexei-V-Ivanov-AMD @shajrawi @gshtras @maleksan85
+/tests/ @Alexei-V-Ivanov-AMD @shajrawi @gshtras @maleksan85 @sunway513
+/.buildkite/ @Alexei-V-Ivanov-AMD @shajrawi @gshtras @maleksan85 @sunway513
 
-/benchmarks/profiling @AdrianAbeyta @dllehr-amd @shajrawi @gshtras @maleksan85
+/benchmarks/profiling @AdrianAbeyta @dllehr-amd @shajrawi @gshtras @maleksan85 @sunway513
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index a20c5baf895c..9f4cc9233886 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,3 @@
-FILL IN THE PR DESCRIPTION HERE
+Please direct your PRs to the upstream vllm (https://github.com/vllm-project/vllm.git)
 
-FIX #xxxx (*link existing issues this PR will resolve*)
-
-<!--- pyml disable-next-line no-emphasis-as-heading -->
-**BEFORE SUBMITTING, PLEASE READ <https://docs.vllm.ai/en/latest/contributing/overview.html>**
+Accepting PRs into the ROCm fork (https://github.com/ROCm/vllm) will require a clear previously communicated exception