diff --git a/.github/DISCUSSION_TEMPLATE/community-pr-proposals.yml b/.github/DISCUSSION_TEMPLATE/community-pr-proposals.yml
deleted file mode 100644
index ac778935b1..0000000000
--- a/.github/DISCUSSION_TEMPLATE/community-pr-proposals.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Welcome to the Bitwarden clients repo! As an open source project, Bitwarden is built in part by you—the community! To learn how to submit a pull request for consideration, please review [https://contributing.bitwarden.com/](https://contributing.bitwarden.com/) and share your proposal in the [Community PR Proposals](https://github.com/orgs/bitwarden/discussions/categories/community-pr-proposals) category. To keep discussion on topic, posts that do not include a specific PR proposal (for a code contribution you wish to develop) will be removed. For feature requests and community discussion, please visit https://community.bitwarden.com/
-  - type: textarea
-    attributes:
-      label: Code Contribution Proposal
-      description: "Please share details about the PR you would like to work on. Be sure to include a description of your proposed contribution, screenshots, and links to any relevant [feature requests](https://community.bitwarden.com/c/feature-requests/5/none). This helps get feedback from the community and Bitwarden team members before you start writing code"
-    validations:
-      required: true
diff --git a/.github/DISCUSSION_TEMPLATE/password-manager.yml b/.github/DISCUSSION_TEMPLATE/password-manager.yml
new file mode 100644
index 0000000000..fedf4f5734
--- /dev/null
+++ b/.github/DISCUSSION_TEMPLATE/password-manager.yml
@@ -0,0 +1,14 @@
+body:
+
+- type: markdown attributes: value: | If you would like to contribute code to the Bitwarden codebase
+  for consideration, please review
+  [https://contributing.bitwarden.com/](https://contributing.bitwarden.com/) before posting. To keep
+  discussion on topic, posts that do not include a proposal for a code contribution you wish to
+  develop will be removed. For feature requests and community discussion, please visit
+  https://community.bitwarden.com/
+- type: textarea attributes: label: Code Contribution Proposal description: "Please include a
+  description of the code contribution you would like to contribute, including any relevant
+  screenshots, and links to any existing
+  [feature requests](https://community.bitwarden.com/c/feature-requests/5/none). This helps get
+  feedback from the community and Bitwarden team members before you start writing code" validations:
+  required: true