diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index dd84ea782..ce570afd3 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,7 @@
 ---
 name: Bug report
-about: Create a report to help us improve
-title: ''
+about: Create a report to help us improve DbGate
+title: 'BUG: Say something here'
 labels: ''
 assignees: ''
 
@@ -14,8 +14,7 @@ A clear and concise description of what the bug is.
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
-3. Scroll down to '....'
-4. See error
+3. See error
 
 **Expected behavior**
 A clear and concise description of what you expected to happen.
@@ -23,16 +22,12 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+**Version Information (please complete the following information):**
+ - OS: [e.g. Windows/Mac/Ubuntu]
+ - App Version [see Help -> About]
+ - Install source [e.g. installer/SNAP/Docker/NPM]
+ - Type - Web/Application
+ - Database engine: [e.g. MySQL/PostgreSQL/SQL Server]
 
 **Additional context**
-Add any other context about the problem here.
+Anything else you think might be helpful
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index bbcbbe7d6..bbad8bf5c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,7 @@
 ---
 name: Feature request
-about: Suggest an idea for this project
-title: ''
+about: Suggest an idea for DbGate
+title: 'FEAT: '
 labels: ''
 assignees: ''
 
diff --git a/.github/workflows/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
similarity index 100%
rename from .github/workflows/ISSUE_TEMPLATE/question.md
rename to .github/ISSUE_TEMPLATE/question.md
diff --git a/.github/workflows/ISSUE_TEMPLATE/bug_report.md b/.github/workflows/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index ce570afd3..000000000
--- a/.github/workflows/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve DbGate
-title: 'BUG: Say something here'
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Version Information (please complete the following information):**
- - OS: [e.g. Windows/Mac/Ubuntu]
- - App Version [see Help -> About]
- - Install source [e.g. installer/SNAP/Docker/NPM]
- - Type - Web/Application
- - Database engine: [e.g. MySQL/PostgreSQL/SQL Server]
-
-**Additional context**
-Anything else you think might be helpful
diff --git a/.github/workflows/ISSUE_TEMPLATE/feature_request.md b/.github/workflows/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index bbad8bf5c..000000000
--- a/.github/workflows/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for DbGate
-title: 'FEAT: '
-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.