diff --git a/.github/ISSUE_TEMPLATE/3-bug-report.md b/.github/ISSUE_TEMPLATE/2-bug-report.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/3-bug-report.md
rename to .github/ISSUE_TEMPLATE/2-bug-report.md
diff --git a/.github/ISSUE_TEMPLATE/2-faq-report.md b/.github/ISSUE_TEMPLATE/2-faq-report.md
deleted file mode 100644
index 531d263d7f..0000000000
--- a/.github/ISSUE_TEMPLATE/2-faq-report.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-name: "📚 Outdated FAQ"
-about: Report an issue in FAQ
----
-
-🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
-
-Please do not file FAQ issues on the GitHub issues tracker.
-
-Instead use the [Google group](https://groups.google.com/forum/#!forum/osmand) to fix wrong or outdated FAQ.
-
-🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
diff --git a/.github/ISSUE_TEMPLATE/4-routing-report.md b/.github/ISSUE_TEMPLATE/3-routing-report.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/4-routing-report.md
rename to .github/ISSUE_TEMPLATE/3-routing-report.md
diff --git a/.github/ISSUE_TEMPLATE/5-feature-request.md b/.github/ISSUE_TEMPLATE/4-feature-request.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/5-feature-request.md
rename to .github/ISSUE_TEMPLATE/4-feature-request.md
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..7410b26a46
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,4 @@
+contact_links:
+  - name: Outdated FAQ
+  - url: https://groups.google.com/forum/#!forum/osmand
+  - about: Fix wrong or outdated FAQ on the forum instead