diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
index 99c18fc16..b133f872e 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -1,5 +1,5 @@
 name: Bug Report
-description: Report a bug encountered while operating helm
+description: Report a bug encountered in Helm
 labels: kind/bug
 body:
   - type: textarea
@@ -49,32 +49,10 @@ body:
   - type: textarea
     id: cloudProvider
     attributes:
-      label: Cloud provider
+      label: Cloud provider/platform (AKS, GKE, Minikube etc.)
       value: |
         <details>
 
         </details>
     validations:
       required: true
-
-  - type: textarea
-    id: osVersion
-    attributes:
-      label: OS version
-      value: |
-        <details>
-
-        ```console
-        # On Linux:
-        $ cat /etc/os-release
-        # paste output here
-        $ uname -a
-        # paste output here
-
-        # On Windows:
-        C:\> wmic os get Caption, Version, BuildNumber, OSArchitecture
-        # paste output here
-        ```
-
-        </details>
-
diff --git a/.github/ISSUE_TEMPLATE/documentation.yaml b/.github/ISSUE_TEMPLATE/documentation.yaml
index 32ddd8cac..bb1b7537c 100644
--- a/.github/ISSUE_TEMPLATE/documentation.yaml
+++ b/.github/ISSUE_TEMPLATE/documentation.yaml
@@ -2,12 +2,19 @@ name: Documentation
 description: Report any mistakes or missing information from the documentation or the examples
 labels: kind/documentation
 body:
+  - type: markdown
+    attributes:
+      value: |
+        ⚠️ **Note**: Most documentation lives in [helm/helm-www](https://github.com/helm/helm-www).
+        If your issue is about Helm website documentation or examples, please [open an issue there](https://github.com/helm/helm-www/issues/new/choose).
+
   - type: textarea
     id: feature
     attributes:
       label: What would you like to be added?
       description: |
         Link to the issue (please include a link to the specific documentation or example).
+        Link to the issue raised in [Helm Documentation Improvement Proposal](https://github.com/helm/helm-www)
     validations:
       required: true
 
@@ -17,3 +24,4 @@ body:
       label: Why is this needed?
     validations:
       required: true
+
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index a4dfef621..45b9c3f94 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -1,4 +1,4 @@
-name: Enhancement Tracking Issue
+name: Enhancement/feature
 description: Provide supporting details for a feature in development
 labels: kind/feature
 body:
@@ -8,7 +8,8 @@ body:
       label: What would you like to be added?
       description: |
         Feature requests are unlikely to make progress as issues.
-        A proposal that works through the design along with the implications of the change can be opened as a KEP.
+        Initial discussion and ideas can happen on an issue.
+        But significant changes or features must be proposed as a [Helm Improvement Proposal](https://github.com/helm/community/blob/main/hips/hip-0001.md) (HIP)
     validations:
       required: true