diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 2953cbd73..92957f2a6 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,16 +1,8 @@
 [//]: # (SPDX-License-Identifier: CC-BY-4.0)
-[//]: # (TODO Customize PR template)
-
-[//]: # (See https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository )
-
 <!-- Please give a brief explanation of the purpose of this pull request. -->
 
 <!-- Does this PR resolve any issue?  If so, please reference it using automatic-closing keywords like "Fixes #123." -->
 
 <!-- Any PR adding a new feature is expected to contain a test; the test should be part of CI testing, preferably within the ".github/workflows" directory tree. Please add an explanation to the PR if/when (why) this cannot be done. -->
 
-<!-- Please answer the following questions to help manage version and changes across projects. -->
-
-* [ ] Does this PR change the input/output behaviour of a cryptographic algorithm (i.e., does it change known answer test values)?  (If so, a version bump will be required from *x.y.z* to *x.(y+1).0*.)
-
-<!-- Once your pull request is ready for review and passing continuous integration tests, please convert from a draft PR to a normal PR, and request a review from one of the OQS core team members. -->
\ No newline at end of file
+<!-- Once your pull request is ready for review and passing continuous integration tests, please convert from a draft PR to a normal PR, and request a review. -->
diff --git a/CODEOWNERS b/CODEOWNERS
index 2e052fdcc..1f6576922 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,8 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-# TODO Update code owners
-
 # Last matching pattern has precedence
 
 # Default owner
-* @pq-code-package/pqcp-hackers
-  
\ No newline at end of file
+* @pq-code-package/pqcp-embedded-maintainers-aarch64
+