diff --git a/.github/ISSUE_TEMPLATE/01-bug.yml b/.github/ISSUE_TEMPLATE/01-bug.yml
index a26f90e49..a194fc4b6 100644
--- a/.github/ISSUE_TEMPLATE/01-bug.yml
+++ b/.github/ISSUE_TEMPLATE/01-bug.yml
@@ -51,12 +51,14 @@ body:
       description: |
         examples: 
           - **OS**: MacOS 26 Beta 1
-          - **Swift**: Apple Swift version 6.2
-          - **Xcode**: Xcode 26 Beta 17A5241e
+          - **swift**: Apple Swift version 6.2
+          - **xcode**: Xcode 26 Beta 17A5241e
+          - **container**: container CLI version 0.1.0
       value: |
         - OS: 
-        - Swift: 
-        - Xcode: 
+        - swift: 
+        - xcode: 
+        - container: 
       render: markdown
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/02-feature.yml b/.github/ISSUE_TEMPLATE/02-feature.yml
index cb8b3fccb..ba1548b59 100644
--- a/.github/ISSUE_TEMPLATE/02-feature.yml
+++ b/.github/ISSUE_TEMPLATE/02-feature.yml
@@ -1,5 +1,5 @@
-name: Feature request
-description: File a request for a feature
+name: Feature or Enhancement request
+description: File a request for a feature or enhancement
 title: "[Request]: "
 labels: ["feature", "triage"]
 body:
@@ -18,8 +18,8 @@ body:
   - type: textarea
     id: request
     attributes:
-      label: Feature request details
-      description: Describe your proposed feature. Code samples that show what's missing, or what new capabilities will be possible, are very helpful! Provide links to existing issues or external references/discussions, if appropriate.
+      label: Feature or enhancement request details
+      description: Describe your proposed feature or enhancement. Code samples that show what's missing, or what new capabilities will be possible, are very helpful! Provide links to existing issues or external references/discussions, if appropriate.
     validations:
       required: true
   - type: checkboxes
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 3ba13e0ce..80658184d 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1 +1,5 @@
 blank_issues_enabled: false
+contact_links:
+  - name: container community support
+    url: https://github.com/apple/container/discussions
+    about: Please ask and answer questions here.