diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index ac79a295b5..d69678c7ac 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -1,6 +1,7 @@
-name: 🐛 Bug Report 
+name: 🐛 Bug Report
 description: Report a reproducible bug or regression in DBeaver
-labels: [bug, wait for review]
+labels: [wait for review]
+type: Bug
 body:
   - type: markdown
     attributes:
@@ -11,7 +12,7 @@ body:
     attributes:
       label: Description
       description: |
-        Describe the issue you are experiencing. 
+        Describe the issue you are experiencing.
         Attach log files if possible ([read how to provide log files on our wiki](https://github.com/dbeaver/dbeaver/wiki/Log-files))
       placeholder: |
         Please enter a description of the issue. Here you can also attach log files, screenshots or a video
@@ -37,9 +38,9 @@ body:
     id: database-driver
     attributes:
       label: Database and driver
-      description: | 
+      description: |
         What database and driver do you use?
-        You can check it in the connection settings dialog. 
+        You can check it in the connection settings dialog.
       placeholder: |
         Example:
         1. Database name and version: PostgreSQL 14.0
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 6e5e2afd40..20a5ec1ebe 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
-contact_links: 
+contact_links:
   - name: How to extract log files from DBeaver
     url: https://github.com/dbeaver/dbeaver/wiki/Log-files
     about: Common things you should know before creating a bug report.
@@ -9,6 +9,6 @@ contact_links:
   - name: Learn how to use DBeaver effectively with our tutorial videos
     url: https://www.youtube.com/channel/UC-yOjsQLSaJVEghg6UB3N7A
     about: Subscribe to our youtube channel and watch new tutorials every week
-  - name: Follow us on the Facebook
-    url: https://www.facebook.com/DBeaverCorporation
-    about: Get everyday tips, detailed manuals, and DBeaver feature overviews.
+  - name: Follow us on X (ex. Twitter)
+    url: https://x.com/dbeaver_news
+    about: Get everyday tips, fresh news, and DBeaver feature overviews.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 93e56eb69d..b071d3321f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,8 @@
 name: Feature request
 about: Do you have an idea? Please, share it.
 title: ''
-labels: feature request, wait for review
+labels: wait for review
+type: Feature
 assignees: ''
 
 ---