diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 2288ef0133..da461319df 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,35 +2,46 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: bug
+labels: bug, needs triage
 assignees: ''
 
 ---
 
-<!-- delete unnecessary items -->
-### Describe the bug
+## Observed
 
-### Steps to reproduce
 1.
 2.
 3.
 
-### Expected behaviour
+## Expected behaviour
+
+## Code example
+
+<!-- it is important to provide a code snippet that reproduces the issue -->
 
-### Code example
 ```go
+package code
+
+// your code snippet here
+```
+
+## Error log
+
+<!-- nice to have, if you have an error log -->
+
+```log
+
 ```
-### Error log
-
-### Configuration
-#### Environment
-* Client version:
-* Language version:
-* OS:
-* Interface: ClickHouse API / database/sql compatible driver
-
-#### ClickHouse server
-* ClickHouse Server version:
-* ClickHouse Server non-default settings, if any:
-* `CREATE TABLE` statements for tables involved:
-* Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/master/programs/obfuscator/Obfuscator.cpp#L42-L80) if necessary
+
+## Details
+
+### Environment
+* [ ] `clickhouse-go` version:
+* [ ] Interface: ClickHouse API / `database/sql` compatible driver
+* [ ] Go version:
+* [ ] Operating system:
+* [ ] ClickHouse version:
+* [ ] Is it a ClickHouse Cloud?
+* [ ] ClickHouse Server non-default settings, if any:
+* [ ] `CREATE TABLE` statements for tables involved:
+* [ ] Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/master/programs/obfuscator/Obfuscator.cpp#L42-L80) if necessary
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..f143585bbb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Feature request
+    url: https://github.com/ClickHouse/clickhouse-go/discussions/new?category=feature-requests
+    about: We use Discussions for feature requests
+  - name: Start a discussion
+    url: https://github.com/ClickHouse/clickhouse-go/discussions/new/choose
+    about: We use Discussions for these reports
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index bbcbbe7d61..0000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.