diff --git a/.github/license_template.txt b/.github/license_template.txt
index 49875491..b43bb9dc 100644
--- a/.github/license_template.txt
+++ b/.github/license_template.txt
@@ -1,13 +1,2 @@
-Copyright (c) 2024 Intel Corporation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
+Copyright (C) 2024 Intel Corporation
+SPDX-License-Identifier: Apache-2.0
\ No newline at end of file
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index e79b9686..7a1fa9e6 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,15 +1,23 @@
-## Type of Change
+## Description
 
-feature or bug fix or documentation or validation or others
+The summary of the proposed changes as long as the relevant motivation and context.
 
-## Description
+## Issues
+
+List the issue or RFC link this PR is working on. If there is no such link, please mark it as `n/a`.
+
+## Type of change
+
+List the type of change like below. Please delete options that are not relevant.
 
-detail description
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds new functionality)
+- [ ] Breaking change (fix or feature that would break existing design and interface)
 
-## How has this PR been tested?
+## Dependencies
 
-how to reproduce the test (including hardware information)
+List the newly introduced 3rd party dependency if exists.
 
-## Dependency Change?
+## Tests
 
-any library dependency introduced or removed
+Describe the tests that you ran to verify your changes.