diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 50eae65547..325398d28f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -15,7 +15,6 @@ body:
       description: Which component(s) does your bug report concern?
       multiple: true
       options:
-      - operator
       - collector
       - instrumentation
       - target allocator
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index 30de7c742a..c113ab14d4 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -9,7 +9,6 @@ body:
       description: Which component(s) does your feature request concern?
       multiple: true
       options:
-      - operator
       - collector
       - instrumentation
       - target allocator
diff --git a/.github/ISSUE_TEMPLATE/other.yaml b/.github/ISSUE_TEMPLATE/other.yaml
index d7be8e0b0f..40340c6de5 100644
--- a/.github/ISSUE_TEMPLATE/other.yaml
+++ b/.github/ISSUE_TEMPLATE/other.yaml
@@ -9,7 +9,6 @@ body:
       description: Which component(s) does your issue concern?
       multiple: true
       options:
-      - operator
       - collector
       - instrumentation
       - target allocator
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 23b91eeeed..bdef89424d 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -2,7 +2,9 @@
 <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
 Ex. Adding a feature - Explain what this achieves.-->
 
-**Link to tracking Issue:** <Issue number if applicable>
+**Link to tracking Issue(s):** <Issue number if applicable>
+
+- Resolves: #issue-number
 
 **Testing:** <Describe what testing was performed and which tests were added.>