diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..e263929d
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,2 @@
+# Define owners for all files in the repository
+*       @ericbuckley @alhayward @cbrinson-rise8 @derekadombek
diff --git a/.github/ISSUE_TEMPLATE/1-task.md b/.github/ISSUE_TEMPLATE/1-task.md
index 1162a0a8..38724697 100644
--- a/.github/ISSUE_TEMPLATE/1-task.md
+++ b/.github/ISSUE_TEMPLATE/1-task.md
@@ -31,7 +31,7 @@ List any dependencies this issue has, such as other tasks, libraries, or third-p
 ## Testing Considerations
 Explain how this feature will be tested. Mention if there are any specific test cases to be written or existing ones to be modified.
 
-## Related EPICs/Issues/PRs
+## Related Issues/PRs
 - Link to related issues or pull requests if applicable.
 
 ## Notes / Comments