diff --git a/.github/ISSUE_TEMPLATE/1_Software_Suggestion.md b/.github/ISSUE_TEMPLATE/1_Software_Suggestion.md
index 61501f0f..6da46aa1 100644
--- a/.github/ISSUE_TEMPLATE/1_Software_Suggestion.md
+++ b/.github/ISSUE_TEMPLATE/1_Software_Suggestion.md
@@ -24,4 +24,4 @@ labels: 🆕 software suggestion
 
 <!-- Are you the author? Enthustiastic or early adopter? Friends with the author or requested by them to open the isue? An employee of the software maker? -->
 
-- [ ] I will keep the issue up-to-date if something I have said changes or I remember a connection with the software.
+- [ ] I will keep the issue up-to-date if something I have said changes or I remember a connection with the software.
diff --git a/.github/ISSUE_TEMPLATE/2_Software_Removal.md b/.github/ISSUE_TEMPLATE/2_Software_Removal.md
index 0271c959..d806a6a6 100644
--- a/.github/ISSUE_TEMPLATE/2_Software_Removal.md
+++ b/.github/ISSUE_TEMPLATE/2_Software_Removal.md
@@ -18,4 +18,4 @@ labels: ❌ software removal
 
 <!-- Are you the author? Competitor? Just hating the software with passsion for some reason? -->
 
-- [ ] I will keep the issue up-to-date if something I have said changes or I remember a connection with the software.
+- [ ] I will keep the issue up-to-date if something I have said changes or I remember a connection with the software.
diff --git a/.github/ISSUE_TEMPLATE/3_Discussion.md b/.github/ISSUE_TEMPLATE/3_Discussion.md
deleted file mode 100644
index dc53ae9e..00000000
--- a/.github/ISSUE_TEMPLATE/3_Discussion.md
+++ /dev/null
@@ -1,13 +0,0 @@
-<!--
-    Is there already a discussion about this on the forum (https://forum.privacytools.io/search)?
-    If not, please open a new discussion there. Thank you!
--->
-
----
-name: "💬 Discussion"
-about: Discuss the website or any mentioned software in general.
-title: "💬 Discussion | "
-labels: 💬 discussion, feedback wanted
----
-
-<!-- Remember to stay civil! -->
diff --git a/.github/ISSUE_TEMPLATE/4_Feature.md b/.github/ISSUE_TEMPLATE/3_Feature_Suggestion.md
similarity index 65%
rename from .github/ISSUE_TEMPLATE/4_Feature.md
rename to .github/ISSUE_TEMPLATE/3_Feature_Suggestion.md
index eaa2058f..a56baa49 100644
--- a/.github/ISSUE_TEMPLATE/4_Feature.md
+++ b/.github/ISSUE_TEMPLATE/3_Feature_Suggestion.md
@@ -1,9 +1,8 @@
 ---
 name: "✨ Feature Suggestion"
-about: Suggest a new feature for the website.
+about: Suggest a new feature/section/page for the website.
 title: "✨ Feature Suggestion | "
 labels: ✨ enhancement
 ---
 
 ## Description
-
diff --git a/.github/ISSUE_TEMPLATE/6_Translation_Issues.md b/.github/ISSUE_TEMPLATE/4_Translation_Issues.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/6_Translation_Issues.md
rename to .github/ISSUE_TEMPLATE/4_Translation_Issues.md
diff --git a/.github/ISSUE_TEMPLATE/5_Website_Issues.md b/.github/ISSUE_TEMPLATE/5_Website_Issues.md
index 7319d06d..6987078f 100644
--- a/.github/ISSUE_TEMPLATE/5_Website_Issues.md
+++ b/.github/ISSUE_TEMPLATE/5_Website_Issues.md
@@ -1,10 +1,19 @@
 ---
 name: "🌐 Website Issue"
-about: Report an issue with the website.
+about: Report a bug with the website.
 title: "🌐 Website Issue | "
 labels: 🌐 website issue
 ---
 
+<!--
+
+READ ME FIRST:
+This is NOT the place to request changes to the content of the website.
+This is NOT the place to report issues with our services. (That is https://github.com/privacytoolsIO/services/issues/new)
+This is ONLY for reporting bugs or technical issues with www.privacytools.io.
+
+-->
+
 ## Description
 
 <!--
diff --git a/.github/ISSUE_TEMPLATE/7_DNS_provider.md b/.github/ISSUE_TEMPLATE/7_DNS_provider.md
deleted file mode 100644
index 1a4d857d..00000000
--- a/.github/ISSUE_TEMPLATE/7_DNS_provider.md
+++ /dev/null
@@ -1,47 +0,0 @@
----
-name: "🗄️ encrypted DNS provider suggestion"
-about: Suggest a new encrypted DNS provider.
-title: "🗄️ DNS provider suggestion | "
-labels: 🌐 website issue, 🗄️ DNS
----
-
-<!-- Please feel free to overwrite these comments -->
-
-## Basic Information
-
-**Name:** 
-**Filtering:** <!-- What is being filtered? Is it opt-in with separate address or not? -->
-**Privacy policy:** <!-- Link, especially when there is logging -->
-**Protocols:** <!-- at least DoH or DoT? DNSCrypt? -->
-**Server/Location:** <!-- Where is the provider based? Where are their servers located? Anycast if there are multiple servers answering to the same address -->
-**Source:** <!-- link to the source code, preferred, but optional -->
-**Type:** <!-- Non-profit, commercial, hobby project? -->
-**Website:** 
-
-## Description
-
-<!-- Why should we list your suggestion? Anything else, that you wish us to know? -->
-
-
-### Required features:
-
-<!-- DoH and DoT are supported natively by platforms like Firefox and Android 9+ -->
-
-* [ ] supports DoH or DoT <!-- We love DNSCrypt, but there is already https://github.com/DNSCrypt/dnscrypt-resolvers which is directly supported by dnscrypt-proxy, so we don't consider useful to list providers only supporting it.  -->
-* [ ] supports DNSSEC <!--  https://dnssec.vs.uni-due.de/ can test your current DNS provider. -->
-* [ ] doesn't log IP addresses during normal operation <!-- If your suggestion logs, please compare its privacy policy with other servers on our table that keep logs. -->
-
-#### Desired features
-
-* [ ] supports QNAME minimization <!-- if you have access to the dig command run `dig +short txt qnamemintest.internet.nl` or `Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl` if you are on Windows 10 -->
-
-## Why I am making the suggestion
-
-<!-- Anything you would like to tell us about the software? -->
-
-
-## My connection with the software
-
-<!-- Are you the author? Enthustiastic or early adopter? Friends with the author or requested by them to open the isue? An employee of the software maker? -->
-
-- [ ] I will keep the issue up-to-date if something I have said changes or I remember a connection with the software.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..b0fba705
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,7 @@
+contact_links:
+  - name: Services issues
+    url: https://github.com/privacytoolsIO/services/issues/new/choose
+    about: Open any issues/bug reports/requests related to our services (Mastodon, Matrix, etc) here.
+  - name: PrivacyTools Community
+    url: https://forum.privacytools.io/
+    about: Please ask any generic questions on our forum.