diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..7f6fb3c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,9 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Have a Question? Join our Discord!
+    url: https://discord.com/invite/r6Mdz5dpFc
+    about: Join our discord server for real-time answers and more!
+discussions:
+  - name: Want to Suggest a Port? Raise a Discussion Here!
+    url: https://github.com/catppuccin/catppuccin/discussions/new?category=port-requests
+    about: Make your port requests here!
diff --git a/.github/ISSUE_TEMPLATE/org-wide-issue.md b/.github/ISSUE_TEMPLATE/org-wide-issue.md
new file mode 100644
index 0000000..2975e5f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/org-wide-issue.md
@@ -0,0 +1,8 @@
+---
+name: Org-Wide Issue
+about: Report your issues with the Catppuccin Organisation here!
+title: ''
+labels: meta
+assignees: ''
+
+---
diff --git a/.github/ISSUE_TEMPLATE/port-request.md b/.github/ISSUE_TEMPLATE/port-request.md
deleted file mode 100644
index a405c66..0000000
--- a/.github/ISSUE_TEMPLATE/port-request.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Port request
-about: Suggest an app to port the theme to
-title: App
-labels: port request
-assignees: ''
-
----
-
-**Are you available to help in the creation of this port? 😄 (optional)**
-Yes/No/Maybe
-
-**Additional context 📷 (optional)**
-Add any other context or screenshots about the port request here.
diff --git a/docs/contributing.md b/docs/contributing.md
index 5ffcb0c..2fa964a 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -72,4 +72,11 @@ Since Catppuccin is available in 4 palettes it's understandable that it may not
 
 ### Submission
 
-Open an issue under the main repo and fill out the information requested on the "[port request](https://github.com/catppuccin/catppuccin/issues/new?assignees=&labels=port+request&template=port-request.md&title=App)". It's recommended to also share the port in our [Discord server](https://discord.gg/r6Mdz5dpFc) beforehand so that other members of the community can give their opinion on it and hopefully improve it.
+Raise a discussion under main repository [here!](https://github.com/catppuccin/catppuccin/discussions/new?category=port-requests) 
+The title should be the **simplest** name of the application/tool/website in **lower-kebab-case** that you are wanting ported over.
+E.g. **NeoVim** -> **neovim** 
+
+If you have already created a repository containing the work, make sure to include it within the description for others to see! Feel free to join our [Discord](https://discord.com/invite/r6Mdz5dpFc) and share it there too!
+
+The discussion will be transferred to an issue once the [staff team](https://github.com/orgs/catppuccin/teams/staff/members) 
+have deemed the port ready to be reviewed and merged!